From 2b1cedaf7ab92f6d549f61244802886b18a2e8ed Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 21 May 2016 19:10:03 +0200 Subject: mod_presence: Re-probe for contacts presence after outgoing 'subscribed' (fixes #673) --- plugins/mod_presence.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index 8dac2d35..a5b4f282 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -201,6 +201,7 @@ function handle_outbound_presence_subscriptions_and_probes(origin, stanza, from_ end core_post_stanza(origin, stanza); send_presence_of_available_resources(node, host, to_bare, origin); + core_post_stanza(origin, st.presence({ type = "probe", from = from_bare, to = to_bare })); elseif stanza.attr.type == "unsubscribed" then -- 1. send unavailable -- 2. route stanza -- cgit v1.2.3 From 8d720b7bfbdfa3d911bf609d3064e200e970d1a2 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 22 May 2016 14:37:52 +0200 Subject: util.sql: Import type too (fix global access) --- util/sql.lua | 1 + 1 file changed, 1 insertion(+) diff --git a/util/sql.lua b/util/sql.lua index 843e7dda..6fed1373 100644 --- a/util/sql.lua +++ b/util/sql.lua @@ -2,6 +2,7 @@ local setmetatable, getmetatable = setmetatable, getmetatable; local ipairs, unpack, select = ipairs, table.unpack or unpack, select; --luacheck: ignore 113 local tonumber, tostring = tonumber, tostring; +local type = type; local assert, pcall, xpcall, debug_traceback = assert, pcall, xpcall, debug.traceback; local t_concat = table.concat; local s_char = string.char; -- cgit v1.2.3 From baba98852da626da819c230e0a19385a0a885802 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sun, 22 May 2016 14:38:07 +0200 Subject: util.datamanager: Import tostring and type (fix global access) --- util/datamanager.lua | 2 ++ 1 file changed, 2 insertions(+) diff --git a/util/datamanager.lua b/util/datamanager.lua index dc98bd13..fb9ba3a4 100644 --- a/util/datamanager.lua +++ b/util/datamanager.lua @@ -17,7 +17,9 @@ local io_open = io.open; local os_remove = os.remove; local os_rename = os.rename; local tonumber = tonumber; +local tostring = tostring; local next = next; +local type = type; local t_insert = table.insert; local t_concat = table.concat; local envloadfile = require"util.envload".envloadfile; -- cgit v1.2.3