Comparison

plugins/mod_pubsub.lua @ 5420:706053e3f9f5

Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Wed, 03 Apr 2013 13:53:21 +0100
parent 5419:e28fca8faf62
child 5443:92615cfa2270
comparison
equal deleted inserted replaced
5400:dd91b72a3ba0 5420:706053e3f9f5
162 end 162 end
163 else 163 else
164 reply = pubsub_error_reply(stanza, ret); 164 reply = pubsub_error_reply(stanza, ret);
165 end 165 end
166 origin.send(reply); 166 origin.send(reply);
167 if ok then
168 -- Send all current items
169 local ok, items = service:get_items(node, stanza.attr.from);
170 if items then
171 local jids = { [jid] = options or true };
172 for id, item in pairs(items) do
173 service.config.broadcaster("items", node, jids, item);
174 end
175 end
176 end
177 end 167 end
178 168
179 function handlers.set_unsubscribe(origin, stanza, unsubscribe) 169 function handlers.set_unsubscribe(origin, stanza, unsubscribe)
180 local node, jid = unsubscribe.attr.node, unsubscribe.attr.jid; 170 local node, jid = unsubscribe.attr.node, unsubscribe.attr.jid;
181 if not (node and jid) then 171 if not (node and jid) then