diff options
| author | multiple creatures <dev@multiple-creature.party> | 2019-05-21 18:14:06 -0500 |
|---|---|---|
| committer | multiple creatures <dev@multiple-creature.party> | 2019-05-21 18:22:18 -0500 |
| commit | 6c6d5319d92f8edbeb647278fbb7169d31e514f7 (patch) | |
| tree | 57db27ea3a08779d39dc4f20c78c604587765da9 /app | |
| parent | d9b62e5d11de91bcbc2efd6d0a14222900a50ed5 (diff) | |
`hashtag_scope` is a method in *this* class - how did we even manage to break that???
Diffstat (limited to 'app')
| -rw-r--r-- | app/controllers/accounts_controller.rb | 4 | ||||
| -rw-r--r-- | app/lib/bangtags.rb | 2 |
2 files changed, 4 insertions, 2 deletions
diff --git a/app/controllers/accounts_controller.rb b/app/controllers/accounts_controller.rb index 33bd91f78..8c4ae97eb 100644 --- a/app/controllers/accounts_controller.rb +++ b/app/controllers/accounts_controller.rb @@ -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 diff --git a/app/lib/bangtags.rb b/app/lib/bangtags.rb index e6fcb62e4..4f4452486 100644 --- a/app/lib/bangtags.rb +++ b/app/lib/bangtags.rb @@ -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? |