modules/CACommandModInform.py

diff --git a/modules/CACommandModInform.py b/modules/CACommandModInform.py
index a39f824858d4e7418a5d3f5465a050f68c481f39..b4bef14d42135cb7d0cedae355d2d2a28ab8360d 100644 (file)
--- a/modules/CACommandModInform.py
+++ b/modules/CACommandModInform.py
@@ -1,8 +1,6 @@
 # Mattermost Bot module.
 #  Copyright (c) 2016-2021 by Someone <someone@somenet.org> (aka. Jan Vales <jan@jvales.net>)
 #  published under MIT-License
-#
-# This command relies on the priviledged DB-Cleaner maint script.
 
 
 
@@ -10,7 +8,7 @@ from AbstractCommand import AbstractCommand
 class CACommandModInform(AbstractCommand):
     TRIGGER = "mod-inform"
     CONFIG = {"display_name": "somebot-command", "auto_complete": True,
-              "auto_complete_hint": "<permalink> <reason>",
+              "auto_complete_hint": "<permalink> <reason> 📢",
              }
     CONFIG["auto_complete_desc"] = CONFIG["description"] = "Add Mod-Info to permalinked post. Run in same channel. Use <reason> = '--clear' to remove Info. [CHANNEL_ADMIN]"
 
@@ -20,37 +18,30 @@ class CACommandModInform(AbstractCommand):
 
         msg_text = data['text'].strip().split(" ", 1)
 
-        try:
-            splitpath = msg_text[0].strip().strip("/").split("/")
-            if splitpath[4] == "pl":
-                pl_post_id = splitpath[5]
-        except:
-            request.cmd_respond_text_temp("``/"+self.TRIGGER+"`` failed: The first parameter is not a valid post-permalink. :(")
-            return
-
         if len(msg_text) == 1:
-            request.cmd_respond_text_temp("``/"+self.TRIGGER+"`` failed: It seems like you did not supply any reason-text. (use --clear to remove the information) :(")
+            request.respond_cmd_err("``/"+self.TRIGGER+"`` It seems like you did not supply any reason-text. (use --clear to remove the information)")
             return
 
         if len(msg_text[1]) > 15000:
-            request.cmd_respond_text_temp("``/"+self.TRIGGER+"`` failed: reason-text must be smaller than 15000 characters :(\nYour text is: "+str(len(msg_text[1]))+" characters long.")
+            request.respond_cmd_err("``/"+self.TRIGGER+"`` reason-text must be smaller than 15000 characters :(\nYour text is: "+str(len(msg_text[1]))+" characters long.")
             return
 
-        post = self.bot.api.get_post(pl_post_id, exc=False)
-
-        if "status_code" in post and post["status_code"] == 404:
-            request.cmd_respond_text_temp("``/"+self.TRIGGER+"`` failed: The perma-linked post doesnt seem to exist. Was it deleted?")
+        try:
+            splitpath = msg_text[0].strip().strip("/").split("/")
+            if splitpath[4] == "pl":
+                post = self.bot.api.get_post(splitpath[5])
+        except:
+            request.respond_cmd_err("``/"+self.TRIGGER+"`` The first parameter is not a valid post-permalink or the permalinked post has been deleted.")
             return
 
         if post["channel_id"] != data["channel_id"]:
-            request.cmd_respond_text_temp("``/"+self.TRIGGER+"`` failed: Must be executed in the same channel as the post. :(")
+            request.respond_cmd_err("``/"+self.TRIGGER+"`` Must be executed in the same channel as the permalinked post.")
             return
 
         if "cmd" in post["props"] and post["props"]["cmd"] != self.TRIGGER:
-            request.cmd_respond_text_temp("``/"+self.TRIGGER+"`` failed: The command **``/"+post["props"]["cmd"]+"``** already affects this post. Undo said command before applying this one. :(")
+            request.respond_cmd_err("``/"+self.TRIGGER+"`` The command **``/"+post["props"]["cmd"]+"``** already affects this post. Undo said command before applying this one.")
             return
 
-
         # do actual action
         att = [{"color":"#74bbfb", "text": "**Mod-Information**\n"+msg_text[1]}]
         post["props"].update(dict({"attachments":att, "cmd":self.TRIGGER}))
@@ -61,4 +52,4 @@ class CACommandModInform(AbstractCommand):
 
         self.bot.api.update_post(splitpath[5], message=post["message"], is_pinned=post["is_pinned"], has_reactions=post["has_reactions"], props=post["props"])
         self.bot.debug_chan("``/"+self.TRIGGER+" "+data["text"].strip()+"`` used by ``@"+data["user_name"]+"`` in ``"+data["team_domain"]+"::"+data["channel_name"]+"``")
-        request.cmd_respond_text_temp("### ``Done.`` :)")
+        request.respond_cmd_temp("## :white_check_mark: Success! :)")