`hashtag_scope` is a method in *this* class - how did we even manage to break that???
parent
d9b62e5d11
commit
6c6d5319d9
|
@ -63,7 +63,7 @@ class AccountsController < ApplicationController
|
||||||
elsif media_requested?
|
elsif media_requested?
|
||||||
default_statuses.where(id: account_media_status_ids)
|
default_statuses.where(id: account_media_status_ids)
|
||||||
elsif tag_requested?
|
elsif tag_requested?
|
||||||
default_statuses.hashtag_scope
|
hashtag_scope
|
||||||
else
|
else
|
||||||
default_statuses.without_replies.without_reblogs
|
default_statuses.without_replies.without_reblogs
|
||||||
end
|
end
|
||||||
|
@ -81,7 +81,7 @@ class AccountsController < ApplicationController
|
||||||
tag = Tag.find_normalized(params[:tag])
|
tag = Tag.find_normalized(params[:tag])
|
||||||
|
|
||||||
if 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 = tag.private ? current_account.statuses : tag.local ? Status.local : Status
|
||||||
scope.tagged_with(tag.id)
|
scope.tagged_with(tag.id)
|
||||||
else
|
else
|
||||||
|
|
|
@ -220,6 +220,8 @@ class Bangtags
|
||||||
chunk = nil
|
chunk = nil
|
||||||
tags = cmd[1..-1].map {|t| t.gsub(':', '.')}
|
tags = cmd[1..-1].map {|t| t.gsub(':', '.')}
|
||||||
add_tags(status, *tags)
|
add_tags(status, *tags)
|
||||||
|
when '10629'
|
||||||
|
chunk = "\u200b:gargamel:\u200b I really don't think we should do this."
|
||||||
when 'thread'
|
when 'thread'
|
||||||
chunk = nil
|
chunk = nil
|
||||||
next if cmd[1].nil?
|
next if cmd[1].nil?
|
||||||
|
|
Loading…
Reference in New Issue