diff options
| author | fiaxh <git@lightrise.org> | 2020-09-06 15:42:54 +0200 |
|---|---|---|
| committer | fiaxh <git@lightrise.org> | 2020-09-07 15:29:32 +0200 |
| commit | b60e7da28aad7532b71e92c766ed3cc2698c47c5 (patch) | |
| tree | e944bf1e82a5d650c6cbd2695e9bb0d46609c488 /libdino | |
| parent | 2d31d9d4706d6fea870f9081a1451448f032473d (diff) | |
| download | dino-b60e7da28aad7532b71e92c766ed3cc2698c47c5.tar.gz dino-b60e7da28aad7532b71e92c766ed3cc2698c47c5.zip | |
Fix message duplication in MUC PMs
Diffstat (limited to 'libdino')
| -rw-r--r-- | libdino/src/entity/message.vala | 2 | ||||
| -rw-r--r-- | libdino/src/service/message_processor.vala | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libdino/src/entity/message.vala b/libdino/src/entity/message.vala index 272905a9..7192f6aa 100644 --- a/libdino/src/entity/message.vala +++ b/libdino/src/entity/message.vala @@ -81,7 +81,7 @@ public class Message : Object { if (counterpart_resource != null) counterpart = counterpart.with_resource(counterpart_resource); string our_resource = row[db.message.our_resource]; - if (type_.is_muc_semantic() && our_resource != null) { + if (type_ == Type.GROUPCHAT && our_resource != null) { ourpart = counterpart.with_resource(our_resource); } else if (our_resource != null) { ourpart = account.bare_jid.with_resource(our_resource); diff --git a/libdino/src/service/message_processor.vala b/libdino/src/service/message_processor.vala index 3e92e61f..5ddf86a6 100644 --- a/libdino/src/service/message_processor.vala +++ b/libdino/src/service/message_processor.vala @@ -598,7 +598,7 @@ public class MessageProcessor : StreamInteractionModule, Object { message.local_time = now; message.direction = Entities.Message.DIRECTION_SENT; message.counterpart = conversation.counterpart; - if (conversation.type_.is_muc_semantic()) { + if (conversation.type_ == Conversation.Type.GROUPCHAT) { message.ourpart = stream_interactor.get_module(MucManager.IDENTITY).get_own_jid(conversation.counterpart, conversation.account) ?? conversation.account.bare_jid; message.real_jid = conversation.account.bare_jid; } else { |