From 6bb60aa9da7c5565712e13bf7d4c89cc203bc673 Mon Sep 17 00:00:00 2001 From: Georgios Atheridis Date: Fri, 13 May 2022 10:20:44 +0000 Subject: [PATCH] trimmed extra spaces out of messages --- aptbot/bot.py | 32 ++++++++++++++++++++++++++------ ttv_api/users.py | 4 +++- 2 files changed, 29 insertions(+), 7 deletions(-) diff --git a/aptbot/bot.py b/aptbot/bot.py index 122b7c3..bc0533a 100644 --- 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 2297018..95497b2 100644 --- 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}&" -- 2.30.2