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

local echo: Bypass message.flags array.

Browse Source 
We no longer set message.flags in the local echo path.

In the markdown parsing step, we just set message.mentioned
directly.

And then we change `insert_new_messages` to no longer
convert flags to booleans, and move that code to only
happen for incoming server message events.
This commit is contained in:
Steve Howell
2017-12-16 17:25:31 -05:00
committed by showell
parent 4d8d17d134
commit 0a3d769911
8 changed files with 81 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
static/js/markdown.js
View File

@@ -42,16 +42,8 @@ exports.contains_backend_only_syntax = function (content) {
return markedup !== undefined || false_filter_match !== undefined;
};
function push_uniquely(lst, elem) {
if (!_.contains(lst, elem)) {
lst.push(elem);
}
}
exports.apply_markdown = function (message) {
if (message.flags === undefined) {
message.flags = [];
}
message_store.init_booleans(message);
// Our python-markdown processor appends two \n\n to input
var options = {
@@ -59,13 +51,14 @@ exports.apply_markdown = function (message) {
var person = people.get_by_name(name);
if (person !== undefined) {
if (people.is_my_user_id(person.user_id)) {
push_uniquely(message.flags, 'mentioned');
message.mentioned = true;
message.mentioned_me_directly = true;
}
return '<span class="user-mention" data-user-id="' + person.user_id + '">' +
'@' + person.full_name +
'</span>';
} else if (name === 'all' || name === 'everyone') {
push_uniquely(message.flags, 'mentioned');
message.mentioned = true;
return '<span class="user-mention" data-user-id="*">' +
'@' + name +
'</span>';
@@ -76,7 +69,7 @@ exports.apply_markdown = function (message) {
var group = user_groups.get_user_group_from_name(name);
if (group !== undefined) {
if (user_groups.is_member_of(group.id, people.my_current_user_id())) {
push_uniquely(message.flags, 'mentioned');
message.mentioned = true;
}
return '<span class="user-group-mention" data-user-group-id="' + group.id + '">' +
'@' + group.name +