Merge 0.11->trunk
authorMatthew Wild <mwild1@gmail.com>
Thu, 23 Apr 2020 13:52:19 +0100
changeset 10761 9dec7cddb40b
parent 10732 2764beb552cd (current diff)
parent 10760 a026e4f45f3f (diff)
child 10762 d0e6d5bc7ea2
Merge 0.11->trunk
plugins/muc/muc.lib.lua
spec/scansion/muc_register.scs
--- a/plugins/muc/muc.lib.lua	Mon Apr 20 11:30:59 2020 +0100
+++ b/plugins/muc/muc.lib.lua	Thu Apr 23 13:52:19 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	Mon Apr 20 11:30:59 2020 +0100
+++ b/spec/scansion/muc_register.scs	Thu Apr 23 13:52:19 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>