# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1587646398 -3600
# Node ID d0e6d5bc7ea217e16d2e152cb7c8303f5118421e
# Parent  9dec7cddb40b5900a221122ea49bfa5461847f30# Parent  930f38939f1e2fc8983e83a2449f71830adcb0b5
Merge with upstream trunk

diff -r 930f38939f1e -r d0e6d5bc7ea2 plugins/muc/muc.lib.lua
--- 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
diff -r 930f38939f1e -r d0e6d5bc7ea2 spec/scansion/muc_register.scs
--- 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>