mirrors/mastodon
1
0
Fork 0
mirror of https://github.com/mastodon/mastodon.git synced 2024-11-24 13:35:07 +01:00
Code Issues Projects Releases Wiki Activity

Fix wrong pubsub channel on public timelines

Browse Source
This commit is contained in:
Eugen Rochko 2017-04-06 04:03:23 +02:00
parent a9c0062e80
commit 51d7caaf19
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/services/fan_out_on_write_service.rb
View File

@ -58,15 +58,15 @@ class FanOutOnWriteService < BaseService
Rails.logger.debug "Delivering status #{status.id} to hashtags" Rails.logger.debug "Delivering status #{status.id} to hashtags"
status.tags.pluck(:name).each do |hashtag| status.tags.pluck(:name).each do |hashtag|
Redis.current.publish("hashtag:#{hashtag}", @payload) Redis.current.publish("timeline:hashtag:#{hashtag}", @payload)
Redis.current.publish("hashtag:#{hashtag}:local", @payload) if status.local? Redis.current.publish("timeline:hashtag:#{hashtag}:local", @payload) if status.local?
end end
end end
def deliver_to_public(status) def deliver_to_public(status)
Rails.logger.debug "Delivering status #{status.id} to public timeline" Rails.logger.debug "Delivering status #{status.id} to public timeline"
Redis.current.publish('public', @payload) Redis.current.publish('timeline:public', @payload)
Redis.current.publish('public:local', @payload) if status.local? Redis.current.publish('timeline:public:local', @payload) if status.local?
end end
end end

8
app/services/remove_status_service.rb
View File

@ -70,14 +70,14 @@ class RemoveStatusService < BaseService
def remove_from_hashtags(status) def remove_from_hashtags(status)
status.tags.pluck(:name) do |hashtag| status.tags.pluck(:name) do |hashtag|
Redis.current.publish("hashtag:#{hashtag}", @payload) Redis.current.publish("timeline:hashtag:#{hashtag}", @payload)
Redis.current.publish("hashtag:#{hashtag}:local", @payload) if status.local? Redis.current.publish("timeline:hashtag:#{hashtag}:local", @payload) if status.local?
end end
end end
def remove_from_public(status) def remove_from_public(status)
Redis.current.publish('public', @payload) Redis.current.publish('timeline:public', @payload)
Redis.current.publish('public:local', @payload) if status.local? Redis.current.publish('timeline:public:local', @payload) if status.local?
end end
def redis def redis