From 544b6db885d517742e2243109d151e8343b77a1c Mon Sep 17 00:00:00 2001
From: Midgard <midgard@zeus.ugent.be>
Date: Wed, 30 Jun 2021 13:06:04 +0200
Subject: [PATCH] Small refactors

---
 mmcli.py | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/mmcli.py b/mmcli.py
index bdc5857..151b073 100755
--- a/mmcli.py
+++ b/mmcli.py
@@ -205,7 +205,7 @@ def cat(mm_api: mattermost.MMApi, parsed):
 			backlog[0] = None
 
 	if parsed.follow:
-		def simple_websocket_callback(mmws, event_data):
+		def simple_websocket_callback(_mmws, event_data):
 			if event_data.get("event") == "posted":
 				post = json.loads(event_data["data"]["post"])
 				if post["channel_id"] != channel["id"]:
@@ -228,7 +228,6 @@ def cat(mm_api: mattermost.MMApi, parsed):
 		ws_url = http_to_ws(mm_api._url) + "/v4/websocket"
 		mmws = MMws(initial_websocket_callback, mm_api.access_token, ws_url)
 
-	if parsed.follow:
 		thread = threading.Thread(target=print_initial_messages)
 		thread.setDaemon(True)
 		thread.start()
@@ -270,6 +269,10 @@ def send(mm_api: mattermost.MMApi, parsed):
 		print(sent)
 
 
+def tsv_escape(text):
+	return text.replace("\\", "\\\\").replace("\t", r"\t").replace("\n", r"\n")
+
+
 def str_for_post(attribute, post, parsed):
 	obj = {
 		k: v
@@ -280,7 +283,7 @@ def str_for_post(attribute, post, parsed):
 	if parsed.format == "json":
 		return json.dumps(obj)
 	if parsed.format == "tsv":
-		msg = obj.get("message", "").replace("\\", "\\\\").replace("\t", r"\t").replace("\n", r"\n")
+		msg = tsv_escape(obj.get("message", ""))
 		return f"{obj['id']}\t{obj['create_at']}\t{obj.get('username') or obj['user_id']}\t{msg}"
 	assert False