zydronium/neocities
1
0
Fork 0
mirror of https://github.com/neocities/neocities.git synced 2025-04-24 17:22:35 +02:00
Code Issues Projects Releases Packages Wiki Activity

Only handle excludes when not empty array

Browse source
This commit is contained in:
Kyle Drake 2017-03-30 15:38:44 -07:00
parent d622a7065d
commit 024fad8226
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
models/event.rb
View file

@ -19,13 +19,18 @@ class Event < Sequel::Model
def self.news_feed_default_dataset
excluded_actioning_site_ids = DB[%{select distinct(actioning_site_id) from events join sites on actioning_site_id=sites.id where sites.is_banned='t' or sites.is_nsfw='t' or sites.is_deleted='t'}].all.collect {|r| r[:actioning_site_id]}
select_all(:events).
ds = select_all(:events).
order(:created_at.desc).
join_table(:inner, :sites, id: :site_id).
exclude(Sequel.qualify(:sites, :is_deleted) => true).
exclude(Sequel.qualify(:events, :is_deleted) => true).
where("actioning_site_id is null or actioning_site_id not in ?", excluded_actioning_site_ids).
exclude(is_banned: true)
unless excluded_actioning_site_ids.empty?
ds.where!("actioning_site_id is null or actioning_site_id not in ?", excluded_actioning_site_ids)
end
ds
end
def self.global_dataset(current_page=1, limit=DEFAULT_GLOBAL_LIMIT)