aboutsummaryrefslogtreecommitdiffstats
path: root/plugins/muc/muc.lib.lua
diff options
context:
space:
mode:
authorKim Alvefur <zash@zash.se>2017-12-22 01:02:05 +0100
committerKim Alvefur <zash@zash.se>2017-12-22 01:02:05 +0100
commit689f3d3009eaaebd36cae0a29e5949506d525ef8 (patch)
treeed5804b849fbe1b94e32827eec5cf5b2c0c79eda /plugins/muc/muc.lib.lua
parentec21b99d0aea0d070af07b3f6e956d048dfabb77 (diff)
parent2d4c94e612c88e608c8b94980b6af34884ca6eb8 (diff)
downloadprosody-689f3d3009eaaebd36cae0a29e5949506d525ef8.tar.gz
prosody-689f3d3009eaaebd36cae0a29e5949506d525ef8.zip
Merge 0.10->trunk
Diffstat (limited to 'plugins/muc/muc.lib.lua')
-rw-r--r--plugins/muc/muc.lib.lua17
1 files changed, 17 insertions, 0 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua
index 8592e225..7de8ea24 100644
--- a/plugins/muc/muc.lib.lua
+++ b/plugins/muc/muc.lib.lua
@@ -164,6 +164,23 @@ function room_mt:build_item_list(occupant, x, is_anonymous, nick, actor_nick, ac
end
function room_mt:broadcast_message(stanza)
+ local to = stanza.attr.to;
+ local room_jid = self.jid;
+
+ stanza:maptags(function (child)
+ if child.name == "delay" and child.attr["xmlns"] == "urn:xmpp:delay" then
+ if child.attr["from"] == room_jid then
+ return nil;
+ end
+ end
+ if child.name == "x" and child.attr["xmlns"] == "jabber:x:delay" then
+ if child.attr["from"] == room_jid then
+ return nil;
+ end
+ end
+ return child;
+ end)
+
if module:fire_event("muc-broadcast-message", {room = self, stanza = stanza}) then
return true;
end