From b27599f0e9483f2f82ad33dc4dfafd9cfb6bf357 Mon Sep 17 00:00:00 2001 From: ajax146 <31014239+ajax146@users.noreply.github.com> Date: Tue, 18 Feb 2025 22:36:10 -0500 Subject: [PATCH 1/4] Add override owner config and try catch to log DM --- config.default.yml | 1 + techsupport_bot/bot.py | 15 +++++++++++++-- 2 files changed, 14 insertions(+), 2 deletions(-) diff --git a/config.default.yml b/config.default.yml index 4aa13c42d..707afdd1f 100644 --- a/config.default.yml +++ b/config.default.yml @@ -6,6 +6,7 @@ bot_config: disabled_extensions: ["kanye"] default_prefix: "." global_alerts_channel: "" + override_owner: "126551534447099905" modmail_config: enable_modmail: False disable_thread_creation: False diff --git a/techsupport_bot/bot.py b/techsupport_bot/bot.py index b4413f4b5..b0e20d205 100644 --- a/techsupport_bot/bot.py +++ b/techsupport_bot/bot.py @@ -243,7 +243,13 @@ async def log_DM(self: Self, sent_from: str, source: str, content: str) -> None: f"{source} recieved a PM", f"PM from: {sent_from}\n{content}" ) embed.timestamp = datetime.datetime.utcnow() - await owner.send(embed=embed) + try: + await owner.send(embed=embed) + except discord.Forbidden: + await self.logger.send_log( + message=f"Could not DM discord bot owner", + level=LogLevel.WARNING, + ) async def on_message(self: Self, message: discord.Message) -> None: """Logs DMs and ensure that commands are processed @@ -763,7 +769,6 @@ async def is_bot_admin(self: Self, member: discord.Member) -> bool: context=LogContext(guild=member.guild), console_only=True, ) - owner = await self.get_owner() if getattr(owner, "id", None) == member.id: return True @@ -787,6 +792,12 @@ async def get_owner(self: Self) -> discord.User | None: Returns: discord.User | None: The User object of the owner of the application on discords side """ + if self.file_config.bot_config.override_owner: + self.owner = await self.fetch_user( + int(self.file_config.bot_config.override_owner) + ) + return self.owner + if not self.owner: try: # If this isn't console only, it is a forever recursion From 149fa3b63a6fb523a3c3b95b5567dc11e8e915db Mon Sep 17 00:00:00 2001 From: ajax146 <31014239+ajax146@users.noreply.github.com> Date: Tue, 18 Feb 2025 23:27:37 -0500 Subject: [PATCH 2/4] Formatting --- techsupport_bot/bot.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/techsupport_bot/bot.py b/techsupport_bot/bot.py index b0e20d205..63ac95fb1 100644 --- a/techsupport_bot/bot.py +++ b/techsupport_bot/bot.py @@ -245,10 +245,11 @@ async def log_DM(self: Self, sent_from: str, source: str, content: str) -> None: embed.timestamp = datetime.datetime.utcnow() try: await owner.send(embed=embed) - except discord.Forbidden: + except discord.Forbidden as exception: await self.logger.send_log( - message=f"Could not DM discord bot owner", - level=LogLevel.WARNING, + message="Could not DM discord bot owner", + level=LogLevel.ERROR, + exception=exception ) async def on_message(self: Self, message: discord.Message) -> None: From 1cb6a798bc23d8fe82391fde0b0783d0b1591df6 Mon Sep 17 00:00:00 2001 From: ajax146 <31014239+ajax146@users.noreply.github.com> Date: Tue, 18 Feb 2025 23:29:02 -0500 Subject: [PATCH 3/4] Formatting 2 --- techsupport_bot/bot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/techsupport_bot/bot.py b/techsupport_bot/bot.py index 63ac95fb1..4f875b60e 100644 --- a/techsupport_bot/bot.py +++ b/techsupport_bot/bot.py @@ -249,7 +249,7 @@ async def log_DM(self: Self, sent_from: str, source: str, content: str) -> None: await self.logger.send_log( message="Could not DM discord bot owner", level=LogLevel.ERROR, - exception=exception + exception=exception, ) async def on_message(self: Self, message: discord.Message) -> None: From cb04cdacf4b146ed1eef52516defe9a8f129004a Mon Sep 17 00:00:00 2001 From: ajax146 <31014239+ajax146@users.noreply.github.com> Date: Wed, 19 Feb 2025 07:58:36 -0800 Subject: [PATCH 4/4] Update config.default.yml --- config.default.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.default.yml b/config.default.yml index 707afdd1f..c40a481e6 100644 --- a/config.default.yml +++ b/config.default.yml @@ -6,7 +6,7 @@ bot_config: disabled_extensions: ["kanye"] default_prefix: "." global_alerts_channel: "" - override_owner: "126551534447099905" + override_owner: "" modmail_config: enable_modmail: False disable_thread_creation: False