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 | ab312cfc01bb6ea001fb039ffc7bb48e6a3396b0 (patch) | |
| tree | 7aff8927628435c23c24605936504e27bc3a7624 | |
| parent | 325833753210cd7bd87f997096237e53624f9726 (diff) | |
| parent | 4b57f0ced9248faa7059d28f38c95be149e96918 (diff) | |
| download | prosody-ab312cfc01bb6ea001fb039ffc7bb48e6a3396b0.tar.gz prosody-ab312cfc01bb6ea001fb039ffc7bb48e6a3396b0.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> |