Syslog identifier, remvoed emojiis from message

config.example.yml

@@ -22,11 +22,11 @@ gpg: # optional
   enabled: true
   absent_notice:
     enabled: true # Wether to issue a notice if recipient does not use GPG (PGP)
-    text: "\n\n⚠️ This email was sent without end-to-end encryption.\n
+    text: "\n\nNote: This email was sent without end-to-end encryption.\n
       This mail server supports automatic PGP encryption.\n
       Consider setting up a PGP key and publishing it to keys.openpgp.org."
     html:
-      "<p><strong>⚠️ This email was sent without end-to-end encryption.</strong><br>
+      "<p><strong>Note: This email was sent without end-to-end encryption.</strong><br>
       This mail server supports automatic PGP encryption.<br>
       Consider setting up a PGP key and publishing it to keys.openpgp.org.</p>"
     # either text, html or both

proxy.py

@@ -217,9 +217,9 @@ def get_conf(param: str):
     elif param == "WARN_ABSENT_GPG":
         return config["gpg"]["absent_notice"]["enabled"] if get_conf("GPG_ENABLED") else False
     elif param == "GPG_ABSENT_NOTICE_TEXT":
-        return config["gpg"]["absent_notice"]["text"] if get_conf("GPG_ENABLED") else None
+        return config["gpg"]["absent_notice"]["text"] if get_conf("GPG_ENABLED") and "text" in config["gpg"]["absent_notice"] else None
     elif param == "GPG_ABSENT_NOTICE_HTML":
-        return config["gpg"]["absent_notice"]["html"] if get_conf("GPG_ENABLED") else None
+        return config["gpg"]["absent_notice"]["html"] if get_conf("GPG_ENABLED")  and "html" in config["gpg"]["absent_notice"] else None
     elif param == "ID_DOMAIN":
         return config["id_domain"]
     elif param == "KEYSERVER_URL":
@@ -561,25 +561,22 @@ class EmailProxy:
         if msg.is_multipart():
             for part in msg.walk():
                 # Check if the part is plain text
-                if part.get_content_type() == "text/plain":
+                if part.get_content_type() == "text/plain" and  get_conf("GPG_ABSENT_NOTICE_TEXT") is not None:
                     part.set_payload(part.get_payload() + get_conf("GPG_ABSENT_NOTICE_TEXT"))
                 # Check if the part is HTML text
-                elif part.get_content_type() == "text/html":
+                elif part.get_content_type() == "text/html" and  get_conf("GPG_ABSENT_NOTICE_HTML") is not None:
-                    html_warning = (
+                    part.set_payload(part.get_payload() +  get_conf("GPG_ABSENT_NOTICE_HTML"))
-                        f"<p><strong>⚠️ This email was sent without end-to-end encryption.</strong><br>"
+                    try:
-                        f"This mail server supports automatic PGP encryption.<br>"
+                        part.replace_header(
-                        f"Consider setting up a PGP key and publishing it to a keyserver "
+                            "Content-Transfer-Encoding", "quoted-printable"
-                        f"(e.g., keys.openpgp.org).</p>"
+                        )  # Ensure HTML part is encoded correctly
-                    )
+                    except KeyError:
-                    part.set_payload(part.get_payload() + html_warning)
+                        part["Content-Transfer-Encoding"] = "quoted-printable"
-                    part.replace_header(
-                        "Content-Transfer-Encoding", "quoted-printable"
-                    )  # Ensure HTML part is encoded correctly
         else:
             # If it's a non-multipart message (either plain-text or HTML only)
-            if msg.get_content_type() == "text/plain":
+            if msg.get_content_type() == "text/plain" and get_conf("GPG_ABSENT_NOTICE_TEXT") is not None:
                 msg.set_payload(msg.get_payload() + get_conf("GPG_ABSENT_NOTICE_TEXT"))
-            elif msg.get_content_type() == "text/html":
+            elif msg.get_content_type() == "text/html" and get_conf("GPG_ABSENT_NOTICE_HTML") is not None:
                 msg.set_payload(msg.get_payload() + get_conf("GPG_ABSENT_NOTICE_HTML"))
                 msg.replace_header("Content-Transfer-Encoding", "quoted-printable")
 

smtpproxy.service

@@ -13,6 +13,7 @@ Environment=PATH=/path/to/smtpproxy/venv/bin:/usr/bin:/bin
 Environment=VIRTUAL_ENV=/path/to/smtpproxy/venv
 StandardOutput=journal
 StandardError=journal
+SyslogIdentifier=smtpproxy
 
 [Install]
 WantedBy=multi-user.target