Merge branch 'master' into development

diff --cc app/models/status.rb
index 603f3b7a2222e06c2a9a662ff36ba924d9da94f7,76ada52275bd95856f63f153f63e24e73bc504ad..1e6298a0e252a3a607130a82b76e48ebfd4dee85
--- 1/app/models/status.rb
--- 2/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