Mercurial > prosody-modules
annotate mod_email/mod_email.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 | 070faeaf51bc |
| children |
| rev | line source |
|---|---|
|
3762
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
1 module:set_global(); |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
2 |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
3 local moduleapi = require "core.moduleapi"; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
4 |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
5 local smtp = require"socket.smtp"; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
6 |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
7 local config = module:get_option("smtp", { origin = "prosody", exec = "sendmail" }); |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
8 |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
9 local function send_email(to, headers, content) |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
10 if type(headers) == "string" then -- subject |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
11 headers = { |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
12 Subject = headers; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
13 From = config.origin; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
14 }; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
15 end |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
16 headers.To = to; |
|
3836
070faeaf51bc
mod_email: Allow sender to override content-type
Matthew Wild <mwild1@gmail.com>
parents:
3762
diff
changeset
|
17 if not headers["Content-Type"] then |
|
070faeaf51bc
mod_email: Allow sender to override content-type
Matthew Wild <mwild1@gmail.com>
parents:
3762
diff
changeset
|
18 headers["Content-Type"] = 'text/plain; charset="utf-8"'; |
|
070faeaf51bc
mod_email: Allow sender to override content-type
Matthew Wild <mwild1@gmail.com>
parents:
3762
diff
changeset
|
19 end |
|
3762
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
20 local message = smtp.message{ |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
21 headers = headers; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
22 body = content; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
23 }; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
24 |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
25 if config.exec then |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
26 local pipe = io.popen(config.exec .. |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
27 " '"..to:gsub("'", "'\\''").."'", "w"); |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
28 |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
29 for str in message do |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
30 pipe:write(str); |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
31 end |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
32 |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
33 return pipe:close(); |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
34 end |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
35 |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
36 return smtp.send({ |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
37 user = config.user; password = config.password; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
38 server = config.server; port = config.port; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
39 domain = config.domain; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
40 |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
41 from = config.origin; rcpt = to; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
42 source = message; |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
43 }); |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
44 end |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
45 |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
46 assert(not moduleapi.send_email, "another email module is already loaded"); |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
47 function moduleapi:send_email(email) --luacheck: ignore 212/self |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
48 return send_email(email.to, email.headers or email.subject, email.body); |
|
74d7e59b3511
mod_email: Initial prototype module that allows other modules to send email
Matthew Wild <mwild1@gmail.com>
parents:
diff
changeset
|
49 end |
