From 3c7119dcebed848a93eaa1b478b889da5805524a Mon Sep 17 00:00:00 2001
From: Someone <someone@somenet.org>
Date: Sat, 8 Jan 2022 23:39:53 +0100
Subject: [PATCH] modules/CACommandModDelNowNotifyAuthor.py
---
modules/CACommandModDelNowNotifyAuthor.py | 30 +++++++++--------------
1 file changed, 11 insertions(+), 19 deletions(-)
diff --git a/modules/CACommandModDelNowNotifyAuthor.py b/modules/CACommandModDelNowNotifyAuthor.py
index 8f50bdb..24abee1 100644
--- a/modules/CACommandModDelNowNotifyAuthor.py
+++ b/modules/CACommandModDelNowNotifyAuthor.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 CACommandModDelNowNotifyAuthor(AbstractCommand):
TRIGGER = "mod-del-now-notify-author"
CONFIG = {"display_name": "somebot-command", "auto_complete": True,
- "auto_complete_hint": "<permalink> <reason> ð¢",
+ "auto_complete_hint": "<permalink> <reason> âï¸",
}
CONFIG["auto_complete_desc"] = CONFIG["description"] = "Delete permalinked post immediately and notify author. Run in same channel. [CHANNEL_ADMIN]"
@@ -20,30 +18,24 @@ class CACommandModDelNowNotifyAuthor(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
# do actual action
@@ -51,4 +43,4 @@ class CACommandModDelNowNotifyAuthor(AbstractCommand):
channel = self.bot.api.create_dm_channel_with(post["user_id"])
self.bot.api.create_post(channel["id"], "Im sorry to inform you that your post in ``"+data["team_domain"]+"::"+data["channel_name"]+"`` has been deleted, for the following reason\n\n----\n\n"+msg_text[1]+"\n\n----\n\nYour post:\n```\n"+post["message"]+"\n```\n")
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! :)")
--
2.43.0