From c5272aa642c3a56a19813ab909165e7dc56ba101 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 14 Feb 2017 18:51:20 +0100 Subject: mod_mam: Move stanza ID namespace to a common variable --- plugins/mod_mam/mod_mam.lua | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'plugins') diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index 44141409..df555a35 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -12,6 +12,7 @@ local xmlns_mam = "urn:xmpp:mam:1"; local xmlns_delay = "urn:xmpp:delay"; local xmlns_forward = "urn:xmpp:forward:0"; +local xmlns_st_id = "urn:xmpp:sid:0"; local um = require "core.usermanager"; local st = require "util.stanza"; @@ -248,7 +249,7 @@ local function message_handler(event, c2s) -- Filter out that claim to be from us stanza:maptags(function (tag) - if tag.name == "stanza-id" and tag.attr.xmlns == "urn:xmpp:sid:0" then + if tag.name == "stanza-id" and tag.attr.xmlns == xmlns_st_id then local by_user, by_host, res = jid_prepped_split(tag.attr.by); if not res and by_host == module.host and by_user == store_user then return nil; @@ -293,7 +294,7 @@ local function message_handler(event, c2s) -- And stash it local ok, id = archive:append(store_user, nil, stanza, time_now(), with); if ok then - stanza:tag("stanza-id", { xmlns = "urn:xmpp:sid:0", by = store_user.."@"..host, id = id }):up(); + stanza:tag("stanza-id", { xmlns = xmlns_st_id, by = store_user.."@"..host, id = id }):up(); if cleanup then cleanup[store_user] = true; end module:fire_event("archive-message-added", { origin = origin, stanza = stanza, for_user = store_user, id = id }); end -- cgit v1.2.3 From 293402a3388b91bbb51d0043718cca5a3e822f06 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Tue, 14 Feb 2017 18:51:41 +0100 Subject: mod_mam: Advertise Stanza ID support (XEP-0359) (thanks iNPUTmice) --- plugins/mod_mam/mod_mam.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins') diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index df555a35..81b0690c 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -366,5 +366,6 @@ module:hook("message/full", message_handler, 0); module:hook("account-disco-info", function(event) (event.reply or event.stanza):tag("feature", {var=xmlns_mam}):up(); + (event.reply or event.stanza):tag("feature", {var=xmlns_st_id}):up(); end); -- cgit v1.2.3