FEATURE: Link chat notifications directly to message (#23617)

- Updates `Chat::Message#url` to work in threads and for subfolder
- Updates Jobs::Chat::NotifyWatching to use message URL instead of channel url
This commit is contained in:
David Taylor 2023-09-16 20:37:35 +01:00 committed by GitHub
parent ebe68e15fc
commit 2791e75072
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 24 additions and 6 deletions

View File

@ -64,7 +64,7 @@ module Jobs
payload = { payload = {
username: @creator.username, username: @creator.username,
notification_type: ::Notification.types[:chat_message], notification_type: ::Notification.types[:chat_message],
post_url: @chat_channel.relative_url, post_url: @chat_message.url,
translated_title: ::I18n.t(translation_key, translation_args), translated_title: ::I18n.t(translation_key, translation_args),
tag: ::Chat::Notifier.push_notification_tag(:message, @chat_channel.id), tag: ::Chat::Notifier.push_notification_tag(:message, @chat_channel.id),
excerpt: @chat_message.push_notification_excerpt, excerpt: @chat_message.push_notification_excerpt,

View File

@ -250,7 +250,11 @@ module Chat
end end
def url def url
"/chat/c/-/#{self.chat_channel_id}/#{self.id}" if in_thread?
"#{Discourse.base_path}/chat/c/-/#{self.chat_channel_id}/t/#{self.thread_id}/#{self.id}"
else
"#{Discourse.base_path}/chat/c/-/#{self.chat_channel_id}/#{self.id}"
end
end end
def create_mentions def create_mentions

View File

@ -50,7 +50,7 @@ RSpec.describe Jobs::Chat::NotifyWatching do
{ {
username: user1.username, username: user1.username,
notification_type: Notification.types[:chat_message], notification_type: Notification.types[:chat_message],
post_url: channel.relative_url, post_url: message.url,
translated_title: translated_title:
I18n.t( I18n.t(
"discourse_push_notifications.popup.new_chat_message", "discourse_push_notifications.popup.new_chat_message",
@ -87,7 +87,7 @@ RSpec.describe Jobs::Chat::NotifyWatching do
{ {
username: user1.username, username: user1.username,
notification_type: Notification.types[:chat_message], notification_type: Notification.types[:chat_message],
post_url: channel.relative_url, post_url: message.url,
translated_title: translated_title:
I18n.t( I18n.t(
"discourse_push_notifications.popup.new_chat_message", "discourse_push_notifications.popup.new_chat_message",
@ -190,7 +190,7 @@ RSpec.describe Jobs::Chat::NotifyWatching do
{ {
username: user1.username, username: user1.username,
notification_type: Notification.types[:chat_message], notification_type: Notification.types[:chat_message],
post_url: channel.relative_url, post_url: message.url,
translated_title: translated_title:
I18n.t( I18n.t(
"discourse_push_notifications.popup.new_direct_chat_message", "discourse_push_notifications.popup.new_direct_chat_message",
@ -227,7 +227,7 @@ RSpec.describe Jobs::Chat::NotifyWatching do
{ {
username: user1.username, username: user1.username,
notification_type: Notification.types[:chat_message], notification_type: Notification.types[:chat_message],
post_url: channel.relative_url, post_url: message.url,
translated_title: translated_title:
I18n.t( I18n.t(
"discourse_push_notifications.popup.new_direct_chat_message", "discourse_push_notifications.popup.new_direct_chat_message",

View File

@ -589,4 +589,18 @@ describe Chat::Message do
expect(message.chat_mentions.pluck(:id)).to include(*existing_mention_ids) # the mentions weren't recreated expect(message.chat_mentions.pluck(:id)).to include(*existing_mention_ids) # the mentions weren't recreated
end end
end end
describe "#url" do
it "returns message permalink" do
expect(message.url).to eq("/chat/c/-/#{message.chat_channel_id}/#{message.id}")
end
it "returns message permalink when in thread" do
thread = Fabricate(:chat_thread)
first_message = thread.chat_messages.first
expect(first_message.url).to eq(
"/chat/c/-/#{first_message.chat_channel_id}/t/#{first_message.thread_id}/#{first_message.id}",
)
end
end
end end