From: Eugen Rochko <eugen@zeonfederated.com>
Date: Thu, 22 Dec 2016 10:35:00 +0000 (+0100)
Subject: Merge branch 'master' into development
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=f91b6fa9e15029f23be7be3b796eca122e5b5588;p=mastodon.git

Merge branch 'master' into development
---

f91b6fa9e15029f23be7be3b796eca122e5b5588
diff --cc app/models/status.rb
index 603f3b7a2,76ada5227..1e6298a0e
--- a/app/models/status.rb
+++ b/app/models/status.rb
@@@ -168,13 -160,7 +168,14 @@@ class Status < ApplicationRecor
  
    before_validation do
      text.strip!
+     self.reblog = reblog.reblog if reblog? && reblog.reblog?
      self.in_reply_to_account_id = thread.account_id if reply?
 +    self.visibility             = :public if visibility.nil?
 +  end
 +
 +  private
 +
 +  def filter_from_context?(status, account)
 +    account&.blocking?(status.account) || !status.permitted?(account)
    end
  end