tarrien/Mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix #323 - self-replies to appear in public timelines again

Browse Source
This commit is contained in:
Eugen Rochko
2016-12-02 14:33:20 +01:00
parent e3222feddb
commit 3114e55c7a
4 changed files with 30 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
app/models/status.rb
View File

@ -105,7 +105,7 @@ class Status < ApplicationRecord
query = joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
.where(visibility: :public)
.where('accounts.silenced = FALSE')
.where('statuses.in_reply_to_id IS NULL')
.where('(statuses.in_reply_to_id IS NULL OR statuses.in_reply_to_account_id = statuses.account_id)')
.where('statuses.reblog_of_id IS NULL')
query = filter_timeline(query, account) unless account.nil?
query
@ -116,7 +116,7 @@ class Status < ApplicationRecord
.joins('LEFT OUTER JOIN accounts ON statuses.account_id = accounts.id')
.where(visibility: :public)
.where('accounts.silenced = FALSE')
.where('statuses.in_reply_to_id IS NULL')
.where('(statuses.in_reply_to_id IS NULL OR statuses.in_reply_to_account_id = statuses.account_id)')
.where('statuses.reblog_of_id IS NULL')
query = filter_timeline(query, account) unless account.nil?
query
@ -141,5 +141,6 @@ class Status < ApplicationRecord
before_validation do
text.strip!
self.in_reply_to_account_id = thread.account_id if reply?
end
end

6
app/services/fan_out_on_write_service.rb
View File

@ -8,7 +8,7 @@ class FanOutOnWriteService < BaseService
deliver_to_followers(status)
deliver_to_mentioned(status)
return if status.account.silenced? || !status.public_visibility?
return if status.account.silenced? || !status.public_visibility? || status.reblog? || (status.reply? && status.in_reply_to_account_id != status.account_id)
deliver_to_hashtags(status)
deliver_to_public(status)
@ -41,8 +41,6 @@ class FanOutOnWriteService < BaseService
end
def deliver_to_hashtags(status)
return if status.reblog? || status.reply?
Rails.logger.debug "Delivering status #{status.id} to hashtags"
status.tags.find_each do |tag|
FeedManager.instance.broadcast("hashtag:#{tag.name}", type: 'update', id: status.id)
@ -50,8 +48,6 @@ class FanOutOnWriteService < BaseService
end
def deliver_to_public(status)
return if status.reblog? || status.reply?
Rails.logger.debug "Delivering status #{status.id} to public timeline"
FeedManager.instance.broadcast(:public, type: 'update', id: status.id)
end