File

mod_compliance_latest: Gracefull error logging on missing dependency. diff --git a/mod_compliance_latest/README.md b/mod_compliance_latest/README.md --- a/mod_compliance_latest/README.md +++ b/mod_compliance_latest/README.md @@ -9,13 +9,15 @@ rockspec: # Introduction -This module will always require and load to the lastest compliance tester we have in the community modules. -Currently this is [mod_compliance_2023]. +This meta-module will always `require` (and therefore auto-load) the lastest compliance tester we have in the community modules. +Currently this is [mod_compliance_2023]. See the linked module for further details. + +If you do not use the *Prosody plugin installer* this module will likely have limited value to you. +You can also just install the current compliance tester manually. # Configuration -Just load this module as any other module and it will automatically install [mod_compliance_2023] if you use the Prosody plugin installer. -See the linked module for further details. +Just load this module as any other module and it will automatically install and load [mod_compliance_2023] if you use the *Prosody plugin installer*. # Compatibility diff --git a/mod_compliance_latest/mod_compliance_latest.lua b/mod_compliance_latest/mod_compliance_latest.lua --- a/mod_compliance_latest/mod_compliance_latest.lua +++ b/mod_compliance_latest/mod_compliance_latest.lua @@ -1,1 +1,6 @@ -module:depends("compliance_2023"); +local success, err = pcall(function() module:depends("compliance_2023") end) + +if not success then + module:log("error", "Error, can't load module: mod_compliance_2023. Is this module downloaded in a folder readable by prosody?") + return 1, "Error: Couldn't load dependency mod_compliance_2023." +end

+
−-- Module to block all outgoing stanzas from a list of users
+
−
+
−local jid_bare = require "util.jid".bare;
+
−local is_admin = require "core.usermanager".is_admin;
+
−local set = require "util.set";
+
−
+
−local block_users = module:get_option_set("block_outgoing_users", {});
+
−local block_all = block_users:empty();
+
−
+
−local stanza_types = module:get_option_set("block_outgoing_stanzas", { "message" });
+
−local jid_types = set.new{ "host", "bare", "full" };
+
−
+
−local function block_stanza(event)
+
−	local stanza = event.stanza;
+
−	local from_jid = jid_bare(stanza.attr.from);
+
−	if stanza.attr.to == nil or stanza.attr.to == module.host or is_admin(from_jid, module.host) then
+
−		return;
+
−	end
+
−	if block_all or block_users:contains(from_jid)  then
+
−		module:log("debug", "Blocked outgoing %s stanza from %s", stanza.name, stanza.attr.from);
+
−		return true;
+
−	end
+
−end
+
−
+
−function module.load()
+
−	for stanza_type in stanza_types do
+
−		for jid_type in jid_types do
+
−			module:hook("pre-"..stanza_type.."/"..jid_type, block_stanza, 10000);
+
−		end
+
−	end
+
−end