diff options
author | Kim Alvefur <zash@zash.se> | 2018-02-21 21:02:16 +0100 |
---|---|---|
committer | Kim Alvefur <zash@zash.se> | 2018-02-21 21:02:16 +0100 |
commit | 6946a55f8f301da7521536a4ff79edcf690f4aaa (patch) | |
tree | b997afd9f4fb6de3f4df1d13a8b68bf15943e5c0 /plugins/mod_mam/mamprefs.lib.lua | |
parent | 9cbd3fdfb49dc7cc8685edaa49d4f95988325ac0 (diff) | |
download | prosody-6946a55f8f301da7521536a4ff79edcf690f4aaa.tar.gz prosody-6946a55f8f301da7521536a4ff79edcf690f4aaa.zip |
mod_mam: Implement option to enable MAM implicitly when client support is detected (#867)
Diffstat (limited to 'plugins/mod_mam/mamprefs.lib.lua')
-rw-r--r-- | plugins/mod_mam/mamprefs.lib.lua | 25 |
1 files changed, 23 insertions, 2 deletions
diff --git a/plugins/mod_mam/mamprefs.lib.lua b/plugins/mod_mam/mamprefs.lib.lua index 1e05b9d1..dd82b626 100644 --- a/plugins/mod_mam/mamprefs.lib.lua +++ b/plugins/mod_mam/mamprefs.lib.lua @@ -14,6 +14,7 @@ local global_default_policy = module:get_option_string("default_archive_policy", 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); do -- luacheck: ignore 211/prefs_format @@ -30,17 +31,37 @@ local sessions = prosody.hosts[module.host].sessions; local archive_store = module:get_option_string("archive_store", "archive"); local prefs = module:open_store(archive_store .. "_prefs"); -local function get_prefs(user) +local function get_prefs(user, explicit) local user_sessions = sessions[user]; local user_prefs = user_sessions and user_sessions.archive_prefs if not user_prefs then + -- prefs not cached user_prefs = prefs:get(user); + if not user_prefs then + -- prefs not set + if smart_enable and explicit then + -- a mam-capable client was involved in this action, set defaults + user_prefs = { [false] = global_default_policy }; + prefs:set(user, user_prefs); + end + end if user_sessions then + -- cache settings if they originate from user action user_sessions.archive_prefs = user_prefs; end + if not user_prefs then + if smart_enable then + -- not yet enabled, either explicitly or "smart" + user_prefs = { [false] = false }; + else + -- no explicit settings, return defaults + user_prefs = { [false] = global_default_policy }; + end + end end - return user_prefs or { [false] = global_default_policy }; + return user_prefs; end + local function set_prefs(user, user_prefs) local user_sessions = sessions[user]; if user_sessions then |