ar
/
mastodon
forked from treehouse/mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix

rebase/4.0.0rc2
Eugen Rochko 2016-12-06 00:24:33 +01:00
parent 39cc9fde8a
commit 84d2371d6a
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/status.rb
View 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)