anotherim/anotherim-desktop
2
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Fix messages mistakenly treated as /me command (#872)

Browse source 
Per XEP-0245 only messages that start with "/me " (with the trailing
space) should treated as 3rd person actions.
This commit is contained in:
Kim Alvefur 2020-07-02 11:51:30 +02:00 committed by GitHub
parent 2824dedd22
commit 23c0216853
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main/src/ui/conversation_content_view/message_widget.vala
View file

@ -156,8 +156,8 @@ public class MessageItemWidget : SizeRequestBin {
if (markup_text.length > 10000) { if (markup_text.length > 10000) {
markup_text = markup_text.substring(0, 10000) + " [" + _("Message too long") + "]"; markup_text = markup_text.substring(0, 10000) + " [" + _("Message too long") + "]";
} }
if (message.body.has_prefix("/me")) { if (message.body.has_prefix("/me ")) {
markup_text = markup_text.substring(3); markup_text = markup_text.substring(4);
} }
if (conversation.type_ == Conversation.Type.GROUPCHAT) { if (conversation.type_ == Conversation.Type.GROUPCHAT) {
@ -166,10 +166,10 @@ public class MessageItemWidget : SizeRequestBin {
markup_text = Util.parse_add_markup(markup_text, null, true, true); markup_text = Util.parse_add_markup(markup_text, null, true, true);
} }
if (message.body.has_prefix("/me")) { if (message.body.has_prefix("/me ")) {
string display_name = Util.get_participant_display_name(stream_interactor, conversation, message.from); string display_name = Util.get_participant_display_name(stream_interactor, conversation, message.from);
string color = Util.get_name_hex_color(stream_interactor, conversation.account, message.real_jid ?? message.from, Util.is_dark_theme(label)); string color = Util.get_name_hex_color(stream_interactor, conversation.account, message.real_jid ?? message.from, Util.is_dark_theme(label));
markup_text = @"<span color=\"#$(color)\">$(Markup.escape_text(display_name))</span>" + markup_text; markup_text = @"<span color=\"#$(color)\">$(Markup.escape_text(display_name))</span> " + markup_text;
theme_dependent = true; theme_dependent = true;
} }