From 68aefeafdd65dbfc04f378ef28b76a47242e2e91 Mon Sep 17 00:00:00 2001
From: Aman Agrawal <amanagr@zulip.com>
Date: Tue, 20 May 2025 09:20:31 +0530
Subject: [PATCH] reminder: Use pretty message link for reminder text.

---
 zerver/lib/reminders.py        | 21 +++++++++------------
 zerver/tests/test_reminders.py |  2 +-
 2 files changed, 10 insertions(+), 13 deletions(-)

diff --git a/zerver/lib/reminders.py b/zerver/lib/reminders.py
index 8a02142ddf..582cd3d9f2 100644
--- a/zerver/lib/reminders.py
+++ b/zerver/lib/reminders.py
@@ -5,7 +5,8 @@ from zerver.lib.markdown.fenced_code import get_unused_fence
 from zerver.lib.mention import silent_mention_syntax_for_user
 from zerver.lib.message import truncate_content
 from zerver.lib.message_cache import MessageDict
-from zerver.lib.url_encoding import near_message_url, topic_narrow_url
+from zerver.lib.topic_link_util import get_message_link_syntax
+from zerver.lib.url_encoding import near_message_url
 from zerver.models import Message, Stream, UserProfile
 
 
@@ -17,17 +18,13 @@ def get_reminder_formatted_content(message: Message, current_user: UserProfile)
             id=message.recipient.type_id,
             realm=current_user.realm,
         )
-        narrow_link = topic_narrow_url(
-            realm=current_user.realm,
-            stream=stream,
-            topic_name=message.topic_name(),
-        )
-        content = _(
-            "You requested a reminder for the following message sent to [{stream_name} > {topic_name}]({narrow_link})."
-        ).format(
-            stream_name=stream.name,
-            topic_name=message.topic_name(),
-            narrow_link=narrow_link,
+        content = _("You requested a reminder for {message_pretty_link}.").format(
+            message_pretty_link=get_message_link_syntax(
+                stream_id=stream.id,
+                stream_name=stream.name,
+                topic_name=message.topic_name(),
+                message_id=message.id,
+            )
         )
     else:
         content = _("You requested a reminder for the following direct message.")
diff --git a/zerver/tests/test_reminders.py b/zerver/tests/test_reminders.py
index 233a79f118..508188b575 100644
--- a/zerver/tests/test_reminders.py
+++ b/zerver/tests/test_reminders.py
@@ -61,7 +61,7 @@ class RemindersTest(ZulipTestCase):
 
     def get_channel_message_reminder_content(self, msg_content: str, msg_id: int) -> str:
         return (
-            "You requested a reminder for the following message sent to [Verona > test](http://zulip.testserver/#narrow/channel/3-Verona/topic/test).\n\n"
+            f"You requested a reminder for #**Verona>test@{msg_id}**.\n\n"
             f"@_**King Hamlet|10** [said](http://zulip.testserver/#narrow/channel/3-Verona/topic/test/near/{msg_id}):\n```quote\n{msg_content}\n```"
         )