Merge tootsuite/master at 3023725936

2017-11-16 01:21:16 -06:00
parent 3023725936 88627fd7aa
commit 35fbdc36f9
230 changed files with 8548 additions and 567 deletions
--- a/app/policies/status_policy.rb
+++ b/app/policies/status_policy.rb
@@ -6,6 +6,8 @@ class StatusPolicy < ApplicationPolicy
  end

  def show?
+    return false if local_only? && account.nil?
+
    if direct?
      owned? || record.mentions.where(account: current_account).exists?
    elsif private?
@@ -46,4 +48,8 @@ class StatusPolicy < ApplicationPolicy
  def author
    record.account
  end
+  
+  def local_only?
+    record.local_only?
+  end
 end