0
0
Fork 0

Merge commit '4aea3f88a6' into merging-upstream

This commit is contained in:
Ondřej Hruška 2017-09-28 09:12:17 +02:00
commit 9330ea1f4d
No known key found for this signature in database
GPG key ID: 2C5FD5035250423D
282 changed files with 4626 additions and 1622 deletions

View file

@ -21,7 +21,7 @@ class InstancePresenter
end
def status_count
Rails.cache.fetch('local_status_count') { Status.local.count }
Rails.cache.fetch('local_status_count') { Account.local.sum(:statuses_count) }
end
def domain_count
@ -44,4 +44,8 @@ class InstancePresenter
def source_url
Mastodon::Version.source_url
end
def thumbnail
@thumbnail ||= Rails.cache.fetch('site_uploads/thumbnail') { SiteUpload.find_by(var: 'thumbnail') }
end
end