From 07735d9f48a902b2ea68f5b225ec7716af3ac0d9 Mon Sep 17 00:00:00 2001
From: Gerrie Crafford <gerrie@thinkst.com>
Date: Mon, 18 Nov 2024 11:27:00 +0200
Subject: [PATCH] Remove body_length conditional logic

---
 canarytokens/channel_output_email.py | 64 +++++++++++-----------------
 1 file changed, 25 insertions(+), 39 deletions(-)

diff --git a/canarytokens/channel_output_email.py b/canarytokens/channel_output_email.py
index 96e3884a5..704d62ff2 100644
--- a/canarytokens/channel_output_email.py
+++ b/canarytokens/channel_output_email.py
@@ -381,53 +381,39 @@ def format_report_html(
         return minify_html.minify(rendered_html)
 
     @staticmethod
-    def format_report_text(details: TokenAlertDetails, body_length: int = 999999999):
+    def format_report_text(details: TokenAlertDetails):
         """Returns a string containing an incident report in text,
         suitable for emailing"""
 
-        if body_length <= 140:
-            body = """Canarydrop@{time} via {channel_name}: """.format(
-                channel_name=details.channel, time=details.time
-            )
-            capacity = 140 - len(body)
-            body += details.memo[:capacity]
-        else:
-            additional_data = "\n" + "\n".join(
-                f"{k}: {v}" for k, v in details.additional_data.items()
-            )
-            body = textwrap.dedent(
-                f"""
-                One of your canarydrops was triggered.
-                Channel: {details.channel}
-                Time   : {details.time}
-                Memo   : {details.memo}{additional_data}
-                Manage your settings for this Canarydrop:
-                {details.manage_url}
-                """
-            ).strip()
+        additional_data = "\n" + "\n".join(
+            f"{k}: {v}" for k, v in details.additional_data.items()
+        )
+        body = textwrap.dedent(
+            f"""
+            One of your canarydrops was triggered.
+            Channel: {details.channel}
+            Time   : {details.time}
+            Memo   : {details.memo}{additional_data}
+            Manage your settings for this Canarydrop:
+            {details.manage_url}
+            """
+        ).strip()
         return body
 
     @staticmethod
-    def format_token_exposed_text(
-        details: TokenExposedDetails, body_length: int = 999999999
-    ):
+    def format_token_exposed_text(details: TokenExposedDetails):
         """Returns a string containing an incident report in text,
         suitable for emailing"""
-        if body_length <= 140:
-            body = f"Canarytoken exposed on the internet @ {details.exposed_time}: "
-            capacity = 140 - len(body)
-            body += details.memo[:capacity]
-        else:
-            body = textwrap.dedent(
-                f"""
-                One of your Canarytokens was exposed on the internet.
-                Location: {details.public_location or "unknown"}
-                Time    : {details.exposed_time}
-                Memo    : {details.memo}
-                Manage your settings for this Canarydrop:
-                {details.manage_url}
-                """
-            ).strip()
+        body = textwrap.dedent(
+            f"""
+            One of your Canarytokens was exposed on the internet.
+            Location: {details.public_location or "unknown"}
+            Time    : {details.exposed_time}
+            Memo    : {details.memo}
+            Manage your settings for this Canarydrop:
+            {details.manage_url}
+            """
+        ).strip()
         return body
 
     @staticmethod