mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-03 21:27:38 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->0.10

Browse source
This commit is contained in:
Matthew Wild 2015-09-25 16:51:42 +01:00
commit 99fd12af8f
2 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
net/dns.lua
View file

@ -853,9 +853,7 @@ function resolver:receive(rset) -- - - - - - - - - - - - - - - - - receive
--self.print(response);
for j,rr in pairs(response.answer) do
if rr.name:sub(-#response.question[1].name, -1) == response.question[1].name then
self:remember(rr, response.question[1].type)
end
self:remember(rr, response.question[1].type)
end
-- retire the query

16
plugins/mod_pep.lua
View file

@ -16,10 +16,15 @@ local next = next;
local type = type;
local calculate_hash = require "util.caps".calculate_hash;
local core_post_stanza = prosody.core_post_stanza;
local bare_sessions = prosody.bare_sessions;
-- Used as canonical 'empty table'
local NULL = {};
-- data[user_bare_jid][node] = item_stanza
local data = {};
--- recipients[user_bare_jid][contact_full_jid][subscribed_node] = true
local recipients = {};
-- hash_map[hash][subscribed_nodes] = true
local hash_map = {};
module.save = function()
@ -120,6 +125,9 @@ module:hook("presence/bare", function(event)
local t = stanza.attr.type;
local self = not stanza.attr.to;
-- Only cache subscriptions if user is online
if not bare_sessions[user] then return; end
if not t then -- available presence
if self or subscription_presence(user, stanza.attr.from) then
local recipient = stanza.attr.from;
@ -283,3 +291,11 @@ module:hook("account-disco-items", function(event)
end
end
end);
module:hook("resource-unbind", function (event)
local user_bare_jid = event.session.username.."@"..event.session.host;
if not bare_sessions[user_bare_jid] then -- User went offline
-- We don't need this info cached anymore, clear it.
recipients[user_bare_jid] = nil;
end
end);