Mercurial > prosody-hg

comparison plugins/mod_pubsub.lua @ 5570:f592409f5fcd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge 0.9->trunk
author Matthew Wild <mwild1@gmail.com>
date Fri, 10 May 2013 10:48:07 +0100
parents c45997aebaa2
children acae6289e0a6
comparison
equal deleted inserted replaced
5568:c463558bed45 5570:f592409f5fcd
78 return origin.send(reply); 78 return origin.send(reply);
79 end 79 end
80 80
81 function handlers.get_subscriptions(origin, stanza, subscriptions) 81 function handlers.get_subscriptions(origin, stanza, subscriptions)
82 local node = subscriptions.attr.node; 82 local node = subscriptions.attr.node;
83 if not node then
84 return origin.send(pubsub_error_reply(stanza, "nodeid-required"));
85 end
86 local ok, ret = service:get_subscriptions(node, stanza.attr.from, stanza.attr.from); 83 local ok, ret = service:get_subscriptions(node, stanza.attr.from, stanza.attr.from);
87 if not ok then 84 if not ok then
88 return origin.send(pubsub_error_reply(stanza, ret)); 85 return origin.send(pubsub_error_reply(stanza, ret));
89 end 86 end
90 local reply = st.reply(stanza) 87 local reply = st.reply(stanza)