Software /
code /
prosody
File
plugins/muc/persistent.lib.lua @ 10684:de607875d4bd
MUC: Pass previous role to :publicise_occupant_status() whenever possible
Currently there is what amounts to a hack in presence_broadcast.lib.lua to
make it always broadcast presence with roles of "none". This is to ensure
that if you previously saw available presence for someone, you will also
see the unavailable presence (which always has role="none").
The correct approach is to take into account what the previous role was (
i.e. answer the question: "Was the available presence for this occupant
a role for which presence broadcast is enabled?).
The logic is already in place to do this correctly, but most call sites
do not provide the previous role (prev_role argument) of the occupant,
which causes it to not be used. In its place the hack to always broadcast
presence of role="none" has allowed things to continue to work.
The intention is that a subsequent commit will remove the unconditional
broadcast of role="none".
author | Matthew Wild <mwild1@gmail.com> |
---|---|
date | Thu, 12 Mar 2020 14:10:12 +0000 |
parent | 9053:ea9e1f8f3013 |
child | 12642:9061f9621330 |
line wrap: on
line source
-- Prosody IM -- Copyright (C) 2008-2010 Matthew Wild -- Copyright (C) 2008-2010 Waqas Hussain -- Copyright (C) 2014 Daurnimator -- -- This project is MIT/X11 licensed. Please see the -- COPYING file in the source package for more information. -- local restrict_persistent = not module:get_option_boolean("muc_room_allow_persistent", true); local um_is_admin = require "core.usermanager".is_admin; local function get_persistent(room) return room._data.persistent; end local function set_persistent(room, persistent) persistent = persistent and true or nil; if get_persistent(room) == persistent then return false; end room._data.persistent = persistent; return true; end module:hook("muc-config-form", function(event) if restrict_persistent and not um_is_admin(event.actor, module.host) then -- Don't show option if hidden rooms are restricted and user is not admin of this host return; end table.insert(event.form, { name = "muc#roomconfig_persistentroom"; type = "boolean"; label = "Persistent (room should remain even when it is empty)"; desc = "Rooms are automatically deleted when they are empty, unless this option is enabled"; value = get_persistent(event.room); }); end, 100-5); module:hook("muc-config-submitted/muc#roomconfig_persistentroom", function(event) if restrict_persistent and not um_is_admin(event.actor, module.host) then return; -- Not allowed end if set_persistent(event.room, event.value) then event.status_codes["104"] = true; end end); module:hook("muc-disco#info", function(event) event.reply:tag("feature", {var = get_persistent(event.room) and "muc_persistent" or "muc_temporary"}):up(); end); module:hook("muc-room-destroyed", function(event) set_persistent(event.room, false); end, -100); return { get = get_persistent; set = set_persistent; };