paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-02 21:13:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

reminders: Fix poll and todo list not correctly formatted for reminder.

Browse Source
This commit is contained in:
Aman Agrawal
2025-07-02 10:03:25 +05:30
committed by Tim Abbott
parent 82abc7e10c
commit 5a65bd4746
2 changed files with 99 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
zerver/lib/reminders.py
View File

@@ -32,22 +32,36 @@ def get_reminder_formatted_content(message: Message, current_user: UserProfile)
content = _("You requested a reminder for the following direct message.")
# Format the message content as a quote.
user_silent_mention = silent_mention_syntax_for_user(message.sender)
conversation_url = message_link_url(current_user.realm, MessageDict.wide_dict(message))
content += "\n\n"
content += _("{user_silent_mention} [said]({conversation_url}):").format(
user_silent_mention=silent_mention_syntax_for_user(message.sender),
conversation_url=message_link_url(current_user.realm, MessageDict.wide_dict(message)),
)
content += "\n"
fence = get_unused_fence(content)
quoted_message = "{fence}quote\n{msg_content}\n{fence}"
content += quoted_message
length_without_message_content = len(content.format(fence=fence, msg_content=""))
max_length = settings.MAX_MESSAGE_LENGTH - length_without_message_content
msg_content = truncate_content(message.content, max_length, "\n[message truncated]")
return content.format(
fence=fence,
msg_content=msg_content,
)
if message.content.startswith("/poll"):
content += _("{user_silent_mention} [sent]({conversation_url}) a poll.").format(
user_silent_mention=user_silent_mention,
conversation_url=conversation_url,
)
elif message.content.startswith("/todo"):
content += _("{user_silent_mention} [sent]({conversation_url}) a todo list.").format(
user_silent_mention=user_silent_mention,
conversation_url=conversation_url,
)
else:
content += _("{user_silent_mention} [said]({conversation_url}):").format(
user_silent_mention=user_silent_mention,
conversation_url=conversation_url,
)
content += "\n"
fence = get_unused_fence(content)
quoted_message = "{fence}quote\n{msg_content}\n{fence}"
content += quoted_message
length_without_message_content = len(content.format(fence=fence, msg_content=""))
max_length = settings.MAX_MESSAGE_LENGTH - length_without_message_content
msg_content = truncate_content(message.content, max_length, "\n[message truncated]")
content = content.format(
fence=fence,
msg_content=msg_content,
)
return content
def access_reminder(user_profile: UserProfile, reminder_id: int) -> ScheduledMessage: