accept site_id in all methods that later depend on it

lib/message_bus.rb

@@ -225,11 +225,13 @@ def publish(channel, data, opts = nil)
     user_ids = nil
     group_ids = nil
     client_ids = nil
+    site_id = nil
 
     if opts
       user_ids = opts[:user_ids]
       group_ids = opts[:group_ids]
       client_ids = opts[:client_ids]
+      site_id = opts[:site_id]
     end
 
     raise ::MessageBus::InvalidMessage if (user_ids || group_ids) && global?(channel)
@@ -250,12 +252,12 @@ def publish(channel, data, opts = nil)
       }
     end
 
-    reliable_pub_sub.publish(encode_channel_name(channel), encoded_data, channel_opts)
+    reliable_pub_sub.publish(encode_channel_name(channel, site_id), encoded_data, channel_opts)
   end
 
-  def blocking_subscribe(channel = nil, &blk)
+  def blocking_subscribe(channel = nil, site_id = nil, &blk)
     if channel
-      reliable_pub_sub.subscribe(encode_channel_name(channel), &blk)
+      reliable_pub_sub.subscribe(encode_channel_name(channel, site_id), &blk)
     else
       reliable_pub_sub.global_subscribe(&blk)
     end