From 126e2874c97edb5244f4a9aa33bfc9a470cc8f53 Mon Sep 17 00:00:00 2001 From: nizzan Date: Mon, 26 Jun 2023 22:42:14 +0200 Subject: [PATCH 01/10] fix --- userlog/userlog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userlog/userlog.py b/userlog/userlog.py index 939c15f..5ed2eee 100644 --- a/userlog/userlog.py +++ b/userlog/userlog.py @@ -104,7 +104,7 @@ async def on_member_join(self, member): ) if not channel: return - time = datetime.datetime.utcnow() + time = datetime.now(timezone.utc) users = len(member.guild.members) since_created = (time - member.created_at).days user_created = member.created_at.strftime("%Y-%m-%d, %H:%M") From ae1c75931c2edc37c0b62477afd1d4b6fd6d5ba6 Mon Sep 17 00:00:00 2001 From: nizzan Date: Mon, 26 Jun 2023 22:49:34 +0200 Subject: [PATCH 02/10] asdf --- userlog/userlog.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/userlog/userlog.py b/userlog/userlog.py index 5ed2eee..334d4a7 100644 --- a/userlog/userlog.py +++ b/userlog/userlog.py @@ -106,10 +106,9 @@ async def on_member_join(self, member): return time = datetime.now(timezone.utc) users = len(member.guild.members) - since_created = (time - member.created_at).days - user_created = member.created_at.strftime("%Y-%m-%d, %H:%M") + user_created = member.strftime("%Y-%m-%d, %H:%M") - created_on = f"{user_created} ({since_created} days ago)" + created_on = f"{user_created}" embed = discord.Embed( description=f"{member.mention} ({member.name}#{member.discriminator})", From 39c96f1e0a6f0889913bb9b3659e24c82772412c Mon Sep 17 00:00:00 2001 From: nizzan Date: Mon, 26 Jun 2023 22:53:34 +0200 Subject: [PATCH 03/10] rollback --- userlog/userlog.py | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/userlog/userlog.py b/userlog/userlog.py index 334d4a7..30e0b8a 100644 --- a/userlog/userlog.py +++ b/userlog/userlog.py @@ -104,11 +104,12 @@ async def on_member_join(self, member): ) if not channel: return - time = datetime.now(timezone.utc) + time = datetime.datetime.utcnow() users = len(member.guild.members) - user_created = member.strftime("%Y-%m-%d, %H:%M") + since_created = (time - member.created_at).days + user_created = member.created_at.strftime("%Y-%m-%d, %H:%M") - created_on = f"{user_created}" + created_on = f"{user_created} ({since_created} days ago)" embed = discord.Embed( description=f"{member.mention} ({member.name}#{member.discriminator})", @@ -151,4 +152,4 @@ async def on_member_remove(self, member): icon_url=member.avatar, ) embed.set_thumbnail(url=member.avatar) - await channel.send(embed=embed) + await channel.send(embed=embed) \ No newline at end of file From 6963f8ae4e217eff03e2926da08e30c87dd76dbe Mon Sep 17 00:00:00 2001 From: nizzan Date: Mon, 26 Jun 2023 23:06:24 +0200 Subject: [PATCH 04/10] I have no clue what im doing --- userlog/userlog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/userlog/userlog.py b/userlog/userlog.py index 30e0b8a..a5e0620 100644 --- a/userlog/userlog.py +++ b/userlog/userlog.py @@ -1,4 +1,4 @@ -import datetime +from datetime import datetime, timezone import discord import typing @@ -104,7 +104,7 @@ async def on_member_join(self, member): ) if not channel: return - time = datetime.datetime.utcnow() + time = datetime.now(timezone.utc) users = len(member.guild.members) since_created = (time - member.created_at).days user_created = member.created_at.strftime("%Y-%m-%d, %H:%M") From 4dc92dfd37b25e4861d434d74946d5dc69f5f788 Mon Sep 17 00:00:00 2001 From: nizzan Date: Sun, 2 Jul 2023 22:25:28 +0200 Subject: [PATCH 05/10] asdf --- userlog/userlog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userlog/userlog.py b/userlog/userlog.py index a5e0620..6d2ea60 100644 --- a/userlog/userlog.py +++ b/userlog/userlog.py @@ -104,7 +104,7 @@ async def on_member_join(self, member): ) if not channel: return - time = datetime.now(timezone.utc) + time = datetime.datetime.now() users = len(member.guild.members) since_created = (time - member.created_at).days user_created = member.created_at.strftime("%Y-%m-%d, %H:%M") From aca49d66889aa327bc3bdcd2b0053b1258a17d3a Mon Sep 17 00:00:00 2001 From: nizzan Date: Sun, 2 Jul 2023 22:33:31 +0200 Subject: [PATCH 06/10] asdf2 --- userlog/userlog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userlog/userlog.py b/userlog/userlog.py index 6d2ea60..8704e05 100644 --- a/userlog/userlog.py +++ b/userlog/userlog.py @@ -1,4 +1,4 @@ -from datetime import datetime, timezone +import datetime import discord import typing From 003f58a649bb5dd7747d78461d7fe7bc0af591d1 Mon Sep 17 00:00:00 2001 From: nizzan Date: Sun, 2 Jul 2023 22:39:26 +0200 Subject: [PATCH 07/10] asdf3 --- userlog/userlog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/userlog/userlog.py b/userlog/userlog.py index 8704e05..e40b2cc 100644 --- a/userlog/userlog.py +++ b/userlog/userlog.py @@ -1,4 +1,4 @@ -import datetime +from datetime import datetime, timedelta import discord import typing @@ -104,7 +104,7 @@ async def on_member_join(self, member): ) if not channel: return - time = datetime.datetime.now() + time = datetime.now() users = len(member.guild.members) since_created = (time - member.created_at).days user_created = member.created_at.strftime("%Y-%m-%d, %H:%M") From 1892f05ed8d9e2df35941a3df01b63bed927785e Mon Sep 17 00:00:00 2001 From: nizzan Date: Sun, 2 Jul 2023 22:46:35 +0200 Subject: [PATCH 08/10] asdf4 --- userlog/userlog.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/userlog/userlog.py b/userlog/userlog.py index e40b2cc..dc329c1 100644 --- a/userlog/userlog.py +++ b/userlog/userlog.py @@ -1,4 +1,4 @@ -from datetime import datetime, timedelta +import datetime import discord import typing @@ -82,7 +82,7 @@ async def user_settings(self, ctx: commands.Context): channel = ctx.guild.get_channel(await self.config.guild(ctx.guild).channel()) channel = "None" if not channel else channel.mention embed = discord.Embed( - colour=await ctx.embed_colour(), timestamp=datetime.datetime.now() + colour=await ctx.embed_colour(), timestamp=datetime.now() ) embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon) embed.title = "**__User Log settings:__**" @@ -137,7 +137,7 @@ async def on_member_remove(self, member): ) if not channel: return - time = datetime.datetime.utcnow() + time = datetime.now() users = len(member.guild.members) embed = discord.Embed( description=f"{member.mention} ({member.name}#{member.discriminator})", From 70d5fc40ac8500bc77566f61afcdcc4f9bd13d20 Mon Sep 17 00:00:00 2001 From: nizzan Date: Sun, 2 Jul 2023 22:52:32 +0200 Subject: [PATCH 09/10] asdf5 --- userlog/userlog.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/userlog/userlog.py b/userlog/userlog.py index dc329c1..3f1d7c0 100644 --- a/userlog/userlog.py +++ b/userlog/userlog.py @@ -1,4 +1,4 @@ -import datetime +from datetime import datetime import discord import typing From b37f07ab165450d9f86ce965d9b89962e892ce4f Mon Sep 17 00:00:00 2001 From: nizzan Date: Sun, 2 Jul 2023 22:55:40 +0200 Subject: [PATCH 10/10] asdf6 --- userlog/userlog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/userlog/userlog.py b/userlog/userlog.py index 3f1d7c0..81c338a 100644 --- a/userlog/userlog.py +++ b/userlog/userlog.py @@ -1,4 +1,4 @@ -from datetime import datetime +from datetime import datetime, timezone import discord import typing @@ -104,7 +104,7 @@ async def on_member_join(self, member): ) if not channel: return - time = datetime.now() + time = datetime.now(timezone.utc) users = len(member.guild.members) since_created = (time - member.created_at).days user_created = member.created_at.strftime("%Y-%m-%d, %H:%M")