diff options
| author | fiaxh <git@mx.ax.lt> | 2017-08-16 17:58:04 +0200 |
|---|---|---|
| committer | fiaxh <git@mx.ax.lt> | 2017-08-17 01:37:15 +0200 |
| commit | bff6885a6bb1a5a73d4c0b55294932231f242760 (patch) | |
| tree | 727ae6057b5c2fc2ef45bd840d12b5ec2afb1c15 | |
| parent | fb36ea055301b6db513a31acde30f315e2c0fd68 (diff) | |
| download | dino-bff6885a6bb1a5a73d4c0b55294932231f242760.tar.gz dino-bff6885a6bb1a5a73d4c0b55294932231f242760.zip | |
fixup 4aee957 (request history since last known messages)
| -rw-r--r-- | libdino/src/service/muc_manager.vala | 4 | ||||
| -rw-r--r-- | xmpp-vala/src/module/xep/0045_muc/module.vala | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libdino/src/service/muc_manager.vala b/libdino/src/service/muc_manager.vala index 779783cc..ea261300 100644 --- a/libdino/src/service/muc_manager.vala +++ b/libdino/src/service/muc_manager.vala @@ -36,11 +36,11 @@ public class MucManager : StreamInteractionModule, Object { string nick_ = nick ?? account.bare_jid.localpart ?? account.bare_jid.domainpart; set_autojoin(stream, jid, nick_, password); - string history_since = null; + DateTime? history_since = null; Conversation? conversation = stream_interactor.get_module(ConversationManager.IDENTITY).get_conversation(jid, account); if (conversation != null) { Entities.Message? last_message = stream_interactor.get_module(MessageStorage.IDENTITY).get_last_message(conversation); - if (last_message != null) history_since = last_message.time.to_string(); + if (last_message != null) history_since = last_message.time; } stream.get_module(Xep.Muc.Module.IDENTITY).enter(stream, jid.bare_jid.to_string(), nick_, password, history_since); diff --git a/xmpp-vala/src/module/xep/0045_muc/module.vala b/xmpp-vala/src/module/xep/0045_muc/module.vala index fd4e8ba5..98fda1a1 100644 --- a/xmpp-vala/src/module/xep/0045_muc/module.vala +++ b/xmpp-vala/src/module/xep/0045_muc/module.vala @@ -69,7 +69,7 @@ public class Module : XmppStreamModule { public signal void self_removed_from_room(XmppStream stream, string jid, StatusCode code); public signal void removed_from_room(XmppStream stream, string jid, StatusCode? code); - public void enter(XmppStream stream, string bare_jid, string nick, string? password, string? history_since) { + public void enter(XmppStream stream, string bare_jid, string nick, string? password, DateTime? history_since) { Presence.Stanza presence = new Presence.Stanza(); presence.to = bare_jid + "/" + nick; StanzaNode x_node = new StanzaNode.build("x", NS_URI).add_self_xmlns(); @@ -78,7 +78,7 @@ public class Module : XmppStreamModule { } if (history_since != null) { StanzaNode history_node = new StanzaNode.build("history", NS_URI); - history_node.set_attribute("since", history_since); + history_node.set_attribute("since", DateTimeProfiles.to_datetime(history_since)); x_node.put_node(history_node); } presence.stanza.put_node(x_node); |