Software /
code /
prosody-modules
Changeset
4191:e2728b540223
Merge
author | JC Brand <jc@opkode.com> |
---|---|
date | Mon, 12 Oct 2020 18:04:05 +0200 (2020-10-12) |
parents | 4190:e06258fc6cf1 (current diff) 4189:22e7b3d6fcae (diff) |
children | 4192:1be37846314a |
files | |
diffstat | 1 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/mod_smacks/mod_smacks.lua Mon Oct 12 18:01:54 2020 +0200 +++ b/mod_smacks/mod_smacks.lua Mon Oct 12 18:04:05 2020 +0200 @@ -26,6 +26,7 @@ local timer = require "util.timer"; local datetime = require "util.datetime"; +local xmlns_mam2 = "urn:xmpp:mam:2"; local xmlns_sm2 = "urn:xmpp:sm:2"; local xmlns_sm3 = "urn:xmpp:sm:3"; local xmlns_errors = "urn:ietf:params:xml:ns:xmpp-stanzas"; @@ -438,11 +439,16 @@ if session.username then if stanza.name == "message" and stanza.attr.xmlns == nil and ( stanza.attr.type == "chat" or ( stanza.attr.type or "normal" ) == "normal" ) then + -- don't store messages in offline store if they are mam results + local mam_result = stanza:get_child("result", xmlns_mam2); + if mam_result ~= nil then + return true; -- stanza already "handled", don't send an error and don't add it to offline storage + end -- do nothing here for normal messages and don't send out "message delivery errors", -- because messages are already in MAM at this point (no need to frighten users) local stanza_id = get_stanza_id(stanza, jid.bare(session.full_jid)); if session.mam_requested and stanza_id ~= nil then - session.log("debug", "mod_smacks delivery/failuere returning true for mam-handled stanza: mam-archive-id=%s", tostring(stanza_id)); + session.log("debug", "mod_smacks delivery/failure returning true for mam-handled stanza: mam-archive-id=%s", tostring(stanza_id)); return true; -- stanza handled, don't send an error end -- store message in offline store, if this client does not use mam *and* was the last client online @@ -451,7 +457,7 @@ if sessions and next(sessions) == session.resource and next(sessions, session.resource) == nil then local ok = module:fire_event("message/offline/handle", { origin = session, stanza = stanza } ); session.log("debug", "mod_smacks delivery/failuere returning %s for offline-handled stanza", tostring(ok)); - return ok; -- if stanza was handled, don't send an error + return ok; -- if stanza was handled, don't send an error end end end