Mercurial Mercurial > prosody > prosody-modules / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
mod_conversejs: Revert back to depending on mod_bookmarks
authorKim Alvefur <zash@zash.se>
Wed, 09 Feb 2022 18:16:33 +0100
changeset 4895 99cdc7cde150
parent 4894 347894e08b4f
child 4896 8dbaa5e753f3
mod_conversejs: Revert back to depending on mod_bookmarks
mod_conversejs/README.markdown file | annotate | diff | comparison | revisions
mod_conversejs/mod_conversejs.lua file | annotate | diff | comparison | revisions 
--- a/mod_conversejs/README.markdown	Wed Feb 09 18:10:27 2022 +0100
+++ b/mod_conversejs/README.markdown	Wed Feb 09 18:16:33 2022 +0100
@@ -10,6 +10,8 @@
   build:
     copy_directories:
     - templates
+  dependencies:
+  - mod_bookmarks
 ---
 
 Introduction
--- a/mod_conversejs/mod_conversejs.lua	Wed Feb 09 18:10:27 2022 +0100
+++ b/mod_conversejs/mod_conversejs.lua	Wed Feb 09 18:16:33 2022 +0100
@@ -16,12 +16,9 @@
 	module:depends("websocket");
 end);
 
-do
-	local mods = module:get_option_inherited_set("modules_enabled") - module:get_option_inherited_set("modules_disabled");
-	if not mods:contains("bookmarks") or mods:contains("bookmarks2") then
-		module:log("warn", "Converse.js does not work well without mod_bookmarks, consider enabling it");
-	end
-end
+pcall(function ()
+	module:depends("bookmarks");
+end);
 
 local cdn_url = module:get_option_string("conversejs_cdn", "https://cdn.conversejs.org");
prosody-modules