aboutsummaryrefslogtreecommitdiff
path: root/libdino/src/service/file_manager.vala
diff options
context:
space:
mode:
authorMarvin W <git@larma.de>2020-01-09 14:28:08 +0100
committerMarvin W <git@larma.de>2020-01-09 14:28:08 +0100
commit3fc9bdab053e23ab8e97afadfee0a05afad8d890 (patch)
treed0637d1aaf6f54ba68e6ce26816518a63eb5f6fb /libdino/src/service/file_manager.vala
parent5e1f646cbcc0cc4ac08faf76afe5becba4dfd4c6 (diff)
downloaddino-3fc9bdab053e23ab8e97afadfee0a05afad8d890.tar.gz
dino-3fc9bdab053e23ab8e97afadfee0a05afad8d890.zip
Correctly display names in groupchat pms
Also show "Me" when no local alias is set instead of JID
Diffstat (limited to 'libdino/src/service/file_manager.vala')
-rw-r--r--libdino/src/service/file_manager.vala4
1 files changed, 2 insertions, 2 deletions
diff --git a/libdino/src/service/file_manager.vala b/libdino/src/service/file_manager.vala
index 7cd9aeaf..d0cabea7 100644
--- a/libdino/src/service/file_manager.vala
+++ b/libdino/src/service/file_manager.vala
@@ -42,7 +42,7 @@ public class FileManager : StreamInteractionModule, Object {
FileTransfer file_transfer = new FileTransfer();
file_transfer.account = conversation.account;
file_transfer.counterpart = conversation.counterpart;
- if (conversation.type_ in new Conversation.Type[]{Conversation.Type.GROUPCHAT, Conversation.Type.GROUPCHAT_PM}) {
+ if (conversation.type_.is_muc_semantic()) {
file_transfer.ourpart = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account) ?? conversation.account.bare_jid;
} else {
file_transfer.ourpart = conversation.account.full_jid;
@@ -292,7 +292,7 @@ public class FileManager : StreamInteractionModule, Object {
file_transfer.account = conversation.account;
file_transfer.direction = from.bare_jid.equals(conversation.account.bare_jid) ? FileTransfer.DIRECTION_SENT : FileTransfer.DIRECTION_RECEIVED;
file_transfer.counterpart = file_transfer.direction == FileTransfer.DIRECTION_RECEIVED ? from : conversation.counterpart;
- if (conversation.type_ in new Conversation.Type[]{Conversation.Type.GROUPCHAT, Conversation.Type.GROUPCHAT_PM}) {
+ if (conversation.type_.is_muc_semantic()) {
file_transfer.ourpart = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account) ?? conversation.account.bare_jid;
} else {
file_transfer.ourpart = conversation.account.full_jid;