diff --git a/models/event.rb b/models/event.rb index 93deffd4..9e4d0b3a 100644 --- a/models/event.rb +++ b/models/event.rb @@ -17,7 +17,12 @@ class Event < Sequel::Model GLOBAL_VIEWS_SITE_CHANGE_MINIMUM = 1000 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]} + if SimpleCache.expired?(:excluded_actioning_site_ids) + res = 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]} + excluded_actioning_site_ids = SimpleCache.store :excluded_actioning_site_ids, res, 10.minutes + else + excluded_actioning_site_ids = SimpleCache.get :excluded_actioning_site_ids + end ds = select_all(:events). order(:created_at.desc).