random-mirrors
/
gab-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Revert "[home] refactor the home timeline query" 

This reverts commit d39664b827.
This commit is contained in:
Fosco Marotto 2021-01-23 23:35:52 -05:00
parent d39664b827
commit d8230aeaa0
1 changed files with 10 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/models/home_feed.rb
View File

@ -28,15 +28,18 @@ class HomeFeed < Feed
from statuses s from statuses s
left join statuses reblog left join statuses reblog
on s.reblog_of_id = reblog.id on s.reblog_of_id = reblog.id
left join follows f
on s.account_id = f.target_account_id
and f.account_id = #{@id}
where where
s.created_at > NOW() - INTERVAL '7 days' s.created_at > NOW() - INTERVAL '7 days'
and s.reply is false and s.reply is false
and ( and (
s.account_id = #{@id} s.account_id = #{@id}
or f.id is not null or s.account_id in (
select ff.target_account_id
from follows ff
join accounts af
on ff.target_account_id = af.id
and af.updated_at > NOW() - INTERVAL '7 days'
where ff.account_id = #{@id})
) )
and s.account_id not in (select target_account_id from mutes where account_id = #{@id}) and s.account_id not in (select target_account_id from mutes where account_id = #{@id})
and (reblog.id is null or reblog.account_id not in (select target_account_id from mutes where account_id = #{@id})) and (reblog.id is null or reblog.account_id not in (select target_account_id from mutes where account_id = #{@id}))
@ -55,5 +58,8 @@ class HomeFeed < Feed
# or rb.text like '%' || cf.phrase || '%') # or rb.text like '%' || cf.phrase || '%')
# where cf.id is null or st.account_id = #{@id} # where cf.id is null or st.account_id = #{@id}
#" #"
# .reject { |status| FeedManager.instance.filter?(:home, status, @account.id) }
# Status.as_home_timeline(@account)
# .paginate_by_id(limit, max_id: max_id, since_id: since_id, min_id: min_id)
end end
end end