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

local jid_split = require "util.jid".split;
local jid_bare = require "util.jid".bare;
local load_roster = require "core.rostermanager".load_roster;

local blocked_servers = module:get_option_set("block_s2s_subscriptions")._items;

function filter_presence(event)
	if blocked_servers[event.origin.from_host] and event.stanza.attr.type == "subscribe" then
		local stanza = event.stanza;
		local to_user, to_host = jid_split(stanza.attr.to);
		local roster = load_roster(to_user, to_host);
		if roster and roster[jid_bare(stanza.attr.from)] then
			return; -- In roster, pass through
		end
		return true; -- Drop
	end
end

module:hook("presence/bare", filter_presence, 200); -- Client receiving