prosody
930f38939f1e%3Ad0e6d5bc7ea2
Software / code / prosody
Changeset
10758:d0e6d5bc7ea2
Merge with upstream trunk
| author | Matthew Wild <mwild1@gmail.com> |
|---|---|
| date | Thu, 23 Apr 2020 13:53:18 +0100 |
| parents | 10757:9dec7cddb40b (diff) 10752:930f38939f1e (current diff) |
| children | 10759:817f1d6b499e |
| files | |
| diffstat | 2 files changed, 2 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/muc/muc.lib.lua Thu Apr 23 01:05:34 2020 +0200 +++ b/plugins/muc/muc.lib.lua Thu Apr 23 13:53:18 2020 +0100 @@ -144,7 +144,7 @@ -- 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
--- a/spec/scansion/muc_register.scs Thu Apr 23 01:05:34 2020 +0200 +++ b/spec/scansion/muc_register.scs Thu Apr 23 13:53:18 2020 +0100 @@ -200,7 +200,7 @@ 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>
