diff options
| author | Matthew Wild <mwild1@gmail.com> | 2020-04-23 13:52:19 +0100 |
|---|---|---|
| committer | Matthew Wild <mwild1@gmail.com> | 2020-04-23 13:52:19 +0100 |
| commit | 4fdc7610738d092181ba0fe5f7fc1e5bee17e90e (patch) | |
| tree | 7aff8927628435c23c24605936504e27bc3a7624 | |
| parent | ff9bdefc7e961f217580194146ee6bda8c6b9827 (diff) | |
| parent | 145f8fbad7803a1cae4a715254533b63ccc79abf (diff) | |
| download | prosody-4fdc7610738d092181ba0fe5f7fc1e5bee17e90e.tar.gz prosody-4fdc7610738d092181ba0fe5f7fc1e5bee17e90e.zip | |
Merge 0.11->trunk
| -rw-r--r-- | plugins/muc/muc.lib.lua | 2 | ||||
| -rw-r--r-- | spec/scansion/muc_register.scs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/plugins/muc/muc.lib.lua b/plugins/muc/muc.lib.lua index 3b126522..d785a5a2 100644 --- a/plugins/muc/muc.lib.lua +++ b/plugins/muc/muc.lib.lua @@ -144,7 +144,7 @@ end -- actor is the attribute table local function add_item(x, affiliation, role, jid, nick, actor_nick, actor_jid, reason) - x:tag("item", {affiliation = affiliation; role = role; jid = jid; nick = nick;}) + x:tag("item", {affiliation = affiliation or "none"; role = role; jid = jid; nick = nick;}) if actor_nick or actor_jid then x:tag("actor", {nick = actor_nick; jid = actor_jid;}):up() end diff --git a/spec/scansion/muc_register.scs b/spec/scansion/muc_register.scs index 81612829..9fcce688 100644 --- a/spec/scansion/muc_register.scs +++ b/spec/scansion/muc_register.scs @@ -200,7 +200,7 @@ Juliet receives: Romeo receives: <message from='room@conference.localhost'> <x xmlns='http://jabber.org/protocol/muc#user' scansion:strict='true'> - <item jid="${Juliet's JID}" /> + <item jid="${Juliet's JID}" affiliation='none' /> </x> </message> |