From 9970dc4c0766015e0deeef973d028de850e19ae1 Mon Sep 17 00:00:00 2001 From: TheCataliasTNT2k <44349750+TheCataliasTNT2k@users.noreply.github.com> Date: Thu, 2 Feb 2023 18:34:03 +0100 Subject: [PATCH 1/3] added "joined at" to member leave notifications --- moderation/logging/cog.py | 5 ++++- moderation/logging/translations/en.yml | 1 + 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/moderation/logging/cog.py b/moderation/logging/cog.py index b304ede6d..4b091e6c8 100644 --- a/moderation/logging/cog.py +++ b/moderation/logging/cog.py @@ -310,7 +310,10 @@ async def on_member_remove(self, member: Member): if (log_channel := await self.get_logging_channel(LoggingSettings.member_leave_channel)) is None: return - await log_channel.send(t.member_left_server(member)) + if (join := member.joined_at): + await log_channel.send(t.member_left_server_with_joined(member, join.strftime("%m/%d/%Y, %H:%M:%S"))) + else: + await log_channel.send(t.member_left_server(member)) @commands.group(aliases=["log"]) @LoggingPermission.read.check diff --git a/moderation/logging/translations/en.yml b/moderation/logging/translations/en.yml index 8c1d1af9c..00b6a846c 100644 --- a/moderation/logging/translations/en.yml +++ b/moderation/logging/translations/en.yml @@ -24,6 +24,7 @@ message_id: Message ID created_at: Created At member_joined_server: "{} ({}) just joined the server!" +member_left_server_with_joined: "**{}** just left the server! Latest join was at {}" member_left_server: "**{}** just left the server!" log_not_changed_no_permissions: > From f9657ddbdd764a32b5c3c1b29a1d6e809b581780 Mon Sep 17 00:00:00 2001 From: TheCataliasTNT2k <44349750+TheCataliasTNT2k@users.noreply.github.com> Date: Thu, 2 Feb 2023 20:35:52 +0100 Subject: [PATCH 2/3] linter and add user ID to message --- moderation/logging/cog.py | 6 +++--- moderation/logging/translations/en.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/moderation/logging/cog.py b/moderation/logging/cog.py index 4b091e6c8..c0ab93222 100644 --- a/moderation/logging/cog.py +++ b/moderation/logging/cog.py @@ -310,10 +310,10 @@ async def on_member_remove(self, member: Member): if (log_channel := await self.get_logging_channel(LoggingSettings.member_leave_channel)) is None: return - if (join := member.joined_at): - await log_channel.send(t.member_left_server_with_joined(member, join.strftime("%m/%d/%Y, %H:%M:%S"))) + if join := member.joined_at: + await log_channel.send(t.member_left_server_with_joined(member, member.id, join.strftime("%m/%d/%Y, %H:%M:%S"))) else: - await log_channel.send(t.member_left_server(member)) + await log_channel.send(t.member_left_server(member, member.id)) @commands.group(aliases=["log"]) @LoggingPermission.read.check diff --git a/moderation/logging/translations/en.yml b/moderation/logging/translations/en.yml index 00b6a846c..6a7008ae2 100644 --- a/moderation/logging/translations/en.yml +++ b/moderation/logging/translations/en.yml @@ -24,8 +24,8 @@ message_id: Message ID created_at: Created At member_joined_server: "{} ({}) just joined the server!" -member_left_server_with_joined: "**{}** just left the server! Latest join was at {}" -member_left_server: "**{}** just left the server!" +member_left_server_with_joined: "**{}** ({}) just left the server! Latest join was at {}" +member_left_server: "**{}** ({}) just left the server!" log_not_changed_no_permissions: > Logging channel could not be changed because I don't have `send_messages` permission there. From 31a56d13f61780553ca5b3394dfc5c80432505ad Mon Sep 17 00:00:00 2001 From: TheCataliasTNT2k <44349750+TheCataliasTNT2k@users.noreply.github.com> Date: Thu, 2 Feb 2023 20:39:23 +0100 Subject: [PATCH 3/3] moar linter fixes --- moderation/logging/cog.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/moderation/logging/cog.py b/moderation/logging/cog.py index c0ab93222..7c9a11a5d 100644 --- a/moderation/logging/cog.py +++ b/moderation/logging/cog.py @@ -311,7 +311,9 @@ async def on_member_remove(self, member: Member): return if join := member.joined_at: - await log_channel.send(t.member_left_server_with_joined(member, member.id, join.strftime("%m/%d/%Y, %H:%M:%S"))) + await log_channel.send( + t.member_left_server_with_joined(member, member.id, join.strftime("%m/%d/%Y, %H:%M:%S")) + ) else: await log_channel.send(t.member_left_server(member, member.id))