# HG changeset patch
# User Matthew Wild <mwild1@gmail.com>
# Date 1536944772 -3600
# Node ID a47bba3b35f34646407fcbe87704e52cb5b972e3
# Parent  c9eef7e8ee65ab3550b720cb7c34b4bda95d07ae
MUC: Don't kick user of a reserved nick if it's theirs (thanks pep.)

diff -r c9eef7e8ee65 -r a47bba3b35f3 plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Wed May 16 23:57:09 2018 +0200
+++ b/plugins/muc/muc.lib.lua	Fri Sep 14 18:06:12 2018 +0100
@@ -930,9 +930,12 @@
 		local registration_data;
 		if item.attr.nick then
 			local room_nick = self.jid.."/"..item.attr.nick;
-			if self:get_occupant_by_nick(room_nick) then
+			local existing_occupant = self:get_occupant_by_nick(room_nick);
+			if existing_occupant and existing_occupant.bare_jid ~= item.attr.jid then
+				module:log("debug", "Existing occupant for %s: %s does not match %s", room_nick, existing_occupant.bare_jid, item.attr.jid);
 				self:set_role(true, room_nick, nil, "This nickname is reserved");
 			end
+			module:log("debug", "Reserving %s for %s (%s)", item.attr.nick, item.attr.jid, item.attr.affiliation);
 			registration_data = { reserved_nickname = item.attr.nick };
 		end
 		success, errtype, err = self:set_affiliation(actor, item.attr.jid, item.attr.affiliation, reason, registration_data);
diff -r c9eef7e8ee65 -r a47bba3b35f3 spec/scansion/muc_register.scs
--- a/spec/scansion/muc_register.scs	Wed May 16 23:57:09 2018 +0200
+++ b/spec/scansion/muc_register.scs	Fri Sep 14 18:06:12 2018 +0100
@@ -381,3 +381,65 @@
 		</query>
 	</iq>
 
+Juliet sends:
+	<presence type="unavailable" to="room@conference.localhost/Juliet" />
+
+Juliet receives:
+	<presence from='room@conference.localhost/Juliet' type='unavailable' />
+
+Romeo receives:
+	<presence type='unavailable' from='room@conference.localhost/Juliet' />
+
+# Rosaline joins as herself
+
+Rosaline sends:
+	<presence to="room@conference.localhost/Rosaline">
+		<x xmlns="http://jabber.org/protocol/muc"/>
+	</presence>
+
+Rosaline receives:
+	<presence from="room@conference.localhost/Romeo" />
+
+Rosaline receives:
+	<presence from="room@conference.localhost/Rosaline" />
+
+Rosaline receives:
+	<message type='groupchat' from='room@conference.localhost'><subject/></message>
+
+Romeo receives:
+	<presence from='room@conference.localhost/Rosaline'>
+		<x xmlns='http://jabber.org/protocol/muc#user'>
+			<item jid="${Rosaline's full JID}" affiliation='none' role='participant'/>
+		</x>
+	</presence>
+
+# Romeo reserves her nickname for her
+
+Romeo sends:
+	<iq id='member2' to='room@conference.localhost' type='set'>
+		<query xmlns='http://jabber.org/protocol/muc#admin'>
+			<item affiliation='member' jid="${Rosaline's JID}" nick='Rosaline' />
+		</query>
+	</iq>
+
+Romeo receives:
+	<presence from='room@conference.localhost/Rosaline'>
+		<x xmlns='http://jabber.org/protocol/muc#user'>
+			<item affiliation='member' role='participant' jid="${Rosaline's full JID}">
+				<actor jid="${Romeo's full JID}" nick='Romeo'/>
+			</item>
+		</x>
+	</presence>
+
+Romeo receives:
+	<iq type='result' id='member2' from='room@conference.localhost' />
+
+Rosaline receives:
+	<presence from='room@conference.localhost/Rosaline'>
+		<x xmlns='http://jabber.org/protocol/muc#user'>
+			<item affiliation='member' role='participant' jid="${Rosaline's full JID}">
+				<actor nick='Romeo' />
+			</item>
+			<status xmlns='http://jabber.org/protocol/muc#user' code='110'/>
+		</x>
+	</presence>