mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 21:57:45 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

plugins: Use get_option_enum where appropriate

Browse source
This commit is contained in:
Kim Alvefur 2021-01-16 21:04:58 +01:00
parent c4abd68e92
commit a8b0c56f65
5 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
plugins/mod_auth_internal_hashed.lua
View file

@ -22,7 +22,7 @@ local host = module.host;
local accounts = module:open_store("accounts"); local accounts = module:open_store("accounts");
local hash_name = module:get_option_string("password_hash", "SHA-1"); local hash_name = module:get_option_enum("password_hash", "SHA-1", "SHA-256");
local get_auth_db = assert(scram_hashers[hash_name], "SCRAM-"..hash_name.." not supported by SASL library"); local get_auth_db = assert(scram_hashers[hash_name], "SCRAM-"..hash_name.." not supported by SASL library");
local scram_name = "scram_"..hash_name:gsub("%-","_"):lower(); local scram_name = "scram_"..hash_name:gsub("%-","_"):lower();

2
plugins/mod_component.lua
View file

@ -85,7 +85,7 @@ function module.add_host(module)
end end
if env.connected then if env.connected then
local policy = module:get_option_string("component_conflict_resolve", "kick_new"); local policy = module:get_option_enum("component_conflict_resolve", "kick_new", "kick_old");
if policy == "kick_old" then if policy == "kick_old" then
env.session:close{ condition = "conflict", text = "Replaced by a new connection" }; env.session:close{ condition = "conflict", text = "Replaced by a new connection" };
else -- kick_new else -- kick_new

11
plugins/mod_mam/mamprefs.lib.lua
View file

@ -10,12 +10,15 @@
-- --
-- luacheck: ignore 122/prosody -- luacheck: ignore 122/prosody
local global_default_policy = module:get_option_string("default_archive_policy", true); local global_default_policy = module:get_option_enum("default_archive_policy", "always", "roster", "never", true, false);
if global_default_policy ~= "roster" then
global_default_policy = module:get_option_boolean("default_archive_policy", global_default_policy);
end
local smart_enable = module:get_option_boolean("mam_smart_enable", false); local smart_enable = module:get_option_boolean("mam_smart_enable", false);
if global_default_policy == "always" then
global_default_policy = true;
elseif global_default_policy == "never" then
global_default_policy = false;
end
do do
-- luacheck: ignore 211/prefs_format -- luacheck: ignore 211/prefs_format
local prefs_format = { local prefs_format = {

2
plugins/mod_pubsub/mod_pubsub.lua
View file

@ -179,7 +179,7 @@ module:hook("host-disco-items", function (event)
end end
end); end);
local admin_aff = module:get_option_string("default_admin_affiliation", "owner"); local admin_aff = module:get_option_enum("default_admin_affiliation", "owner", "publisher", "member", "outcast", "none");
module:default_permission("prosody:admin", ":service-admin"); module:default_permission("prosody:admin", ":service-admin");
local function get_affiliation(jid) local function get_affiliation(jid)
local bare_jid = jid_bare(jid); local bare_jid = jid_bare(jid);

2
plugins/mod_watchregistrations.lua
View file

@ -13,7 +13,7 @@ local jid_prep = require "prosody.util.jid".prep;
local registration_watchers = module:get_option_set("registration_watchers", module:get_option("admins", {})) / jid_prep; local registration_watchers = module:get_option_set("registration_watchers", module:get_option("admins", {})) / jid_prep;
local registration_from = module:get_option_string("registration_from", host); local registration_from = module:get_option_string("registration_from", host);
local registration_notification = module:get_option_string("registration_notification", "User $username just registered on $host from $ip"); local registration_notification = module:get_option_string("registration_notification", "User $username just registered on $host from $ip");
local msg_type = module:get_option_string("registration_notification_type", "chat"); local msg_type = module:get_option_enum("registration_notification_type", "chat", "normal", "headline");
local st = require "prosody.util.stanza"; local st = require "prosody.util.stanza";