C3L-NOC/spaceapi Changeset - fc0cda3cdd0b · Chaos Computer Club Lëtzebuerg Projects

Changeset - fc0cda3cdd0b

Parent rev.

Child rev.

[Not reviewed]

notifyEmail

0 1 0

Dennis Fink - 3 years ago 2022-07-18 23:40:49
dennis.fink@c3l.lu

Fix email sending

1 file changed with 13 insertions and 4 deletions:

spaceapi/utils.py

0 comments (0 inline, 0 general)

spaceapi/utils.py

➞

Show inline comments

 import email
 import email.policy
 import json
 import os.path
 import random
 import smtplib
 import ssl
 from functools import wraps
 from time import time
 import mastodon
 import tweepy
 from flask import current_app, request
 default_json_file_v14 = os.path.abspath("default_v14.json")
 last_state_file_v14 = os.path.abspath("laststate_v14.json")
 if not os.path.exists(default_json_file_v14):
     raise RuntimeError("default_v14.json does not exists!")
@@ @@ -69,31 +71,33 @@ def post_toot(toot): @@
             access_token=current_app.config["MASTODON_USERCRED_FILE"],
             api_base_url="https://chaos.social",
+        )
         api.status_post(toot, visibility="unlisted")
 def post_email(subject, body):
     if "EMAIL_PASS" in current_app.config:
         smtp_conn = smtplib.SMTP(
             current_app.config["EMAIL_HOST"], port=current_app.config["EMAIL_PORT"]
+        )
         ssl_context = ssl.create_default_context()
         smtp_conn.starttls(ssl_context)
+        smtp_conn.starttls(context=ssl_context)
         smtp_conn.login(
             current_app.config["EMAIL_USER"], current_app.config["EMAIL_PASS"]
+        )
-        msg = email.message.EmailMessage(email.policy.SMTP)
+        msg = email.message.EmailMessage(policy=email.policy.default)
         msg["To"] = current_app.config["EMAIL_ANNOUNCE_ADDRESS"]
         msg["From"] = current_app.config["EMAIL_USER"]
         msg["From"] = "spaceapibot <{email}>".format(
             email=current_app.config["EMAIL_USER"]
+        )
         msg["Subject"] = subject
         msg.set_content(body)
         smtp_conn.send_message(msg)
 class Singleton:
     def __new__(cls, *args, **kwargs):
         key = str(hash(cls))
         if not hasattr(cls, "_instance_dict"):
             cls._instance_dict = {}
@@ @@ -189,26 +193,31 @@ class ActiveStatusv14(Singleton, dict): @@
         try:
             post_tweet(tweet, self)
         except Exception as e:
             current_app.logger.error("Sending tweet failed! %s" % e, exc_info=True)
         try:
             post_toot(tweet)
         except Exception as e:
             current_app.logger.error("Sending toot failed! %s" % e, exc_info=True)
     def send_email(self, value):
         subject = standard_open_message if value else standard_close_message
         message = (
             random.choice(possible_open_tweets)
             if value
             else random.choice(possible_closed_tweets)
+        )
         try:
             post_email(message)
+            post_email(subject, message)
         except Exception as e:
             current_app.logger.error("Sending email failed! %s" % e, exc_info=True)
     def set_new_state(self, value=None, trigger_person=None, message=None):
         if value is not None and value != self["state"]["open"]:
             self["state"]["open"] = value
             self.send_tweet(value)
             self.send_email(value)
             if not value:

0 comments (0 inline, 0 general)