aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorMatthew Wild <mwild1@gmail.com>2015-09-02 18:55:35 +0100
committerMatthew Wild <mwild1@gmail.com>2015-09-02 18:55:35 +0100
commitee2c04d00330a6ac76b6360d2d06b02bcc001546 (patch)
tree75ae2e07fd0ffea8a7063e9fbc3e5dbd0108d619 /plugins
parent0944fb2e1b3c6b10fef40e93e0ba0ae72795acac (diff)
parent63f8291d160b050741e804e5a58e392381555e14 (diff)
downloadprosody-ee2c04d00330a6ac76b6360d2d06b02bcc001546.tar.gz
prosody-ee2c04d00330a6ac76b6360d2d06b02bcc001546.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_carbons.lua10
1 files changed, 4 insertions, 6 deletions
diff --git a/plugins/mod_carbons.lua b/plugins/mod_carbons.lua
index 51242809..9b94d58d 100644
--- a/plugins/mod_carbons.lua
+++ b/plugins/mod_carbons.lua
@@ -7,7 +7,7 @@ local st = require "util.stanza";
local jid_bare = require "util.jid".bare;
local xmlns_carbons = "urn:xmpp:carbons:2";
local xmlns_forward = "urn:xmpp:forward:0";
-local full_sessions, bare_sessions = full_sessions, bare_sessions;
+local full_sessions, bare_sessions = prosody.full_sessions, prosody.bare_sessions;
local function toggle_carbons(event)
local origin, stanza = event.origin, event.stanza;
@@ -21,14 +21,12 @@ module:hook("iq-set/self/"..xmlns_carbons..":enable", toggle_carbons);
local function message_handler(event, c2s)
local origin, stanza = event.origin, event.stanza;
- local orig_type = stanza.attr.type;
+ local orig_type = stanza.attr.type or "normal";
local orig_from = stanza.attr.from;
local orig_to = stanza.attr.to;
- if not (orig_type == nil
- or orig_type == "normal"
- or orig_type == "chat") then
- return -- No carbons for messages of type error or headline
+ if not(orig_type == "chat" or orig_type == "normal" and stanza:get_child("body")) then
+ return -- Only chat type messages
end
-- Stanza sent by a local client