modules/CACommandModDelDelayed.py

diff --git a/modules/CACommandModDelDelayed.py b/modules/CACommandModDelDelayed.py
index 3d581f1e255792664a805e54162ab60fab98576d..3fd5354cdbbd40552903602388a6b5cbab8b1caf 100644 (file)
--- a/modules/CACommandModDelDelayed.py
+++ b/modules/CACommandModDelDelayed.py
@@ -20,34 +20,28 @@ class CACommandModDelDelayed(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.respond_cmd_err("``/"+self.TRIGGER+"`` The first parameter is not a valid post-permalink. :(")
-            return
-
         if len(msg_text) == 1:
-            request.respond_cmd_err("``/"+self.TRIGGER+"`` It seems like you did not supply any reason-text. (use --abort to disable auto-deletion) :(")
+            request.respond_cmd_err("``/"+self.TRIGGER+"`` It seems like you did not supply any reason-text. (use --abort to disable auto-deletion)")
             return
 
         if len(msg_text[1]) > 15000:
             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.respond_cmd_err("``/"+self.TRIGGER+"`` 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.respond_cmd_err("``/"+self.TRIGGER+"`` 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.respond_cmd_err("``/"+self.TRIGGER+"`` 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
 
 
@@ -62,4 +56,4 @@ class CACommandModDelDelayed(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.respond_cmd_temp("## :white_check_mark: Success! :)")
+        request.respond_interactive_temp("## :white_check_mark: Success! :)")