modules/CACommandModRemovePostText.py

diff --git a/modules/CACommandModRemovePostText.py b/modules/CACommandModRemovePostText.py
index a8333a19e7c95d8a9831a3464fe5fff22d6fd6bc..22ddd7a6439dbf9e5a26e7248677e40d8bbbf79a 100644 (file)
--- a/modules/CACommandModRemovePostText.py
+++ b/modules/CACommandModRemovePostText.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 CACommandModRemovePostText(AbstractCommand):
     TRIGGER = "mod-remove-post-text"
     CONFIG = {"display_name": "somebot-command", "auto_complete": True,
-              "auto_complete_hint": "<permalink> <reason>",
+              "auto_complete_hint": "<permalink> <reason> 📢",
              }
     CONFIG["auto_complete_desc"] = CONFIG["description"] = "Remove post-text, but dont delete post. Run in same channel. Cannot be undone! [CHANNEL_ADMIN]"
 
@@ -20,49 +18,38 @@ class CACommandModRemovePostText(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. :(")
+            request.respond_cmd_err("``/"+self.TRIGGER+"`` It seems like you did not supply any reason-text.")
             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
 
         if post["message"].strip() == "":
-            request.cmd_respond_text_temp("``/"+self.TRIGGER+"`` failed: This command doesnt work on empty messages and cant be undone.\nIf you are an admin_a you can use ``/mod-get-post-text`` to view the original text. :(")
+            request.respond_cmd_err("``/"+self.TRIGGER+"`` doesnt work on empty messages and cant be undone.\nIf you are an admin_a you can use ``/mod-get-post-text`` to view the original text. :(")
             return
 
         # do actual action
         att = [{"color":"#f35912", "text": "**Post-text removed. Reason:**\n"+msg_text[1]}]
         post["props"].update(dict({"attachments":att, "somebot_removed_post_text":post["message"], "cmd":self.TRIGGER}))
 
-#        if msg_text[1] in ["--abort", "--undo", "--remove", "--clear"]:
-#            del post["props"]["cmd"]
-#            del post["props"]["attachments"]
-#            del post["props"]["somebot_removed_post_text"]
-#
         self.bot.api.update_post(splitpath[5], message=None, 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! :)")