Fix bubble timeline websocket

TheEssem · Dec 1, 2024 · 7ec4992 · 7ec4992
1 parent ef55331
commit 7ec4992
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 0 deletions.
diff --git a/app/models/status.rb b/app/models/status.rb
@@ -208,6 +208,10 @@ def local?
     attributes['local'] || uri.nil?
   end
 
+  def bubble?
+    BubbleDomain.in_bubble?(account.domain)
+  end
+
   def in_reply_to_local_account?
     reply? && thread&.account&.local?
   end

diff --git a/app/services/batched_remove_status_service.rb b/app/services/batched_remove_status_service.rb
@@ -89,10 +89,12 @@ def unpush_from_public_timelines(status, pipeline)
 
     pipeline.publish('timeline:public', payload)
     pipeline.publish(status.local? ? 'timeline:public:local' : 'timeline:public:remote', payload)
+    pipeline.publish('timeline:public:bubble', payload) if status.bubble?
 
     if status.media_attachments.any?
       pipeline.publish('timeline:public:media', payload)
       pipeline.publish(status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', payload)
+      pipeline.publish('timeline:public:bubble:media', payload) if status.bubble?
     end
 
     status.tags.map { |tag| tag.name.mb_chars.downcase }.each do |hashtag|

diff --git a/app/services/fan_out_on_write_service.rb b/app/services/fan_out_on_write_service.rb
@@ -146,10 +146,12 @@ def broadcast_to_public_streams!
 
     redis.publish('timeline:public', anonymous_payload)
     redis.publish(@status.local? ? 'timeline:public:local' : 'timeline:public:remote', anonymous_payload)
+    redis.publish('timeline:public:bubble', anonymous_payload) if @status.bubble?
 
     if @status.with_media?
       redis.publish('timeline:public:media', anonymous_payload)
       redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', anonymous_payload)
+      redis.publish('timeline:public:bubble:media', anonymous_payload) if @status.bubble?
     end
   end
 

diff --git a/app/services/remove_status_service.rb b/app/services/remove_status_service.rb
@@ -137,6 +137,7 @@ def remove_from_public
 
     redis.publish('timeline:public', @payload)
     redis.publish(@status.local? ? 'timeline:public:local' : 'timeline:public:remote', @payload)
+    redis.publish('timeline:public:bubble', @payload) if @status.bubble?
   end
 
   def remove_from_media
@@ -146,6 +147,7 @@ def remove_from_media
 
     redis.publish('timeline:public:media', @payload)
     redis.publish(@status.local? ? 'timeline:public:local:media' : 'timeline:public:remote:media', @payload)
+    redis.publish('timeline:public:bubble:media', @payload) if @status.bubble?
   end
 
   def remove_from_direct