Unfloyded/Legamunt
0
0
Fork 0
Code Activity

Merge branch 'master' into glitch-soc/merge-upstream

Browse source 
Conflicts:
- app/models/media_attachment.rb
  Upstream raised max image size from 8MB to 10MB while our limit is
  configurable. Raised the default to 10MB.
This commit is contained in:
Thibaut Girka 2019-10-03 11:10:12 +02:00
commit a84aedb7a7
168 changed files with 3456 additions and 997 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/presenters/instance_presenter.rb
View file

@ -21,7 +21,7 @@ class InstancePresenter
end
def active_user_count(weeks = 4)
Rails.cache.fetch('active_user_count') { Redis.current.pfcount(*(0...weeks).map { |i| "activity:logins:#{i.weeks.ago.utc.to_date.cweek}" }) }
Rails.cache.fetch("active_user_count/#{weeks}") { Redis.current.pfcount(*(0...weeks).map { |i| "activity:logins:#{i.weeks.ago.utc.to_date.cweek}" }) }
end
def status_count