Merge commit '4aea3f88a6d30f102a79c2da7fcfac96465ba1a8' into merging-upstream

2017-09-28 09:12:17 +02:00
parent 06e299cef5 4aea3f88a6
commit 9330ea1f4d
282 changed files with 4626 additions and 1622 deletions
--- a/app/presenters/instance_presenter.rb
+++ b/app/presenters/instance_presenter.rb
@@ -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