From 6526dae6896105ad281e5a610cc0da2c3459765e Mon Sep 17 00:00:00 2001
From: Florian Hofhammer <florian.hofhammer@fhofhammer.de>
Date: Wed, 8 Nov 2023 18:58:41 +0100
Subject: [PATCH] Switch from STARTTLS to full TLS for email

---
 compose.yaml | 1 +
 src/spam.py  | 8 ++------
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/compose.yaml b/compose.yaml
index d990baa..5ad211b 100644
--- a/compose.yaml
+++ b/compose.yaml
@@ -5,3 +5,4 @@ services:
     volumes:
       - ./config.json:/bot/config.json:ro
     container_name: polybot
+    init: true
diff --git a/src/spam.py b/src/spam.py
index 88c6b98..fc70e1b 100644
--- a/src/spam.py
+++ b/src/spam.py
@@ -1,10 +1,8 @@
+import config
 import smtplib
-import ssl
 
 from email.message import EmailMessage
 
-import config
-
 
 def send_mail(recipient, user_captcha):
     # Create the email to send
@@ -14,12 +12,10 @@ def send_mail(recipient, user_captcha):
     msg["Subject"] = "Verification code for polygl0ts Discord server"
     msg.set_content(f'Hello {recipient}, your verification code is "{user_captcha}"!')
 
-    with smtplib.SMTP(
+    with smtplib.SMTP_SSL(
         host=config.email.smtp_host, port=config.email.smtp_port
     ) as smtp_conn:
         try:
-            # Want a secure connection - use STARTTLS
-            smtp_conn.starttls(context=ssl.create_default_context())
             # Mail go brrrrr
             smtp_conn.login(user=config.email.username, password=config.email.password)
             smtp_conn.sendmail(