marrub
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

make sure local only replies stay local

staging
multiple creatures 2019-03-13 02:54:07 -05:00
parent 0554e7c3bd
commit 312bc14d06
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/models/status.rb
View File

@ -556,7 +556,9 @@ class Status < ApplicationRecord
def set_locality
if account.domain.nil? && !attribute_changed?(:local_only)
self.local_only = marked_local_only? || account.user.setting_always_local
self.local_only = marked_local_only?
self.local_only ||= account.user.setting_always_local
self.local_only ||= reply? && Status.where(id: in_reply_to_id, local_only: true).exists?
end
end