Mirror
/
zulip
mirror of https://github.com/zulip/zulip.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

markdown: Parse '/me' for multi-line messages. 

Previously, messages with more than one line did not parse '/me' at
the beginning of the message.  Since there's a reasonable way to
render multi-line messages, this commit adds support for doing so.

This change does potentially break with the expected behavior of other
slash commands, but it seems worth providing useful functionality over
a blind focus on consistency.

Fixes #11025.
This commit is contained in:
Vaibhav 2018-12-29 15:37:27 +05:30 committed by Tim Abbott
parent 5a8ad84381
commit 93914d8cd8
4 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frontend_tests/node_tests/markdown.js
View File

@ -438,7 +438,7 @@ run_test('message_flags', () => {
message = {subject: "No links here", raw_content: input};
markdown.apply_markdown(message);
assert.equal(message.is_me_message, false);
assert.equal(message.is_me_message, true);
input = "testing this @**all** @**Cordelia Lear**";
message = {subject: "No links here", raw_content: input};

2
static/js/compose.js
View File

@ -915,7 +915,7 @@ exports.initialize = function () {
var rendered_preview_html;
if (content !== undefined && markdown.is_status_message(content, rendered_content)) {
// Handle previews of /me messages
rendered_preview_html = "<strong>" + page_params.full_name + "</strong> " + rendered_content.slice(4 + 3, -4);
rendered_preview_html = "<p><strong>" + page_params.full_name + "</strong>" + rendered_content.slice("<p>/me".length);
} else {
rendered_preview_html = rendered_content;
}

3
static/js/markdown.js
View File

@ -136,9 +136,8 @@ exports.add_topic_links = function (message) {
exports.is_status_message = function (raw_content, content) {
return raw_content.indexOf('/me ') === 0 &&
raw_content.indexOf('\n') === -1 &&
content.indexOf('<p>') === 0 &&
content.lastIndexOf('</p>') === content.length - 4;
content.indexOf('</p>') !== -1;
};
function handleUnicodeEmoji(unicode_emoji) {

9
static/js/message_list_view.js
View File

@ -1106,8 +1106,13 @@ MessageListView.prototype = {
_maybe_format_me_message: function (message_container) {
if (message_container.msg.is_me_message) {
// Slice the '<p>/me ' off the front, and '</p>' off the end
message_container.status_message = message_container.msg.content.slice(4 + 3, -4);
// Slice the '<p>/me ' off the front, and '</p>' off the first line
// 'p' tag is sliced off to get sender in the same line as the
// first line of the message
var msg_content = message_container.msg.content;
var p_index = msg_content.indexOf('</p>');
message_container.status_message = msg_content.slice('<p>/me '.length, p_index) +
msg_content.slice(p_index + '</p>'.length);
message_container.include_sender = true;
} else {
message_container.status_message = false;