Merge branch 'improve_home_feed_query' into 'develop'
Improve home feed query See merge request gab/social/gab-social!68
This commit is contained in:
commit
74b3700f58
|
@ -1,26 +1,7 @@
|
||||||
# frozen_string_literal: true
|
# frozen_string_literal: true
|
||||||
|
|
||||||
class HomeFeed < Feed
|
class HomeFeed < Feed
|
||||||
def initialize(account)
|
QUERY = <<-SQL
|
||||||
@type = :home
|
|
||||||
@id = account.id
|
|
||||||
@account = account
|
|
||||||
end
|
|
||||||
|
|
||||||
def get(limit = 20, max_id = nil, since_id = nil, min_id = nil)
|
|
||||||
ActiveRecord::Base.connected_to(role: :reading) do
|
|
||||||
from_database(limit, max_id, since_id, min_id)
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
private
|
|
||||||
|
|
||||||
def from_database(limit, max_id, since_id, min_id)
|
|
||||||
pagination_max = ""
|
|
||||||
pagination_min = ""
|
|
||||||
pagination_max = "and s.id < #{max_id}" unless max_id.nil?
|
|
||||||
pagination_min = "and s.id > #{min_id}" unless min_id.nil?
|
|
||||||
Status.find_by_sql "
|
|
||||||
with cte as
|
with cte as
|
||||||
(
|
(
|
||||||
select
|
select
|
||||||
|
@ -36,14 +17,14 @@ class HomeFeed < Feed
|
||||||
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 (exists(select ff.target_account_id from follows ff where ff.account_id = #{@id} and ff.target_account_id = s.account_id)
|
and (exists(select ff.target_account_id from follows ff where ff.account_id = :id and ff.target_account_id = s.account_id)
|
||||||
or s.account_id = #{@id})
|
or s.account_id = :id)
|
||||||
and not exists(select mm.target_account_id from mutes mm where mm.account_id = #{@id} and mm.target_account_id in (s.account_id, r.account_id))
|
and not exists(select mm.target_account_id from mutes mm where mm.account_id = :id and mm.target_account_id in (s.account_id, r.account_id))
|
||||||
and not exists(select bb.target_account_id from blocks bb where bb.account_id = #{@id} and bb.target_account_id in (s.account_id, r.account_id))
|
and not exists(select bb.target_account_id from blocks bb where bb.account_id = :id and bb.target_account_id in (s.account_id, r.account_id))
|
||||||
#{pagination_max}
|
and (:max_id is null or s.id < :max_id)
|
||||||
#{pagination_min}
|
and (:min_id is null or s.id > :min_id)
|
||||||
order by s.created_at desc
|
order by s.created_at desc
|
||||||
limit #{limit}
|
limit :limit
|
||||||
) sid
|
) sid
|
||||||
)
|
)
|
||||||
select
|
select
|
||||||
|
@ -53,6 +34,18 @@ class HomeFeed < Feed
|
||||||
where
|
where
|
||||||
cte.rn_dupe = 1 or cte.reblog_of_id is null
|
cte.rn_dupe = 1 or cte.reblog_of_id is null
|
||||||
order by so.created_at desc
|
order by so.created_at desc
|
||||||
"
|
SQL
|
||||||
|
|
||||||
|
def initialize(account)
|
||||||
|
@type = :home
|
||||||
|
@id = account.id
|
||||||
|
@account = account
|
||||||
end
|
end
|
||||||
|
|
||||||
|
def get(limit = 20, max_id = nil, since_id = nil, min_id = nil)
|
||||||
|
ActiveRecord::Base.connected_to(role: :reading) do
|
||||||
|
Status.find_by_sql([QUERY, { id: @id, limit: limit, min_id: min_id, max_id: max_id }])
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
end
|
end
|
||||||
|
|
Loading…
Reference in New Issue