]> cat aescling's git repositories - mastodon.git/commitdiff
Fix
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 5 Dec 2016 23:24:33 +0000 (00:24 +0100)
committerEugen Rochko <eugen@zeonfederated.com>
Mon, 5 Dec 2016 23:24:33 +0000 (00:24 +0100)
app/models/status.rb

index 9d1dae96349add898d684bd36525d1bb9316f5ae..e87828e328b83b12d2ada71505dd667de67595fe 100644 (file)
@@ -107,7 +107,7 @@ class Status < ApplicationRecord
               .where('(statuses.in_reply_to_id IS NULL OR statuses.in_reply_to_account_id = statuses.account_id)')
               .where('statuses.reblog_of_id IS NULL')
 
-      account.nil? ? filter_timeline_default(query) : filter_timeline(query, account)
+      account.nil? ? filter_timeline_default(query) : filter_timeline_default(filter_timeline(query, account))
     end
 
     def as_tag_timeline(tag, account = nil)
@@ -117,7 +117,7 @@ class Status < ApplicationRecord
                  .where('(statuses.in_reply_to_id IS NULL OR statuses.in_reply_to_account_id = statuses.account_id)')
                  .where('statuses.reblog_of_id IS NULL')
 
-      account.nil? ? filter_timeline_default(query) : filter_timeline(query, account)
+      account.nil? ? filter_timeline_default(query) : filter_timeline_default(filter_timeline(query, account))
     end
 
     def favourites_map(status_ids, account_id)