Mercurial > prosody-modules

comparison mod_remote_roster/mod_remote_roster.lua @ 758:295ae44b8a01

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mod_remote_roster: Replace use of core_post_stanza() with module:send()
author Kim Alvefur <zash@zash.se>
date Wed, 01 Aug 2012 02:22:24 +0200
parents c86fc337d56f
children ad6e9b0fd15b
comparison
equal deleted inserted replaced
757:92c6f84ec446 758:295ae44b8a01
15 local load_roster = require "core.rostermanager".load_roster; 15 local load_roster = require "core.rostermanager".load_roster;
16 local save_roster = require "core.rostermanager".save_roster; 16 local save_roster = require "core.rostermanager".save_roster;
17 local rm_remove_from_roster = require "core.rostermanager".remove_from_roster; 17 local rm_remove_from_roster = require "core.rostermanager".remove_from_roster;
18 local rm_add_to_roster = require "core.rostermanager".add_to_roster; 18 local rm_add_to_roster = require "core.rostermanager".add_to_roster;
19 local rm_roster_push = require "core.rostermanager".roster_push; 19 local rm_roster_push = require "core.rostermanager".roster_push;
20 local core_post_stanza = core_post_stanza;
21 local user_exists = require "core.usermanager".user_exists; 20 local user_exists = require "core.usermanager".user_exists;
22 local add_task = require "util.timer".add_task; 21 local add_task = require "util.timer".add_task;
23 22
24 module:hook("iq-get/bare/jabber:iq:roster:query", function(event) 23 module:hook("iq-get/bare/jabber:iq:roster:query", function(event)
25 local origin, stanza = event.origin, event.stanza; 24 local origin, stanza = event.origin, event.stanza;
74 if item.attr.subscription == "remove" then 73 if item.attr.subscription == "remove" then
75 local r_item = roster[jid]; 74 local r_item = roster[jid];
76 if r_item then 75 if r_item then
77 local to_bare = node and (node.."@"..host) or host; -- bare JID 76 local to_bare = node and (node.."@"..host) or host; -- bare JID
78 --if r_item.subscription == "both" or r_item.subscription == "from" or (roster.pending and roster.pending[jid]) then 77 --if r_item.subscription == "both" or r_item.subscription == "from" or (roster.pending and roster.pending[jid]) then
79 -- core_post_stanza(hosts[module.host], st.presence({type="unsubscribed", from=stanza.attr.to, to=to_bare})); 78 -- module:send(st.presence({type="unsubscribed", from=stanza.attr.to, to=to_bare}));
80 --end 79 --end
81 --if r_item.subscription == "both" or r_item.subscription == "to" or r_item.ask then 80 --if r_item.subscription == "both" or r_item.subscription == "to" or r_item.ask then
82 -- core_post_stanza(hosts[module.host], st.presence({type="unsubscribe", from=stanza.attr.to, to=to_bare})); 81 -- module:send(st.presence({type="unsubscribe", from=stanza.attr.to, to=to_bare}));
83 --end 82 --end
84 roster[jid] = nil; 83 roster[jid] = nil;
85 if save_roster(from_node, from_host, roster) then 84 if save_roster(from_node, from_host, roster) then
86 session.send(st.reply(stanza)); 85 session.send(st.reply(stanza));
87 rm_roster_push(from_node, from_host, jid); 86 rm_roster_push(from_node, from_host, jid);
148 else 147 else
149 stanza:tag("item", {jid = jid, subscription = "remove"}); 148 stanza:tag("item", {jid = jid, subscription = "remove"});
150 end 149 end
151 stanza:up(); -- move out from item 150 stanza:up(); -- move out from item
152 stanza:up(); -- move out from stanza 151 stanza:up(); -- move out from stanza
153 core_post_stanza(hosts[module.host], stanza); 152 module:send(stanza);
154 end 153 end
155 end 154 end
156 155
157 module:hook("iq-set/bare/jabber:iq:roster:query", function(event) 156 module:hook("iq-set/bare/jabber:iq:roster:query", function(event)
158 local origin, stanza = event.origin, event.stanza; 157 local origin, stanza = event.origin, event.stanza;