From 84d2371d6a4eb928f47d436b92bc9ad292b7d452 Mon Sep 17 00:00:00 2001
From: Eugen Rochko <eugen@zeonfederated.com>
Date: Tue, 6 Dec 2016 00:24:33 +0100
Subject: [PATCH] Fix
---
app/models/status.rb | 4 ++--
1 file 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)