Merge branch 'master' into fix/cache_blocking

2017-04-17 01:41:33 +10:00
parent fd81916e86 99226aba93
commit acd33101c5
48 changed files with 453 additions and 184 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -110,6 +110,10 @@ class Status < ApplicationRecord
    results
  end

+  def non_sensitive_with_media?
+    !sensitive? && media_attachments.any?
+  end
+
  class << self
    def as_home_timeline(account)
      where(account: [account] + account.following)