From ce9eed3c88c9ec76e559dedb1ce101eff5433099 Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 7 Nov 2018 17:49:34 +0100 Subject: mod_register: Move dependency on mod_register_limits into mod_register_ibr --- plugins/mod_register.lua | 1 - plugins/mod_register_ibr.lua | 4 ++++ 2 files changed, 4 insertions(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_register.lua b/plugins/mod_register.lua index 49ff8a38..763e2fd9 100644 --- a/plugins/mod_register.lua +++ b/plugins/mod_register.lua @@ -11,7 +11,6 @@ local allow_registration = module:get_option_boolean("allow_registration", false if allow_registration then module:depends("register_ibr"); - module:depends("register_limits"); end module:depends("user_account_management"); diff --git a/plugins/mod_register_ibr.lua b/plugins/mod_register_ibr.lua index abfc1079..bbe7581d 100644 --- a/plugins/mod_register_ibr.lua +++ b/plugins/mod_register_ibr.lua @@ -18,6 +18,10 @@ local additional_fields = module:get_option("additional_registration_fields", {} local require_encryption = module:get_option_boolean("c2s_require_encryption", module:get_option_boolean("require_encryption", false)); +pcall(function () + module:depends("register_limits"); +end); + local account_details = module:open_store("account_details"); local field_map = { -- cgit v1.2.3 From f014ba0feb218c5131e68cd14cafb1feb3e8d7ad Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Wed, 7 Nov 2018 20:30:21 +0100 Subject: mod_storage_memory: Support the purge driver method --- plugins/mod_storage_memory.lua | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'plugins') diff --git a/plugins/mod_storage_memory.lua b/plugins/mod_storage_memory.lua index 9659f9e7..ed04a5fb 100644 --- a/plugins/mod_storage_memory.lua +++ b/plugins/mod_storage_memory.lua @@ -197,6 +197,12 @@ function driver:open(store, typ) -- luacheck: ignore 212/self return nil, "unsupported-store"; end +function driver:purge(user) -- luacheck: ignore 212/self + for _, store in pairs(memory) do + store[user] = nil; + end +end + if auto_purge_enabled then module:hook("resource-unbind", function (event) local user_bare_jid = event.session.username.."@"..event.session.host; -- cgit v1.2.3