public inbox for [email protected]
 help / color / mirror / Atom feed
From: Muhammad Rizki <[email protected]>
To: Ammar Faizi <[email protected]>
Cc: Muhammad Rizki <[email protected]>,
	Alviro Iskandar Setiawan <[email protected]>,
	GNU/Weeb Mailing List <[email protected]>
Subject: [PATCH v2 6/8] atom: add manage_payload()
Date: Thu, 20 Oct 2022 15:38:43 +0700	[thread overview]
Message-ID: <[email protected]> (raw)
In-Reply-To: <[email protected]>

Add manage_payload() to handle the email decoding to utf-8. This include
a non-UTF8 character and base64 decoding.

Signed-off-by: Muhammad Rizki <[email protected]>
---
 daemon/atom/utils.py | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/daemon/atom/utils.py b/daemon/atom/utils.py
index 866c531..e8b9d80 100644
--- a/daemon/atom/utils.py
+++ b/daemon/atom/utils.py
@@ -8,6 +8,7 @@ from pyrogram.types import Chat, InlineKeyboardMarkup, InlineKeyboardButton
 from email.message import Message
 from typing import Dict, Union
 from slugify import slugify
+from base64 import b64decode
 import hashlib
 import uuid
 import os
@@ -136,7 +137,7 @@ def gen_temp(name: str, platform: str):
 
 def extract_body(thread: Message, platform: str):
 	if not thread.is_multipart():
-		p = thread.get_payload(decode=True).decode(errors='replace')
+		p = manage_payload(thread)
 
 		if platform == "discord":
 			p = quote_reply(p)
@@ -253,6 +254,14 @@ def fix_utf8_char(text: str, unescape: bool = True):
 	return t
 
 
+def manage_payload(payload: Message):
+	p = str(payload.get_payload())
+	tf_encode = payload.get("Content-Transfer-Encoding")
+	if tf_encode != "base64":
+		return p.encode().decode("utf-8", errors="replace")
+	return b64decode(p).decode("utf-8")
+
+
 EMAIL_MSG_ID_PATTERN = r"<([^\<\>]+)>"
 def extract_email_msg_id(msg_id):
 	ret = re.search(EMAIL_MSG_ID_PATTERN, msg_id)
-- 
Muhammad Rizki


  parent reply	other threads:[~2022-10-20  8:39 UTC|newest]

Thread overview: 24+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2022-10-20  8:38 [PATCH v2 0/8] Fix some bugs and add some features Muhammad Rizki
2022-10-20  8:38 ` [PATCH v2 1/8] discord: Add send_text_mail_interaction() Muhammad Rizki
2022-10-20  8:38 ` [PATCH v2 2/8] discord: Add send_patch_mail_interaction() Muhammad Rizki
2022-10-20  8:38 ` [PATCH v2 3/8] discord: Add get lore mail slash command Muhammad Rizki
2022-10-20  8:38 ` [PATCH v2 4/8] atom: Small change for fix_utf8_char() Muhammad Rizki
2022-10-21  6:53   ` Ammar Faizi
2022-10-21  7:35     ` Muhammad Rizki
2022-10-21  8:25     ` Muhammad Rizki
2022-10-21  8:27       ` Ammar Faizi
2022-10-21 10:44         ` Muhammad Rizki
2022-10-21 10:50           ` Ammar Faizi
2022-10-21 10:52             ` Muhammad Rizki
2022-10-21 10:54               ` Ammar Faizi
2022-10-21 10:55                 ` Muhammad Rizki
2022-10-21 10:57                   ` Ammar Faizi
2022-10-21 10:58                     ` Muhammad Rizki
2022-10-21 10:57                 ` Muhammad Rizki
2022-10-21 11:00                   ` Ammar Faizi
2022-10-21 11:12                     ` Muhammad Rizki
2022-10-20  8:38 ` [PATCH v2 5/8] atom: Improve remove_patch() Muhammad Rizki
2022-10-20  8:38 ` Muhammad Rizki [this message]
2022-10-20  8:38 ` [PATCH v2 7/8] telegram: Fix get lore command Muhammad Rizki
2022-10-20  8:38 ` [PATCH v2 8/8] atom: Improve extract_body() Muhammad Rizki
2022-10-20 14:23 ` [PATCH v2 0/8] Fix some bugs and add some features Ammar Faizi

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    [email protected] \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox