rodrigo/iachat
1
0
Fork 0
Code Issues Pull Requests Actions 3 Packages Projects Releases Wiki Activity

fix(internal-chat): use internal_chat_channel_id in delete payloads (#270)

Browse Source 
Backend broadcast payloads for internal_chat.message.deleted and
internal_chat.reaction.deleted used channel_id as the key, but the
frontend ActionCable handlers (and all other internal-chat events)
expect internal_chat_channel_id. This caused deleted messages and
removed reactions to stay visible on screen until a manual refresh.

Rename the key on the backend so the payloads match the convention
shared with message.created/updated and reaction.created, and drop the
defensive fallback on the frontend reaction-deleted handler.
This commit is contained in:
Gabriel Jablonski 2026-04-19 14:06:02 -03:00 committed by GitHub
parent e032fc7774
commit bd61458720
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/accounts/internal_chat/messages_controller.rb
View File

@ -40,7 +40,7 @@ class Api::V1::Accounts::InternalChat::MessagesController < Api::V1::Accounts::I
authorize @message, :destroy?, policy_class: InternalChat::MessagePolicy
message_data = {
id: @message.id,
channel_id: @message.internal_chat_channel_id,
internal_chat_channel_id: @message.internal_chat_channel_id,
account_id: @message.account_id
}
@message.update!(content: I18n.t('internal_chat.messages.deleted'), content_attributes: { deleted: true })

2
app/controllers/api/v1/accounts/internal_chat/reactions_controller.rb
View File

@ -17,7 +17,7 @@ class Api::V1::Accounts::InternalChat::ReactionsController < Api::V1::Accounts::
reaction_data = {
id: @reaction.id,
message_id: @reaction.internal_chat_message_id,
channel_id: @message.internal_chat_channel_id,
internal_chat_channel_id: @message.internal_chat_channel_id,
account_id: @message.account_id,
user_id: @reaction.user_id,
emoji: @reaction.emoji

2
app/javascript/dashboard/helper/actionCable.js
View File

@ -342,7 +342,7 @@ class ActionCableConnector extends BaseActionCableConnector {
onInternalChatReactionDeleted = data => {
this.app.$store.dispatch('internalChat/messages/removeReactionFromCable', {
channelId: data.internal_chat_channel_id || data.channel_id,
channelId: data.internal_chat_channel_id,
messageId: data.message_id,
reactionId: data.id,
});

4
app/listeners/internal_chat_listener.rb
View File

@ -24,7 +24,7 @@ class InternalChatListener < BaseListener
def internal_chat_message_deleted(event)
message_data = event.data[:message_data]
account = Account.find_by(id: message_data[:account_id])
channel = InternalChat::Channel.find_by(id: message_data[:channel_id])
channel = InternalChat::Channel.find_by(id: message_data[:internal_chat_channel_id])
return if account.blank? || channel.blank?
return unless channel.account_id == account.id
@ -93,7 +93,7 @@ class InternalChatListener < BaseListener
def internal_chat_reaction_deleted(event)
reaction_data = event.data[:reaction_data]
account = Account.find_by(id: reaction_data[:account_id])
channel = InternalChat::Channel.find_by(id: reaction_data[:channel_id])
channel = InternalChat::Channel.find_by(id: reaction_data[:internal_chat_channel_id])
return if account.blank? || channel.blank?
return unless channel.account_id == account.id

16
spec/listeners/internal_chat_listener_spec.rb
View File

@ -148,7 +148,7 @@ describe InternalChatListener do
describe '#internal_chat_message_deleted' do
let!(:channel) { create(:internal_chat_channel, :public_channel, account: account) }
let(:message_data) { { account_id: account.id, channel_id: channel.id, id: 999 } }
let(:message_data) { { account_id: account.id, internal_chat_channel_id: channel.id, id: 999 } }
let!(:event) { Events::Base.new(:'internal_chat.message.deleted', Time.zone.now, message_data: message_data) }
it 'broadcasts to all channel members' do
@ -157,14 +157,14 @@ describe InternalChatListener do
'internal_chat.message.deleted',
hash_including(
account_id: account.id,
channel_id: channel.id
internal_chat_channel_id: channel.id
)
)
listener.internal_chat_message_deleted(event)
end
context 'when account or channel is not found' do
let(:message_data) { { account_id: 0, channel_id: 0, id: 999 } }
let(:message_data) { { account_id: 0, internal_chat_channel_id: 0, id: 999 } }
it 'does not broadcast' do
expect(ActionCableBroadcastJob).not_to receive(:perform_later)
@ -175,7 +175,7 @@ describe InternalChatListener do
context 'when account and channel belong to different accounts' do
let(:other_account) { create(:account) }
let(:other_channel) { create(:internal_chat_channel, :public_channel, account: other_account) }
let(:message_data) { { account_id: account.id, channel_id: other_channel.id, id: 999 } }
let(:message_data) { { account_id: account.id, internal_chat_channel_id: other_channel.id, id: 999 } }
it 'does not broadcast' do
expect(ActionCableBroadcastJob).not_to receive(:perform_later)
@ -186,7 +186,7 @@ describe InternalChatListener do
describe '#internal_chat_reaction_deleted' do
let!(:channel) { create(:internal_chat_channel, :public_channel, account: account) }
let(:reaction_data) { { account_id: account.id, channel_id: channel.id, id: 999 } }
let(:reaction_data) { { account_id: account.id, internal_chat_channel_id: channel.id, id: 999 } }
let!(:event) { Events::Base.new(:'internal_chat.reaction.deleted', Time.zone.now, reaction_data: reaction_data) }
it 'broadcasts to all channel members' do
@ -195,14 +195,14 @@ describe InternalChatListener do
'internal_chat.reaction.deleted',
hash_including(
account_id: account.id,
channel_id: channel.id
internal_chat_channel_id: channel.id
)
)
listener.internal_chat_reaction_deleted(event)
end
context 'when account or channel is not found' do
let(:reaction_data) { { account_id: 0, channel_id: 0, id: 999 } }
let(:reaction_data) { { account_id: 0, internal_chat_channel_id: 0, id: 999 } }
it 'does not broadcast' do
expect(ActionCableBroadcastJob).not_to receive(:perform_later)
@ -213,7 +213,7 @@ describe InternalChatListener do
context 'when account and channel belong to different accounts' do
let(:other_account) { create(:account) }
let(:other_channel) { create(:internal_chat_channel, :public_channel, account: other_account) }
let(:reaction_data) { { account_id: account.id, channel_id: other_channel.id, id: 999 } }
let(:reaction_data) { { account_id: account.id, internal_chat_channel_id: other_channel.id, id: 999 } }
it 'does not broadcast' do
expect(ActionCableBroadcastJob).not_to receive(:perform_later)