about summary refs log tree commit diff
path: root/app/models/status.rb
diff options
context:
space:
mode:
authorThibG <thib@sitedethib.com>2019-03-17 14:54:09 +0100
committerEugen Rochko <eugen@zeonfederated.com>2019-03-17 14:54:09 +0100
commit5e38ef87a7b8bac59ffa0d98464086ab8a60a2e1 (patch)
treeeef6fdfe5269ac9bfaca98614342ce5b1bec44ce /app/models/status.rb
parentc92a1cf5c1a499b9941c1526d90ed0445e072850 (diff)
Fix reblogs privacy (#10302)
* Fix reblogs privacy

* Fix Announce processing specs
Diffstat (limited to 'app/models/status.rb')
-rw-r--r--app/models/status.rb2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/models/status.rb b/app/models/status.rb
index 571167943..b9479c76b 100644
--- 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