diff options
| -rw-r--r-- | app/lib/feed_manager.rb | 22 | ||||
| -rw-r--r-- | app/models/status.rb | 6 |
2 files changed, 15 insertions, 13 deletions
diff --git a/app/lib/feed_manager.rb b/app/lib/feed_manager.rb index c6262f211..0056321fa 100644 --- a/app/lib/feed_manager.rb +++ b/app/lib/feed_manager.rb @@ -78,15 +78,15 @@ class FeedManager def filter_from_home?(status, receiver) should_filter = false - if status.reply? && !status.thread.account.nil? # Filter out if it's a reply - should_filter = !receiver.following?(status.thread.account) # and I'm not following the person it's a reply to - should_filter &&= !(receiver.id == status.thread.account_id) # and it's not a reply to me - should_filter &&= !(status.account_id == status.thread.account_id) # and it's not a self-reply - elsif status.reblog? # Filter out a reblog - should_filter = receiver.blocking?(status.reblog.account) # if I'm blocking the reblogged person + if status.reply? && !status.in_reply_to_account_id.nil? # Filter out if it's a reply + should_filter = !receiver.following?(status.in_reply_to_account) # and I'm not following the person it's a reply to + should_filter &&= !(receiver.id == status.in_reply_to_account_id) # and it's not a reply to me + should_filter &&= !(status.account_id == status.in_reply_to_account_id) # and it's not a self-reply + elsif status.reblog? # Filter out a reblog + should_filter = receiver.blocking?(status.reblog.account) # if I'm blocking the reblogged person end - should_filter ||= receiver.blocking?(status.mentions.map(&:account_id)) # or if it mentions someone I blocked + should_filter ||= receiver.blocking?(status.mentions.map(&:account_id)) # or if it mentions someone I blocked should_filter end @@ -98,8 +98,8 @@ class FeedManager should_filter ||= (status.account.silenced? && !receiver.following?(status.account)) # of if the account is silenced and I'm not following them should_filter ||= (status.private_visibility? && !receiver.following?(status.account)) # or if the mentioned account is not permitted to see the private status - if status.reply? && !status.thread.account.nil? # or it's a reply - should_filter ||= receiver.blocking?(status.thread.account) # to a user I blocked + if status.reply? && !status.in_reply_to_account_id.nil? # or it's a reply + should_filter ||= receiver.blocking?(status.in_reply_to_account) # to a user I blocked end should_filter @@ -109,8 +109,8 @@ class FeedManager should_filter = receiver.blocking?(status.account) should_filter ||= receiver.blocking?(status.mentions.includes(:account).map(&:account)) - if status.reply? && !status.thread.account.nil? - should_filter ||= receiver.blocking?(status.thread.account) + if status.reply? && !status.in_reply_to_account_id.nil? + should_filter ||= receiver.blocking?(status.in_reply_to_account) elsif status.reblog? should_filter ||= receiver.blocking?(status.reblog.account) end diff --git a/app/models/status.rb b/app/models/status.rb index 1720d754a..bc595c93b 100644 --- a/app/models/status.rb +++ b/app/models/status.rb @@ -8,6 +8,7 @@ class Status < ApplicationRecord enum visibility: [:public, :unlisted, :private], _suffix: :visibility belongs_to :account, inverse_of: :statuses + belongs_to :in_reply_to_account, foreign_key: 'in_reply_to_account_id', class_name: 'Account' belongs_to :thread, foreign_key: 'in_reply_to_id', class_name: 'Status', inverse_of: :replies belongs_to :reblog, foreign_key: 'reblog_of_id', class_name: 'Status', inverse_of: :reblogs, touch: true @@ -170,8 +171,9 @@ class Status < ApplicationRecord 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.reblog = reblog.reblog if reblog? && reblog.reblog? + self.in_reply_to_account_id = (thread.account_id == account_id && thread.reply? ? thread.in_reply_to_account_id : thread.account_id) if reply? self.visibility = (account.locked? ? :private : :public) if visibility.nil? end |