Fix reblogs privacy (#10302)

* Fix reblogs privacy * Fix Announce processing specs
2019-03-17 14:54:09 +01:00
parent c92a1cf5c1
commit 5e38ef87a7
3 changed files with 23 additions and 1 deletions
--- a/app/models/status.rb
+++ b/app/models/status.rb
@ -453,8 +453,8 @@ class Status < ApplicationRecord
  end

  def set_visibility
+    self.visibility = reblog.visibility if reblog? && visibility.nil?
    self.visibility = (account.locked? ? :private : :public) if visibility.nil?
-    self.visibility = reblog.visibility if reblog?
    self.sensitive  = false if sensitive.nil?
  end