diff options
| author | Kim Alvefur <zash@zash.se> | 2016-05-22 14:39:20 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2016-05-22 14:39:20 +0200 |
| commit | 21d018938d59ceb811a504be976ec05c44527aa9 (patch) | |
| tree | 0fbacc0858c54c8c025c98235af9e0f9ce32bca6 | |
| parent | 2568dcd9d3623d2a5334fe86b405c2f9985d804f (diff) | |
| parent | f7c696bc0b7d8878647ba115c36ac2309c3b970b (diff) | |
| download | prosody-21d018938d59ceb811a504be976ec05c44527aa9.tar.gz prosody-21d018938d59ceb811a504be976ec05c44527aa9.zip | |
Merge 0.10->trunk
| -rw-r--r-- | plugins/mod_presence.lua | 1 | ||||
| -rw-r--r-- | util/datamanager.lua | 2 | ||||
| -rw-r--r-- | util/sql.lua | 1 |
3 files changed, 4 insertions, 0 deletions
diff --git a/plugins/mod_presence.lua b/plugins/mod_presence.lua index 5e1eb404..cf762edc 100644 --- a/plugins/mod_presence.lua +++ b/plugins/mod_presence.lua @@ -178,6 +178,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 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; 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; |