# HG changeset patch # User Matthew Wild # Date 1540996475 0 # Node ID cb684a0ded2a0327cf74a971d504b40f77b1fdd6 # Parent ae0aca2c0ebb11b47ebbb9dbdf7e9e6bc5c01cfa# Parent 07e3b8e60a6cb44e3ca482471ddea65a125e73e2 Merge 0.11->trunk diff -r ae0aca2c0ebb -r cb684a0ded2a plugins/muc/util.lib.lua --- a/plugins/muc/util.lib.lua Wed Oct 31 13:17:02 2018 +0000 +++ b/plugins/muc/util.lib.lua Wed Oct 31 14:34:35 2018 +0000 @@ -57,7 +57,7 @@ function _M.only_with_min_role(role) local min_role_value = _M.valid_roles[role]; - return function (nick, occupant) + return function (nick, occupant) --luacheck: ignore 212/nick if _M.valid_roles[occupant.role or "none"] >= min_role_value then return true; end diff -r ae0aca2c0ebb -r cb684a0ded2a spec/scansion/issue1224.scs --- a/spec/scansion/issue1224.scs Wed Oct 31 13:17:02 2018 +0000 +++ b/spec/scansion/issue1224.scs Wed Oct 31 14:34:35 2018 +0000 @@ -1,4 +1,4 @@ -# MUC: Room registration and reserved nicknames +# MUC: Handle affiliation changes from buggy clients [Client] Romeo jid: user@localhost @@ -53,6 +53,13 @@ Romeo receives: + + + + + + +Romeo receives: # Juliet connects, and joins the room diff -r ae0aca2c0ebb -r cb684a0ded2a spec/scansion/muc_affiliation_notify.scs --- a/spec/scansion/muc_affiliation_notify.scs Wed Oct 31 13:17:02 2018 +0000 +++ b/spec/scansion/muc_affiliation_notify.scs Wed Oct 31 14:34:35 2018 +0000 @@ -131,7 +131,7 @@ Finished! -Juliet receives: +Juliet receives: Finished! diff -r ae0aca2c0ebb -r cb684a0ded2a spec/scansion/muc_register.scs --- a/spec/scansion/muc_register.scs Wed Oct 31 13:17:02 2018 +0000 +++ b/spec/scansion/muc_register.scs Wed Oct 31 14:34:35 2018 +0000 @@ -57,6 +57,13 @@ Romeo receives: + + + + + + +Romeo receives: # Juliet connects, and joins the room @@ -186,6 +193,15 @@ Juliet receives: +# Romeo is notified of Juliet's sad decision + +Romeo receives: + + + + + + # Rosaline attempts once more to sneak into the room, disguised as Juliet Rosaline sends: @@ -236,6 +252,15 @@ +# An out-of-room affiliation change is received for Juliet + +Romeo receives: + + + + + + Romeo receives: