diff options
| author | Kim Alvefur <zash@zash.se> | 2019-11-16 16:52:31 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-11-16 16:52:31 +0100 |
| commit | 908f5b61c55e4cba39e61ac415b0fca384a1095d (patch) | |
| tree | 6e391ff6608608f181e42c92ee6dfd7c534da255 /plugins/muc/subject.lib.lua | |
| parent | c4c38d2f01d5f2711b527c7c2412250ed6c58738 (diff) | |
| parent | fd9ccf20d5b652dbad1f37cecd540661f4642ee6 (diff) | |
| download | prosody-908f5b61c55e4cba39e61ac415b0fca384a1095d.tar.gz prosody-908f5b61c55e4cba39e61ac415b0fca384a1095d.zip | |
Merge 0.11->trunk
Diffstat (limited to 'plugins/muc/subject.lib.lua')
| -rw-r--r-- | plugins/muc/subject.lib.lua | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/plugins/muc/subject.lib.lua b/plugins/muc/subject.lib.lua index 938abf61..c8b99cc7 100644 --- a/plugins/muc/subject.lib.lua +++ b/plugins/muc/subject.lib.lua @@ -94,6 +94,12 @@ module:hook("muc-occupant-groupchat", function(event) local stanza = event.stanza; local subject = stanza:get_child("subject"); if subject then + if stanza:get_child("body") or stanza:get_child("thread") then + -- Note: A message with a <subject/> and a <body/> or a <subject/> and + -- a <thread/> is a legitimate message, but it SHALL NOT be interpreted + -- as a subject change. + return; + end local room = event.room; local occupant = event.occupant; -- Role check for subject changes |