Software / code / prosody
Changeset
9719:941497cdefc3
Merge 0.11->trunk
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Thu, 20 Dec 2018 14:49:50 +0100 |
| parents | 9717:537f6a27bdb6 (current diff) 9718:81ef96368bff (diff) |
| children | 9720:e7ddf70ae417 |
| files | plugins/muc/muc.lib.lua |
| diffstat | 2 files changed, 23 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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
--- 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"/> +
