Software / code / prosody
Changeset
7434:3b16f2802ef0
Merge 0.10->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Sun, 22 May 2016 14:39:20 +0200 |
| parents | 7429:713d6f8e84d0 (current diff) 7433:7eec6f3c7300 (diff) |
| children | 7436:649b89b2c840 |
| files | |
| diffstat | 3 files changed, 4 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/mod_presence.lua Sun May 22 02:16:57 2016 +0100 +++ b/plugins/mod_presence.lua Sun May 22 14:39:20 2016 +0200 @@ -178,6 +178,7 @@ 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
--- a/util/datamanager.lua Sun May 22 02:16:57 2016 +0100 +++ b/util/datamanager.lua Sun May 22 14:39:20 2016 +0200 @@ -17,7 +17,9 @@ 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;
--- a/util/sql.lua Sun May 22 02:16:57 2016 +0100 +++ b/util/sql.lua Sun May 22 14:39:20 2016 +0200 @@ -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;
