From 187cb3ac5eb01b962afd5dab47d45be7e7c9d45b Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 4 Feb 2017 00:57:34 +0100 Subject: mod_mam: Correct import of util.rsm --- plugins/mod_mam/mod_mam.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_mam/mod_mam.lua b/plugins/mod_mam/mod_mam.lua index f6ca52c0..44141409 100644 --- a/plugins/mod_mam/mod_mam.lua +++ b/plugins/mod_mam/mod_mam.lua @@ -15,7 +15,7 @@ local xmlns_forward = "urn:xmpp:forward:0"; local um = require "core.usermanager"; local st = require "util.stanza"; -local rsm = require "rsm"; +local rsm = require "util.rsm"; local get_prefs = module:require"mamprefs".get; local set_prefs = module:require"mamprefs".set; local prefs_to_stanza = module:require"mamprefsxml".tostanza; -- cgit v1.2.3 From 310110c75d32ca27d60b97c9fa1dccc9099584ad Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 4 Feb 2017 00:58:48 +0100 Subject: mod_mam/mamprefs: Use 'prosody.hosts' instead of '_G.hosts' in case we ever deprecate the later --- plugins/mod_mam/mamprefs.lib.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'plugins') diff --git a/plugins/mod_mam/mamprefs.lib.lua b/plugins/mod_mam/mamprefs.lib.lua index 054b6861..09efc006 100644 --- a/plugins/mod_mam/mamprefs.lib.lua +++ b/plugins/mod_mam/mamprefs.lib.lua @@ -22,7 +22,7 @@ do }; end -local sessions = hosts[module.host].sessions; +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"); -- cgit v1.2.3 From 0e99534951484e5c1ab98897272c92ea6b13f8ff Mon Sep 17 00:00:00 2001 From: Kim Alvefur Date: Sat, 4 Feb 2017 00:59:10 +0100 Subject: mod_mam: Ignore "indirectly mutating read-only global variable prosody" warning [luacheck] --- plugins/mod_mam/mamprefs.lib.lua | 1 + 1 file changed, 1 insertion(+) (limited to 'plugins') diff --git a/plugins/mod_mam/mamprefs.lib.lua b/plugins/mod_mam/mamprefs.lib.lua index 09efc006..a561b9d5 100644 --- a/plugins/mod_mam/mamprefs.lib.lua +++ b/plugins/mod_mam/mamprefs.lib.lua @@ -8,6 +8,7 @@ -- -- XEP-0313: Message Archive Management for Prosody -- +-- luacheck: ignore 122/prosody local global_default_policy = module:get_option("default_archive_policy", true); -- cgit v1.2.3