about summary refs log tree commit diff
path: root/app
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2016-12-06 00:24:33 +0100
committerEugen Rochko <eugen@zeonfederated.com>2016-12-06 00:24:33 +0100
commit84d2371d6a4eb928f47d436b92bc9ad292b7d452 (patch)
tree2791bf89ad110a35c5cecfde5106b97255d112e8 /app
parent39cc9fde8a2e34da0639d83688d4d6d6d6240382 (diff)
Fix
Diffstat (limited to 'app')
-rw-r--r--app/models/status.rb4
1 files changed, 2 insertions, 2 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 9d1dae963..e87828e32 100644
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@ -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)