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

Show /me commands appropriately in last message view (#699)

Browse source 
Closes #600

Signed-off-by: Alyssa Rosenzweig <alyssa@rosenzweig.io>
This commit is contained in:
Alyssa Rosenzweig 2020-02-20 13:41:28 -05:00 committed by GitHub
parent a81af020f3
commit 78ef31dcf5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 25 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
main/src/ui/conversation_selector/conversation_selector_row.vala
View file

@ -140,14 +140,35 @@ public class ConversationSelectorRow : ListBoxRow {
MessageItem message_item = last_content_item as MessageItem; MessageItem message_item = last_content_item as MessageItem;
Message last_message = message_item.message; Message last_message = message_item.message;
if (conversation.type_ == Conversation.Type.GROUPCHAT) { string body = last_message.body;
nick_label.label = Util.get_participant_display_name(stream_interactor, conversation, last_message.from, true) + ": "; bool me_command = body.has_prefix("/me ");
/* If we have a /me command, we always show the display
* name, and we don't set me_is_me on
* get_participant_display_name, since that will return
* "Me" (internationalized), whereas /me commands expect to
* be in the third person. We also omit the colon in this
* case, and strip off the /me prefix itself. */
if (conversation.type_ == Conversation.Type.GROUPCHAT || me_command) {
nick_label.label = Util.get_participant_display_name(stream_interactor, conversation, last_message.from, !me_command);
} else if (last_message.direction == Message.DIRECTION_SENT) {
nick_label.label = _("Me");
} else { } else {
nick_label.label = last_message.direction == Message.DIRECTION_SENT ? _("Me") + ": " : ""; nick_label.label = "";
}
if (me_command) {
/* Don't slice off the space after /me */
body = body.slice("/me".length, body.length);
} else if (nick_label.label.length > 0) {
/* TODO: Is this valid for RTL languages? */
nick_label.label += ": ";
} }
message_label.attributes.filter((attr) => attr.equal(attr_style_new(Pango.Style.ITALIC))); message_label.attributes.filter((attr) => attr.equal(attr_style_new(Pango.Style.ITALIC)));
message_label.label = Util.summarize_whitespaces_to_space(last_message.body); message_label.label = Util.summarize_whitespaces_to_space(body);
break; break;
case FileItem.TYPE: case FileItem.TYPE:
FileItem file_item = last_content_item as FileItem; FileItem file_item = last_content_item as FileItem;