annotate mod_block_s2s_subscriptions/mod_block_s2s_subscriptions.lua @ 6084:4c0e3fe57e92

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
author Menel <menel@snikket.de>
date Mon, 23 Dec 2024 12:58:03 +0100
parents 70ff25db37fa
children
Ignore whitespace changes - Everywhere: Within whitespace: At end of lines:
rev   line source
775
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
1
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
2 local jid_split = require "util.jid".split;
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
3 local jid_bare = require "util.jid".bare;
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
4 local load_roster = require "core.rostermanager".load_roster;
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
5
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
6 local blocked_servers = module:get_option_set("block_s2s_subscriptions")._items;
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
7
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
8 function filter_presence(event)
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
9 if blocked_servers[event.origin.from_host] and event.stanza.attr.type == "subscribe" then
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
10 local stanza = event.stanza;
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
11 local to_user, to_host = jid_split(stanza.attr.to);
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
12 local roster = load_roster(to_user, to_host);
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
13 if roster and roster[jid_bare(stanza.attr.from)] then
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
14 return; -- In roster, pass through
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
15 end
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
16 return true; -- Drop
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
17 end
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
18 end
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
19
70ff25db37fa mod_block_s2s_subscriptions: New module to block incoming presence subscriptions from non-contacts on selected remote hosts
Matthew Wild <mwild1@gmail.com>
parents:
diff changeset
20 module:hook("presence/bare", filter_presence, 200); -- Client receiving