Software / code / prosody
Changeset
8928:d41f8ce67c8e
MUC: Reorder subject related arguments to increasing requiredness (API break)
| author | Kim Alvefur <zash@zash.se> |
|---|---|
| date | Tue, 26 Jun 2018 02:14:14 +0200 |
| parents | 8927:ed0891383e78 |
| children | 8929:415b2e9d8ba8 |
| files | plugins/muc/subject.lib.lua |
| diffstat | 1 files changed, 6 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- a/plugins/muc/subject.lib.lua Mon Jun 25 13:53:17 2018 +0100 +++ b/plugins/muc/subject.lib.lua Tue Jun 26 02:14:14 2018 +0200 @@ -12,7 +12,7 @@ local muc_util = module:require "muc/util"; local valid_roles = muc_util.valid_roles; -local function create_subject_message(from, subject) +local function create_subject_message(subject, from) return st.message({from = from; type = "groupchat"}) :tag("subject"):text(subject or ""):up(); end @@ -53,7 +53,7 @@ local function get_subject(room) -- a <message/> stanza from the room JID (or from the occupant JID of the entity that set the subject) - return room._data.subject_from or room.jid, room._data.subject; + return room._data.subject, room._data.subject_from or room.jid; end local function send_subject(room, to) @@ -62,13 +62,13 @@ room:route_stanza(msg); end -local function set_subject(room, from, subject) +local function set_subject(room, subject, from) if subject == "" then subject = nil; end - local old_from, old_subject = get_subject(room); + local old_subject, old_from = get_subject(room); if old_subject == subject and old_from == from then return false; end room._data.subject_from = from; room._data.subject = subject; - local msg = create_subject_message(from, subject); + local msg = create_subject_message(subject, from); room:broadcast_message(msg); return true; end @@ -90,7 +90,7 @@ local role_rank = valid_roles[occupant and occupant.role or "none"]; if role_rank >= valid_roles.moderator or ( role_rank >= valid_roles.participant and get_changesubject(room) ) then -- and participant - set_subject(room, occupant.nick, subject:get_text()); + set_subject(room, subject:get_text(), occupant.nick); room:save(); return true; else
