diff options
| author | Kim Alvefur <zash@zash.se> | 2017-03-16 21:01:45 +0100 |
|---|---|---|
| committer | Kim Alvefur <zash@zash.se> | 2017-03-16 21:01:45 +0100 |
| commit | e9634beff0b1b88b232722a926bb5ef00af89f1f (patch) | |
| tree | 171710201bf678bad2ed6a80ba0ef3a8d74dee0c /plugins | |
| parent | 0655146d217181c4022989276762803fac3635d4 (diff) | |
| download | prosody-e9634beff0b1b88b232722a926bb5ef00af89f1f.tar.gz prosody-e9634beff0b1b88b232722a926bb5ef00af89f1f.zip | |
mod_mam: Handle default_archive_policy option consistently
Diffstat (limited to 'plugins')
| -rw-r--r-- | plugins/mod_mam/mamprefs.lib.lua | 5 | ||||
| -rw-r--r-- | plugins/mod_mam/mod_mam.lua | 2 |
2 files changed, 5 insertions, 2 deletions
diff --git a/plugins/mod_mam/mamprefs.lib.lua b/plugins/mod_mam/mamprefs.lib.lua index a561b9d5..72c08886 100644 --- a/plugins/mod_mam/mamprefs.lib.lua +++ b/plugins/mod_mam/mamprefs.lib.lua @@ -10,7 +10,10 @@ -- -- luacheck: ignore 122/prosody -local global_default_policy = module:get_option("default_archive_policy", true); +local global_default_policy = module:get_option_string("default_archive_policy", true); +if global_default_policy ~= "roster" then + global_default_policy = module:get_option_boolean("default_archive_policy", global_default_policy); +end do -- luacheck: ignore 211/prefs_format diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index 6e6d6383..7ea14502 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -35,7 +35,7 @@ local time_now = os.time; local m_min = math.min; local timestamp, timestamp_parse = require "util.datetime".datetime, require "util.datetime".parse; local default_max_items, max_max_items = 20, module:get_option_number("max_archive_query_results", 50); -local global_default_policy = module:get_option("default_archive_policy", true); +local global_default_policy = module:get_option_string("default_archive_policy", true); if global_default_policy ~= "roster" then global_default_policy = module:get_option_boolean("default_archive_policy", global_default_policy); end |