diff --git a/app/controllers/pusher_controller.rb b/app/controllers/pusher_controller.rb index 08ae05f61..23693ede3 100644 --- a/app/controllers/pusher_controller.rb +++ b/app/controllers/pusher_controller.rb @@ -10,17 +10,17 @@ class PusherController < ApplicationController end def valid_channel - valid_private_channel || valid_presence_channel + valid_private_dm_channel || valid_private_group_channel end - def valid_private_channel + def valid_private_dm_channel current_user && params[:channel_name] == "private-message-notifications-#{current_user.id}" end - def valid_presence_channel - return false unless params[:channel_name].include?("presence-channel-") + def valid_private_group_channel + return false unless params[:channel_name].include?("private-channel-") - id = params[:channel_name].split("presence-channel-")[1].split("-")[0] + id = params[:channel_name].split("private-channel-")[1].split("-")[0] channel = ChatChannel.find(id) channel.has_member?(current_user) end diff --git a/app/javascript/chat/chat.jsx b/app/javascript/chat/chat.jsx index 0e0c21dc0..15aff9df6 100644 --- a/app/javascript/chat/chat.jsx +++ b/app/javascript/chat/chat.jsx @@ -273,7 +273,7 @@ export default class Chat extends Component { ); this.subscribeChannelsToPusher( channels.filter(this.channelTypeFilterFn('invite_only')), - (channel) => `presence-channel-${channel.chat_channel_id}`, + (channel) => `private-channel-${channel.chat_channel_id}`, ); const chatChannelsList = document.getElementById( 'chatchannels__channelslist', @@ -352,7 +352,7 @@ export default class Chat extends Component { if (activeChannel.channel_type === 'open') this.subscribePusher(`open-channel-${channelId}`); } - this.subscribePusher(`presence-channel-${channelId}`); + this.subscribePusher(`private-channel-${channelId}`); }; setOpenChannelUsers = (res) => { diff --git a/app/models/chat_channel.rb b/app/models/chat_channel.rb index 5f96b6c89..2a40694cf 100644 --- a/app/models/chat_channel.rb +++ b/app/models/chat_channel.rb @@ -155,7 +155,7 @@ class ChatChannel < ApplicationRecord def pusher_channels if invite_only? - "presence-channel-#{id}" + "private-channel-#{id}" elsif open? "open-channel-#{id}" else