From dad8bb5feebd8d32c1d4172d205b871e824d42b8 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 4 Mar 2019 12:56:31 +0100 Subject: mod_muc_mam: Strip the stanza 'to' attribute (fixes #1259) --- plugins/mod_muc_mam.lua | 2 ++ 1 file changed, 2 insertions(+) (limited to 'plugins/mod_muc_mam.lua') diff --git a/plugins/mod_muc_mam.lua b/plugins/mod_muc_mam.lua index 166a5c71..c92e22cd 100644 --- a/plugins/mod_muc_mam.lua +++ b/plugins/mod_muc_mam.lua @@ -208,6 +208,7 @@ module:hook("iq-set/bare/"..xmlns_mam..":query", function(event) if not is_stanza(item) then item = st.deserialize(item); end + item.attr.to = nil; item.attr.xmlns = "jabber:client"; fwd_st:add_child(item); @@ -329,6 +330,7 @@ local function save_to_history(self, stanza) if stanza.name == "message" and self:get_whois() == "anyone" then stored_stanza = st.clone(stanza); + stored_stanza.attr.to = nil; local actor = jid_bare(self._occupants[stanza.attr.from].jid); local affiliation = self:get_affiliation(actor) or "none"; local role = self:get_role(actor) or self:get_default_role(affiliation); -- cgit v1.2.3 From 2c8eecf7c2b3c27a4c3f29f49a081be2a578ae90 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 4 Mar 2019 12:57:42 +0100 Subject: mod_muc_mam: Move a comment to the line it describes --- plugins/mod_muc_mam.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins/mod_muc_mam.lua') diff --git a/plugins/mod_muc_mam.lua b/plugins/mod_muc_mam.lua index c92e22cd..c9430ae8 100644 --- a/plugins/mod_muc_mam.lua +++ b/plugins/mod_muc_mam.lua @@ -341,12 +341,12 @@ local function save_to_history(self, stanza) -- Policy check if not archiving_enabled(self) then return end -- Don't log - -- And stash it local with = stanza.name if stanza.attr.type then with = with .. "<" .. stanza.attr.type end + -- And stash it local id = archive:append(room_node, nil, stored_stanza, time_now(), with); if id then -- cgit v1.2.3 From 09a662026a3fc4c69eda9d8ef8862abac5569625 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Mon, 4 Mar 2019 12:58:20 +0100 Subject: mod_muc_mam: Add comment about the tricks done with the 'with' field --- plugins/mod_muc_mam.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins/mod_muc_mam.lua') diff --git a/plugins/mod_muc_mam.lua b/plugins/mod_muc_mam.lua index c9430ae8..ede4e57a 100644 --- a/plugins/mod_muc_mam.lua +++ b/plugins/mod_muc_mam.lua @@ -341,6 +341,7 @@ local function save_to_history(self, stanza) -- Policy check if not archiving_enabled(self) then return end -- Don't log + -- Save the type in the 'with' field, allows storing presence without conflicts local with = stanza.name if stanza.attr.type then with = with .. "<" .. stanza.attr.type -- cgit v1.2.3