mirror of
https://github.com/mastodon/mastodon.git
synced 2025-09-06 01:41:08 +00:00
Merge 2ddafd79b1
into 14cb5ff881
This commit is contained in:
commit
0ff1186d84
|
@ -152,11 +152,13 @@ class FanOutOnWriteService < BaseService
|
||||||
redis.publish('timeline:public', anonymous_payload)
|
redis.publish('timeline:public', anonymous_payload)
|
||||||
redis.publish(@status.local? ? 'timeline:public:local' : 'timeline:public:remote', anonymous_payload)
|
redis.publish(@status.local? ? 'timeline:public:local' : 'timeline:public:remote', anonymous_payload)
|
||||||
|
|
||||||
if @status.with_media?
|
broadcast_to_public_media_streams! if @status.with_media?
|
||||||
|
end
|
||||||
|
|
||||||
|
def broadcast_to_public_media_streams!
|
||||||
redis.publish('timeline:public:media', anonymous_payload)
|
redis.publish('timeline:public:media', anonymous_payload)
|
||||||
redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', anonymous_payload)
|
redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', anonymous_payload)
|
||||||
end
|
end
|
||||||
end
|
|
||||||
|
|
||||||
def deliver_to_conversation!
|
def deliver_to_conversation!
|
||||||
AccountConversation.add_status(@account, @status) unless update?
|
AccountConversation.add_status(@account, @status) unless update?
|
||||||
|
|
Loading…
Reference in New Issue
Block a user