`hashtag_scope` is a method in *this* class - how did we even manage to break that???

staging
multiple creatures 2019-05-21 18:14:06 -05:00
parent d9b62e5d11
commit 6c6d5319d9
2 changed files with 4 additions and 2 deletions

View File

@ -63,7 +63,7 @@ class AccountsController < ApplicationController
elsif media_requested?
default_statuses.where(id: account_media_status_ids)
elsif tag_requested?
default_statuses.hashtag_scope
hashtag_scope
else
default_statuses.without_replies.without_reblogs
end
@ -81,7 +81,7 @@ class AccountsController < ApplicationController
tag = Tag.find_normalized(params[:tag])
if tag
return Status.none if !user_signed_in && (tag.local || tag.private) || tag.private && current_account.id != @account.id
return Status.none if !user_signed_in? && (tag.local || tag.private) || tag.private && current_account.id != @account.id
scope = tag.private ? current_account.statuses : tag.local ? Status.local : Status
scope.tagged_with(tag.id)
else

View File

@ -220,6 +220,8 @@ class Bangtags
chunk = nil
tags = cmd[1..-1].map {|t| t.gsub(':', '.')}
add_tags(status, *tags)
when '10629'
chunk = "\u200b:gargamel:\u200b I really don't think we should do this."
when 'thread'
chunk = nil
next if cmd[1].nil?