diff options
| author | Kim Alvefur <zash@zash.se> | 2019-07-08 02:44:32 +0200 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2019-07-08 02:44:32 +0200 |
| commit | f1406ebe53dd38003cd1fd3121946ae4924de03c (patch) | |
| tree | 6b13265c066c8c32f4ed5d44fc9ca8421d118d06 /plugins/muc/subject.lib.lua | |
| parent | 5399b9b9057f8202ceb25e933d10e1825383bc99 (diff) | |
| parent | 37fc8f2a2fdaac95d7aee6e51b88514f3febef31 (diff) | |
| download | prosody-f1406ebe53dd38003cd1fd3121946ae4924de03c.tar.gz prosody-f1406ebe53dd38003cd1fd3121946ae4924de03c.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 |