From d091a6c3cd0812873bcdef53c51a2f60e12f2b8a Mon Sep 17 00:00:00 2001 From: fiaxh Date: Sun, 5 Apr 2020 16:19:56 +0200 Subject: Add keyboard shortcut (up key) to activate last message correction --- .../src/module/xep/0203_delayed_delivery.vala | 30 ++++++++++++---------- .../xep/0313_message_archive_management.vala | 2 +- 2 files changed, 17 insertions(+), 15 deletions(-) (limited to 'xmpp-vala/src') diff --git a/xmpp-vala/src/module/xep/0203_delayed_delivery.vala b/xmpp-vala/src/module/xep/0203_delayed_delivery.vala index 39666fa8..5105ac19 100644 --- a/xmpp-vala/src/module/xep/0203_delayed_delivery.vala +++ b/xmpp-vala/src/module/xep/0203_delayed_delivery.vala @@ -2,6 +2,21 @@ namespace Xmpp.Xep.DelayedDelivery { private const string NS_URI = "urn:xmpp:delay"; +public static DateTime? get_time_for_node(StanzaNode node) { + string? time = node.get_attribute("stamp"); + if (time != null) return DateTimeProfiles.parse_string(time); + return null; +} + +public static DateTime? get_time_for_message(MessageStanza message, Jid? jid = null) { + foreach (StanzaNode delay_node in message.stanza.get_subnodes("delay", NS_URI)) { + if (jid == null || delay_node.get_attribute("from") == jid.to_string()) { + return get_time_for_node(delay_node); + } + } + return null; +} + public class Module : XmppStreamModule { public static ModuleIdentity IDENTITY = new ModuleIdentity(NS_URI, "0203_delayed_delivery"); @@ -13,19 +28,6 @@ public class Module : XmppStreamModule { message.stanza.put_node(delay_node); } - public static DateTime? get_time_for_message(MessageStanza message) { - StanzaNode? delay_node = message.stanza.get_subnode("delay", NS_URI); - if (delay_node != null) { - return get_time_for_node(delay_node); - } - return null; - } - - public static DateTime? get_time_for_node(StanzaNode node) { - string? time = node.get_attribute("stamp"); - if (time != null) return DateTimeProfiles.parse_string(time); - return null; - } public override void attach(XmppStream stream) { stream.get_module(MessageModule.IDENTITY).received_pipeline.connect(received_pipeline_listener); @@ -52,7 +54,7 @@ public class ReceivedPipelineListener : StanzaListener { public override string[] after_actions { get { return after_actions_const; } } public override async bool run(XmppStream stream, MessageStanza message) { - DateTime? datetime = Module.get_time_for_message(message); + DateTime? datetime = get_time_for_message(message); if (datetime != null) message.add_flag(new MessageFlag(datetime)); return false; } diff --git a/xmpp-vala/src/module/xep/0313_message_archive_management.vala b/xmpp-vala/src/module/xep/0313_message_archive_management.vala index 504996e6..78d0aaff 100644 --- a/xmpp-vala/src/module/xep/0313_message_archive_management.vala +++ b/xmpp-vala/src/module/xep/0313_message_archive_management.vala @@ -141,7 +141,7 @@ public class ReceivedPipelineListener : StanzaListener { } StanzaNode? forward_node = message.stanza.get_deep_subnode(NS_VER(stream) + ":result", "urn:xmpp:forward:0:forwarded", DelayedDelivery.NS_URI + ":delay"); - DateTime? datetime = DelayedDelivery.Module.get_time_for_node(forward_node); + DateTime? datetime = DelayedDelivery.get_time_for_node(forward_node); string? mam_id = message.stanza.get_deep_attribute(NS_VER(stream) + ":result", NS_VER(stream) + ":id"); string? query_id = message.stanza.get_deep_attribute(NS_VER(stream) + ":result", NS_VER(stream) + ":queryid"); message.add_flag(new MessageFlag(datetime, mam_id, query_id)); -- cgit v1.2.3-54-g00ecf