# HG changeset patch
# User Kim Alvefur <zash@zash.se>
# Date 1545313790 -3600
# Node ID 941497cdefc36fee9f67bfa723b841fa15020fdb
# Parent  537f6a27bdb632585035889c49e22a17d94d678d# Parent  81ef96368bffd2812887c9ba10f33f3e3ddefa94
Merge 0.11->trunk

diff -r 537f6a27bdb6 -r 941497cdefc3 plugins/muc/muc.lib.lua
--- a/plugins/muc/muc.lib.lua	Wed Dec 19 23:14:30 2018 +0000
+++ b/plugins/muc/muc.lib.lua	Thu Dec 20 14:49:50 2018 +0100
@@ -1247,7 +1247,7 @@
 	else
 		local actor_affiliation = self:get_affiliation(actor);
 		if actor_affiliation == "owner" then
-			if jid_bare(actor) == jid then -- self change
+			if jid_bare(actor) == jid and is_downgrade then -- self change
 				-- need at least one owner
 				local is_last = true;
 				for j in self:each_affiliation("owner") do
diff -r 537f6a27bdb6 -r 941497cdefc3 spec/scansion/muc_register.scs
--- a/spec/scansion/muc_register.scs	Wed Dec 19 23:14:30 2018 +0000
+++ b/spec/scansion/muc_register.scs	Thu Dec 20 14:49:50 2018 +0100
@@ -504,3 +504,25 @@
 			<status xmlns='http://jabber.org/protocol/muc#user' code='110'/>
 		</x>
 	</presence>
+
+# Romeo sets their their own nickname via admin query (see #1273)
+Romeo sends:
+	<iq to="room@conference.localhost" id="reserve" type="set">
+		<query xmlns="http://jabber.org/protocol/muc#admin">
+			<item nick="Romeo" affiliation="owner" jid="${Romeo's JID}"/>
+		</query>
+	</iq>
+
+Romeo receives:
+	<presence from="room@conference.localhost/Romeo">
+		<x xmlns="http://jabber.org/protocol/muc#user">
+			<item xmlns="http://jabber.org/protocol/muc#user" role="moderator" jid="${Romeo's full JID}" affiliation="owner">
+				<actor xmlns="http://jabber.org/protocol/muc#user" nick="Romeo"/>
+			</item>
+			<status xmlns="http://jabber.org/protocol/muc#user" code="110"/>
+		</x>
+	</presence>
+
+Romeo receives:
+	<iq from="room@conference.localhost" id="reserve" type="result"/>
+