aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc/muc.lib.lua
diff options
context:
space:
mode:
authordaurnimator <quae@daurnimator.com>2014-03-31 14:06:35 -0400
committerdaurnimator <quae@daurnimator.com>2014-03-31 14:06:35 -0400
commit8b8f89703e632711ee0a6371a2f7e2400176b692 (patch)
treebf7472ba43da0cbde34fb6ef8bccce7d6a70c5b7 /plugins/muc/muc.lib.lua
parentb3f385662f6c306d09b4409d3eef61bc91f57f7b (diff)
downloadprosody-8b8f89703e632711ee0a6371a2f7e2400176b692.tar.gz
prosody-8b8f89703e632711ee0a6371a2f7e2400176b692.zip
plugins/muc/muc.lib: Update declines to be more like invites
Diffstat (limited to 'plugins/muc/muc.lib.lua')
-rw-r--r--plugins/muc/muc.lib.lua53
1 files changed, 27 insertions, 26 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index a5118430..58fa7b83 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -1279,39 +1279,40 @@ module:hook("muc-invite", function(event)
end);
function room_mt:handle_mediated_decline(origin, stanza)
- local payload = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("decline")
+ local payload = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("decline");
local declinee = jid_prep(payload.attr.to);
- if declinee then
- local from, to = stanza.attr.from, stanza.attr.to;
- -- TODO: Validate declinee
- local reason = payload:get_child_text("reason")
- local decline = st.message({from = to, to = declinee, id = stanza.attr.id})
- :tag('x', {xmlns='http://jabber.org/protocol/muc#user'})
- :tag('decline', {from=from})
- :tag('reason'):text(reason or ""):up()
- :up()
- :up()
- :tag('body') -- Add a plain message for clients which don't support declines
- :text(from..' declined your invite to the room '..to..(reason and (' ('..reason..')') or ""))
- :up();
- module:fire_event("muc-decline", { room = self, stanza = decline, origin = origin, incoming = stanza });
- return true;
- else
+ if not declinee then
origin.send(st.error_reply(stanza, "cancel", "jid-malformed"));
return true;
+ elseif not module:fire_event("muc-pre-decline", {room = self, origin = origin, stanza = stanza}) then
+ return true;
end
+ local decline = st.message({from = self.jid, to = declinee, id = stanza.attr.id})
+ :tag("x", {xmlns = "http://jabber.org/protocol/muc#user"})
+ :tag("decline", {from = stanza.attr.from})
+ :tag("reason"):text(payload:get_child_text("reason")):up()
+ :up()
+ :up();
+ if not module:fire_event("muc-decline", {room = self, stanza = decline, origin = origin, incoming = stanza}) then
+ local occupant = self:get_occupant_by_real_jid(decline.attr.to);
+ if occupant then
+ self:route_to_occupant(occupant, decline);
+ else
+ self:route_stanza(decline);
+ end
+ end
+ return true;
end
+-- Add a plain message for clients which don't support declines
module:hook("muc-decline", function(event)
- local room, stanza = event.room, event.stanza
- local occupant = room:get_occupant_by_real_jid(stanza.attr.to);
- if occupant then
- room:route_to_occupant(occupant, stanza)
- else
- room:route_stanza(stanza);
- end
- return true;
-end, -1)
+ local room, stanza = event.room, event.stanza;
+ local decline = stanza:get_child("x", "http://jabber.org/protocol/muc#user"):get_child("decline");
+ local reason = decline:get_child_text("reason") or "";
+ stanza:tag("body")
+ :text(decline.attr.from.." declined your invite to the room "..room.jid..(reason == "" and (" ("..reason..")") or ""))
+ :up();
+end);
function room_mt:handle_message_to_room(origin, stanza)
local type = stanza.attr.type;