paulmataruso/zulip
1
0
Fork 0
mirror of https://github.com/zulip/zulip.git synced 2025-11-06 15:03:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

markdown: Simulate message flags in frontend markdown processor.

Browse Source 
This eliminates an annoying bundle of complexity that caused the
frontend markdown processor's interface with the rest of Zulip's new
message processing code paths being more similar to that of a new
message from the server.

It also cuts down on code duplication.
This commit is contained in:
Tim Abbott
2022-03-23 23:01:47 -07:00
committed by Tim Abbott
parent 2dd0b386fe
commit 00332fd49d
4 changed files with 61 additions and 65 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
static/js/markdown.js
View File

@@ -8,7 +8,6 @@ import marked from "../third/marked/lib/marked";
import * as blueslip from "./blueslip";
import * as linkifiers from "./linkifiers";
import * as message_store from "./message_store";
// This contains zulip's frontend Markdown implementation; see
// docs/subsystems/markdown.md for docs on our Markdown syntax. The other
@@ -96,7 +95,9 @@ export function contains_backend_only_syntax(content) {
}
export function apply_markdown(message) {
message_store.init_booleans(message);
let mentioned = false;
let mentioned_group = false;
let mentioned_wildcard = false;
const options = {
userMentionHandler(mention, silently) {
@@ -107,7 +108,8 @@ export function apply_markdown(message) {
classes = "user-mention silent";
display_text = mention;
} else {
message.mentioned = true;
// Wildcard mention
mentioned_wildcard = true;
display_text = "@" + mention;
classes = "user-mention";
}
@@ -183,8 +185,8 @@ export function apply_markdown(message) {
classes = "user-mention silent";
} else {
if (helpers.my_user_id() === user_id) {
message.mentioned = true;
message.mentioned_me_directly = true;
// Personal mention of current user.
mentioned = true;
}
classes = "user-mention";
display_text = "@" + display_text;
@@ -206,7 +208,8 @@ export function apply_markdown(message) {
display_text = "@" + group.name;
classes = "user-group-mention";
if (helpers.is_member_of_user_group(group.id, helpers.my_user_id())) {
message.mentioned = true;
// Mentioned the current user's group.
mentioned_group = true;
}
}
@@ -233,13 +236,32 @@ export function apply_markdown(message) {
// mention yourself outside of the blockquote (and, above it). If that you do that, the
// following mentioned status is false; the backend rendering is authoritative and the
// only side effect is the lack red flash on immediately sending the message.
message.mentioned = false;
message.mentioned_me_directly = false;
//
// A better parser would be able to just ignore mentions
// inside; we just set all flags to False and let the
// server rendering correct the message flags, to avoid a
// flash of mention styling.
mentioned = false;
mentioned_group = false;
mentioned_wildcard = false;
return quote;
},
};
// Our Python-Markdown processor appends two \n\n to input
message.content = marked(message.raw_content + "\n\n", options).trim();
// Simulate message flags for our locally rendered
// message. Messages the user themselves sent via the browser are
// always marked as read.
message.flags = ["read"];
if (mentioned || mentioned_group) {
message.flags.push("mentioned");
}
if (mentioned_wildcard) {
message.flags.push("wildcard_mentioned");
}
message.is_me_message = is_status_message(message.raw_content);
}