diff options
| author | fiaxh <git@mx.ax.lt> | 2017-12-04 18:40:40 +0100 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2017-12-05 15:07:15 +0100 |
| commit | bbbfdf0551fdb03e793944243dcaaf811e8ac027 (patch) | |
| tree | de06d11dab6da4f5d7d6aa5a0fe893a558d09f4d /libdino/src/service/message_processor.vala | |
| parent | dc2dde5378b75743aa3110a00e47265cb440629b (diff) | |
| download | dino-bbbfdf0551fdb03e793944243dcaaf811e8ac027.tar.gz dino-bbbfdf0551fdb03e793944243dcaaf811e8ac027.zip | |
Match message with previously arrived marker
Diffstat (limited to 'libdino/src/service/message_processor.vala')
| -rw-r--r-- | libdino/src/service/message_processor.vala | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/libdino/src/service/message_processor.vala b/libdino/src/service/message_processor.vala index 757a0e1f..1a9b1872 100644 --- a/libdino/src/service/message_processor.vala +++ b/libdino/src/service/message_processor.vala @@ -104,16 +104,13 @@ public class MessageProcessor : StreamInteractionModule, Object { (!is_uuid && !db.contains_message(new_message, conversation.account))) { stream_interactor.get_module(MessageStorage.IDENTITY).add_message(new_message, conversation); - bool is_mam_message = Xep.MessageArchiveManagement.MessageFlag.get_flag(stanza) != null; - bool is_recent = new_message.local_time.compare(new DateTime.now_utc().add_hours(-24)) > 0; - if (!is_mam_message || is_recent) { - if (new_message.direction == Entities.Message.DIRECTION_SENT) { - message_sent(new_message, conversation); - } else { - message_received(new_message, conversation); - } + if (new_message.direction == Entities.Message.DIRECTION_SENT) { + message_sent(new_message, conversation); + } else { + message_received(new_message, conversation); } + bool is_mam_message = Xep.MessageArchiveManagement.MessageFlag.get_flag(stanza) != null; Core.XmppStream? stream = stream_interactor.get_stream(conversation.account); Xep.MessageArchiveManagement.Flag? mam_flag = stream != null ? stream.get_flag(Xep.MessageArchiveManagement.Flag.IDENTITY) : null; if (is_mam_message || (mam_flag != null && mam_flag.cought_up == true)) { |