FIX: Delete associated notifications when trashing chat messages. (#20144)

Deleting a message with a mention doesn't clear the associated notification, confusing the mentioned user.

There are different chat notification types, but we only care about `chat_mentioned` since `chat_quoted` is associated with a post, and `chat_message` is only for push notifications.

Unfortunately, this change doesn't fix the chat bubble getting out of sync when a message gets deleted since we track unread/mentions count with an integer, making it a bit hard to manipulate. We can follow up later if we consider it necessary.
This commit is contained in:
Roman Rizzi
2023-02-03 12:52:13 -03:00
committed by GitHub
parent 44df5ee7c8
commit 082cd13909
5 changed files with 61 additions and 9 deletions

View File

@ -611,7 +611,7 @@ RSpec.describe Chat::ChatController do
end
before do
ChatMessage.create(user: user, message: "this is a message", chat_channel: chat_channel)
ChatMessage.create!(user: user, message: "this is a message", chat_channel: chat_channel)
end
describe "for category" do

View File

@ -43,4 +43,48 @@ RSpec.describe ChatMessageDestroyer do
expect(message_2.reload).to be_present
end
end
describe "#trash_message" do
fab!(:message_1) { Fabricate(:chat_message) }
fab!(:actor) { Discourse.system_user }
it "trashes the message" do
described_class.new.trash_message(message_1, actor)
expect(ChatMessage.find_by(id: message_1.id)).to be_blank
expect(ChatMessage.with_deleted.find_by(id: message_1.id)).to be_present
end
context "when the message has associated notifications" do
context "when notification has the chat_mention type" do
it "deletes associated notification and chat mention relations" do
notification =
Fabricate(:notification, notification_type: Notification.types[:chat_mention])
chat_mention =
Fabricate(:chat_mention, chat_message: message_1, notification: notification)
described_class.new.trash_message(message_1, actor)
expect { notification.reload }.to raise_error(ActiveRecord::RecordNotFound)
expect { chat_mention.reload }.to raise_error(ActiveRecord::RecordNotFound)
end
end
end
it "publishes a MB message to update clients" do
delete_message =
MessageBus
.track_publish("/chat/#{message_1.chat_channel_id}") do
described_class.new.trash_message(message_1, actor)
end
.first
expect(delete_message).to be_present
message_data = delete_message.data
expect(message_data[:type]).to eq("delete")
expect(message_data[:deleted_id]).to eq(message_1.id)
expect(message_data[:deleted_at]).to be_present
end
end
end