From dec534c5dd528d32a0e0373a1183308edfcf297a Mon Sep 17 00:00:00 2001 From: Evan Kim Date: Sat, 4 May 2024 20:35:11 +0000 Subject: [PATCH 1/2] adding sent emails to documents --- server/controllers/emails.py | 20 +++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/server/controllers/emails.py b/server/controllers/emails.py index 323878773..9c0db3bb1 100644 --- a/server/controllers/emails.py +++ b/server/controllers/emails.py @@ -357,6 +357,13 @@ def get_full_message_id(message_id): return f"<{message_id}@us-east-2.amazonses.com>" +def clean_up(text): + r"""Clean text by removing html tags and replacing
with \n.""" + breaked_line_text = text.replace("
", "\n") + clean_regex = re.compile("<.*?>") + return re.sub(clean_regex, " ", breaked_line_text) + + @emails.route("/send_email", methods=["POST"]) def send_email(): """POST /send_email""" @@ -373,13 +380,20 @@ def send_email(): return {"message": "Thread not found"}, 400 # replace
with \n in body - breaked_line_text = data["body"].replace("
", "\n") - clean_regex = re.compile("<.*?>") - clean_text = re.sub(clean_regex, " ", breaked_line_text) + clean_text = clean_up(data["body"]) + # breaked_line_text = data["body"].replace("
", "\n") + # clean_regex = re.compile("<.*?>") + # clean_text = re.sub(clean_regex, " ", breaked_line_text) context = {"body": data["body"]} template = env.get_template("template.html") body = template.render(**context) + # add body to documents + question = clean_up(reply_to_email.body) + new_doc = Document(question, reply_to_email.subject, clean_text, "HackMIT team") + db.session.add(new_doc) + db.session.commit() + client = boto3.client( "ses", region_name=AWS_REGION, From 7bb876f1767fd5c61e8d14bf68f5200d365f20f8 Mon Sep 17 00:00:00 2001 From: Andrew Liu Date: Wed, 8 May 2024 04:59:42 +0000 Subject: [PATCH 2/2] remove comment --- server/controllers/emails.py | 4 ---- 1 file changed, 4 deletions(-) diff --git a/server/controllers/emails.py b/server/controllers/emails.py index 9c0db3bb1..3082632bd 100644 --- a/server/controllers/emails.py +++ b/server/controllers/emails.py @@ -379,11 +379,7 @@ def send_email(): if not thread: return {"message": "Thread not found"}, 400 - # replace
with \n in body clean_text = clean_up(data["body"]) - # breaked_line_text = data["body"].replace("
", "\n") - # clean_regex = re.compile("<.*?>") - # clean_text = re.sub(clean_regex, " ", breaked_line_text) context = {"body": data["body"]} template = env.get_template("template.html") body = template.render(**context)