trimmed extra spaces out of messages

diff --git a/aptbot/bot.py b/aptbot/bot.py
index 122b7c335e24a25f3d9b1e5cc39ef3584e49d481..bc0533a3ac25def0ade47927567d0d1e3b2fa509 100644 (file)
--- a/aptbot/bot.py
+++ b/aptbot/bot.py
@@ -115,12 +115,32 @@ class Bot:
                 part = part[1:]
                 message.channel = part
 
-        regex = re.compile(r"([^\\])(\\s)")
-        try:
-            message.tags["reply-parent-msg-body"] = regex.sub(r"\1 ", message.tags["reply-parent-msg-body"])
-            message.tags["reply-parent-msg-body"] = message.tags["reply-parent-msg-body"].replace("\\\\", "\\")
-        except KeyError:
-            pass
+        message.value = ' '.join(message.value.split())
+
+        if not message.tags.get("reply-parent-msg-body", None):
+            return message
+
+        rep = message.tags["reply-parent-msg-body"]
+        new_rep = ""
+        ignore_next = False
+        for i in range(len(rep)):
+            if ignore_next:
+                ignore_next = False
+                continue
+            if not rep[i] == "\\":
+                new_rep += rep[i]
+                ignore_next = False
+                continue
+            if i + 1 == len(rep):
+                new_rep += rep[i]
+                break
+            if rep[i+1] == "\\":
+                new_rep += "\\"
+            elif rep[i+1] == "s":
+                new_rep += " "
+            ignore_next = True
+
+        message.tags["reply-parent-msg-body"] = ' '.join(new_rep.split())
 
         return message
 

diff --git a/ttv_api/users.py b/ttv_api/users.py
index 22970185abf2a4bd949703b4a23db352c67d5396..95497b254496e0d873f5f9ce6e1d71cb28695753 100644 (file)
--- a/ttv_api/users.py
+++ b/ttv_api/users.py
@@ -15,7 +15,9 @@ class User:
     created_at: datetime
 
 
-def get_users(user_ids: list[str] = [], user_logins: list[str] = []) -> Optional[list[User]]:
+def get_users(
+    user_ids: list[str] = [], user_logins: list[str] = []
+) -> Optional[list[User]]:
     params = "?"
     for user_id in user_ids:
         params += f"id={user_id}&"