fix for missing comments on profile

This commit is contained in:
Kyle Drake 2024-08-29 22:50:03 -05:00
parent 724ee54658
commit 8a96e65f9f
2 changed files with 5 additions and 8 deletions

View file

@ -31,15 +31,13 @@ class Event < Sequel::Model
def self.news_feed_default_dataset
select(:events.*).
join(:sites, id: :site_id).
left_join(:sites, id: :site_id).
left_join(Sequel[:sites].as(:actioning_sites), id: :events__actioning_site_id).
order(:events__created_at.desc).
exclude(events__is_deleted: true).
exclude(sites__is_deleted: true).
exclude(sites__is_nsfw: true).
exclude(sites__is_crashing: true).
exclude(actioning_sites__is_deleted: true).
where(follow_id: nil)
exclude(events__is_deleted: true).
where(follow_id: nil).
order(:events__created_at.desc)
end
def self.global_dataset

View file

@ -1390,8 +1390,7 @@ class Site < Sequel::Model
def latest_events(current_page=1, current_site=nil, limit=Event::PAGINATION_LENGTH)
site_id = self.id
ds = Event.news_feed_default_dataset.where{Sequel.|({site_id: site_id}, {actioning_site_id: site_id})}.
order(:created_at.desc)
ds = Event.news_feed_default_dataset.where{Sequel.|({site_id: site_id}, {actioning_site_id: site_id})}
if current_site
ds = ds.where(