aboutsummaryrefslogtreecommitdiffstats
path: root/plugins
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2016-12-08 17:51:23 +0100
committerKim Alvefur <zash@zash.se>2016-12-08 17:51:23 +0100
commitf9869506eda3fd6248487a7033a40ca2a949e783 (patch)
tree5df03b68a3ec50df3ab9ddf2e9ec4598fd8a72ce /plugins
parent9ac77204baa77df1d42db6f713219601a7bd4e78 (diff)
downloadprosody-f9869506eda3fd6248487a7033a40ca2a949e783.tar.gz
prosody-f9869506eda3fd6248487a7033a40ca2a949e783.zip
mod_carbons: Rename some variables for clarity
Diffstat (limited to 'plugins')
-rw-r--r--plugins/mod_carbons.lua10
1 files changed, 6 insertions, 4 deletions
diff --git a/plugins/mod_carbons.lua b/plugins/mod_carbons.lua
index 4984b908..cb7d9233 100644
--- a/plugins/mod_carbons.lua
+++ b/plugins/mod_carbons.lua
@@ -24,21 +24,23 @@ local function message_handler(event, c2s)
local origin, stanza = event.origin, event.stanza;
local orig_type = stanza.attr.type or "normal";
local orig_from = stanza.attr.from;
+ local bare_from = jid_bare(orig_from);
local orig_to = stanza.attr.to;
-
+ local bare_to = jid_bare(orig_to);
+
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
- local bare_jid = jid_bare(orig_from);
+ local bare_jid = bare_from; -- JID of the local user
local target_session = origin;
local top_priority = false;
- local user_sessions = bare_sessions[bare_jid];
+ local user_sessions = bare_sessions[bare_from];
-- Stanza about to be delivered to a local client
if not c2s then
- bare_jid = jid_bare(orig_to);
+ bare_jid = bare_to;
target_session = full_sessions[orig_to];
user_sessions = bare_sessions[bare_jid];
if not target_session and user_sessions then