diff options
| author | Kim Alvefur <zash@zash.se> | 2020-11-05 22:31:25 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2020-11-05 22:31:25 +0100 |
| commit | 0c94d96263cffcdbe0cf5ea59ef0b172b32258c2 (patch) | |
| tree | 58547de6e7795740633c1b93e67c217eb621fe8f /plugins/muc/subject.lib.lua | |
| parent | 20cb21003f0374e7078e1a29ffb36a7028c6b9ef (diff) | |
| parent | 4afbfc6854ebc374acc34729fdc6e472b44b07f1 (diff) | |
| download | prosody-0c94d96263cffcdbe0cf5ea59ef0b172b32258c2.tar.gz prosody-0c94d96263cffcdbe0cf5ea59ef0b172b32258c2.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 14256bbc..3230817c 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 |