bug fixes

news_fetch/utils_mail/runner.py

@@ -15,14 +15,11 @@ def send(article_model):
     mail['From'] = config["sender"]
     mail['To'] = config["recipient"]
 
-    msgs = article_model.mail_info # this is html
-    msg = [m["reply_text"] for m in msgs]
-    msg = "\n".join(msg)
+    msg, files = article_model.mail_info() # this is html
 
     content = MIMEText(msg, "html")
     mail.attach(content)
 
-    files = [m["file_path"] for m in msgs if m["file_path"]]
     for path in files:
         with open(path, 'rb') as file:
             part = MIMEApplication(file.read(), "pdf")
@@ -31,7 +28,12 @@ def send(article_model):
         mail.attach(part)
 
     try:
-        smtp = smtplib.SMTP(config["smtp_server"], config["port"])
+        try:
+            smtp = smtplib.SMTP(config["smtp_server"], config["port"])
+        except ConnectionRefusedError:
+            logger.error("Server refused connection. Is this an error on your side?")
+            return False
+
         smtp.starttls()
         smtp.login(config["uname"], config["password"])
         smtp.sendmail(config["sender"], config["recipient"], mail.as_string())