hungerlib 4.24.dev1__tar.gz → 4.24.dev3__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- {hungerlib-4.24.dev1/src/hungerlib.egg-info → hungerlib-4.24.dev3}/PKG-INFO +1 -1
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/pyproject.toml +1 -1
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/__init__.py +2 -2
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/email/__init__.py +2 -2
- hungerlib-4.24.dev1/src/hungerlib/email/user.py → hungerlib-4.24.dev3/src/hungerlib/email/client.py +1 -1
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/email/manager.py +21 -11
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3/src/hungerlib.egg-info}/PKG-INFO +1 -1
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib.egg-info/SOURCES.txt +1 -1
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/LICENSE +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/README.md +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/setup.cfg +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/api/__init__.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/api/backups.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/api/command.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/api/databases.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/api/filemanager.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/api/schedule.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/api/startup.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/bridgeclient.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/configloader.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/discord_bot_webhook.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/email/message.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/messagerouter.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/panel.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/servers/__init__.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/servers/generic.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/servers/minecraft.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/utils/__init__.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/utils/exceptions.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/utils/time.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/utils/utils.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib/validator.py +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib.egg-info/dependency_links.txt +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib.egg-info/requires.txt +0 -0
- {hungerlib-4.24.dev1 → hungerlib-4.24.dev3}/src/hungerlib.egg-info/top_level.txt +0 -0
|
@@ -14,7 +14,7 @@ from .panel import Panel
|
|
|
14
14
|
from .servers import GenericServer, MinecraftServer
|
|
15
15
|
from .bridgeclient import BridgeClient
|
|
16
16
|
from .discord_bot_webhook import DiscordBotWebhook
|
|
17
|
-
from .email import Email, EmailManager,
|
|
17
|
+
from .email import Email, EmailManager, EmailClient
|
|
18
18
|
from .validator import (
|
|
19
19
|
Validator,
|
|
20
20
|
ValidationError,
|
|
@@ -77,7 +77,7 @@ __all__ = [
|
|
|
77
77
|
'Validator',
|
|
78
78
|
'Email',
|
|
79
79
|
'EmailManager',
|
|
80
|
-
'
|
|
80
|
+
'EmailClient',
|
|
81
81
|
|
|
82
82
|
# sub-modules
|
|
83
83
|
'snapSchedule',
|
|
@@ -10,7 +10,7 @@ class EmailManager:
|
|
|
10
10
|
'''
|
|
11
11
|
Backend email system.
|
|
12
12
|
Holds API token and account ID.
|
|
13
|
-
Sends emails created by
|
|
13
|
+
Sends emails created by EmailClient.
|
|
14
14
|
'''
|
|
15
15
|
def __init__(self, api_token: str, account_id: str):
|
|
16
16
|
self.client = Cloudflare(api_token=api_token)
|
|
@@ -41,15 +41,25 @@ class EmailManager:
|
|
|
41
41
|
if email.template and not email.html:
|
|
42
42
|
email.html = self.render_template(email.template, email.template_ctx)
|
|
43
43
|
|
|
44
|
-
|
|
45
|
-
account_id
|
|
46
|
-
from_
|
|
47
|
-
to
|
|
48
|
-
|
|
49
|
-
|
|
50
|
-
|
|
51
|
-
|
|
52
|
-
|
|
53
|
-
|
|
44
|
+
payload = {
|
|
45
|
+
"account_id": self.account_id,
|
|
46
|
+
"from_": f"{user.name} <{user.address}>",
|
|
47
|
+
"to": ",".join(email.to),
|
|
48
|
+
"subject": email.subject
|
|
49
|
+
}
|
|
50
|
+
|
|
51
|
+
if email.text:
|
|
52
|
+
payload["text"] = email.text
|
|
53
|
+
|
|
54
|
+
if email.html:
|
|
55
|
+
payload["html"] = email.html
|
|
56
|
+
|
|
57
|
+
if email.cc:
|
|
58
|
+
payload["cc"] = ",".join(email.cc)
|
|
59
|
+
|
|
60
|
+
if email.bcc:
|
|
61
|
+
payload["bcc"] = ",".join(email.bcc)
|
|
62
|
+
|
|
63
|
+
resp = self.client.email_sending.send(**payload)
|
|
54
64
|
|
|
55
65
|
return bool(getattr(resp, 'delivered', None))
|
|
@@ -21,9 +21,9 @@ src/hungerlib/api/filemanager.py
|
|
|
21
21
|
src/hungerlib/api/schedule.py
|
|
22
22
|
src/hungerlib/api/startup.py
|
|
23
23
|
src/hungerlib/email/__init__.py
|
|
24
|
+
src/hungerlib/email/client.py
|
|
24
25
|
src/hungerlib/email/manager.py
|
|
25
26
|
src/hungerlib/email/message.py
|
|
26
|
-
src/hungerlib/email/user.py
|
|
27
27
|
src/hungerlib/servers/__init__.py
|
|
28
28
|
src/hungerlib/servers/generic.py
|
|
29
29
|
src/hungerlib/servers/minecraft.py
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|
|
File without changes
|