From 543b5199b6f3d4e008d8dd2b667be1f4fccb498b Mon Sep 17 00:00:00 2001 From: Stijn De Clercq Date: Mon, 14 Feb 2022 16:40:42 +0100 Subject: [PATCH] Fix changes in fork --- cogs/dinks.py | 2 +- cogs/modCommands.py | 6 +++--- cogs/selfpromo.py | 2 +- cogs/store.py | 2 +- cogs/xp.py | 2 +- data/embeds/snipe.py | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/cogs/dinks.py b/cogs/dinks.py index b1a2beb..c4f1d41 100644 --- a/cogs/dinks.py +++ b/cogs/dinks.py @@ -164,7 +164,7 @@ class Dinks(commands.Cog): embed = discord.Embed(colour=discord.Colour.blue()) embed.set_author(name="Bank van {}".format(ctx.author.display_name)) - embed.set_thumbnail(url=str(ctx.author.avatar_url)) + embed.set_thumbnail(url=str(ctx.author.avatar.url)) embed.add_field(name="Level:", value=str(response[2]) + maxLevels, inline=True) embed.add_field(name="Ratio:", value=str(ratio), inline=True) embed.add_field(name="Prijs voor volgend level:", value="{:,}".format(interestLevelPrice), inline=False) diff --git a/cogs/modCommands.py b/cogs/modCommands.py index a6f2fda..ad116f8 100644 --- a/cogs/modCommands.py +++ b/cogs/modCommands.py @@ -33,7 +33,7 @@ class ModCommands(commands.Cog): try: self.client.load_extension("cogs.{}".format(extension)) await self.sendDm(constants.myId, "Loaded **{}**".format(extension)) - except discord.ext.commands.errors.ExtensionAlreadyLoaded: + except discord.ExtensionAlreadyLoaded: await self.sendDm(constants.myId, "**{}** has already been loaded".format(extension)) @commands.command(name="Config", aliases=["Setup", "Set"], case_insensitive=True, usage="[Categorie] [Value]", @@ -59,7 +59,7 @@ class ModCommands(commands.Cog): try: self.client.unload_extension("cogs.{}".format(extension)) await self.sendDm(constants.myId, "Unloaded **{}**".format(extension)) - except discord.ext.commands.errors.ExtensionNotLoaded: + except discord.ExtensionNotLoaded: await self.sendDm(constants.myId, "**{}** has already been unloaded".format(extension)) # Unload all cogs except for modCommands @@ -181,7 +181,7 @@ class ModCommands(commands.Cog): embed = discord.Embed(colour=discord.Colour.blue()) - embed.set_author(name=user.display_name, icon_url=user.avatar_url) + embed.set_author(name=user.display_name, icon_url=user.avatar.url) embed.add_field(name="Discriminator", value=f"#{user.discriminator}") embed.add_field(name="Discord id", value=user.id) embed.add_field(name="Bot", value="Nee" if not user.bot else "Ja") diff --git a/cogs/selfpromo.py b/cogs/selfpromo.py index 6777dac..169b02f 100644 --- a/cogs/selfpromo.py +++ b/cogs/selfpromo.py @@ -93,7 +93,7 @@ class SelfPromo(commands.Cog): async def createPersonalPromo(self, ctx, user, link, colour, type): embed = discord.Embed(colour=colour) - embed.set_author(name="{} Links".format(type), icon_url=user.avatar_url) + embed.set_author(name="{} Links".format(type), icon_url=user.avatar.url) embed.add_field(name="{} link van {}".format(type, user.display_name), value=link) await ctx.send(embed=embed) diff --git a/cogs/store.py b/cogs/store.py index d24a500..47c46ae 100644 --- a/cogs/store.py +++ b/cogs/store.py @@ -109,7 +109,7 @@ class Store(commands.Cog): inv = sorted(inv, key=lambda x: x[1]) embed = discord.Embed(colour=discord.Colour.blue()) embed.set_author(name="Inventory van {}".format(ctx.author.display_name)) - embed.set_thumbnail(url=str(ctx.author.avatar_url)) + embed.set_thumbnail(url=str(ctx.author.avatar.url)) if len(inv) == 0: embed.description = "Je hebt nog niets gekocht!\n" \ "Koop iets in de Store wanneer DJ STIJN niet langer te lui is om er iets in te steken." diff --git a/cogs/xp.py b/cogs/xp.py index e0dd1ea..a738045 100644 --- a/cogs/xp.py +++ b/cogs/xp.py @@ -27,7 +27,7 @@ class Xp(commands.Cog): perc = round(int(target_stats[11]) * 100/message_count, 2) embed = discord.Embed(colour=discord.Colour.blue()) - embed.set_author(name=target.display_name, icon_url=target.avatar_url) + embed.set_author(name=target.display_name, icon_url=target.avatar.url) embed.add_field(name="Aantal Berichten", value="{:,} ({}%)".format(int(target_stats[11]), perc)) embed.add_field(name="Level", value=str(xp.calculate_level(target_stats[12]))) embed.add_field(name="XP", value="{:,}".format(int(target_stats[12]))) diff --git a/data/embeds/snipe.py b/data/embeds/snipe.py index 9e03474..35005f7 100644 --- a/data/embeds/snipe.py +++ b/data/embeds/snipe.py @@ -15,7 +15,7 @@ class EditSnipe: member: discord.Member = guild.get_member(self.snipe.user) embed = discord.Embed(title="Edit Snipe", colour=discord.Colour.blue()) - embed.set_author(name=member.display_name, icon_url=member.avatar_url) + embed.set_author(name=member.display_name, icon_url=member.avatar.url) embed.add_field(name="Voor", value=self.snipe.old, inline=False) embed.add_field(name="Na", value=self.snipe.new, inline=False) @@ -34,7 +34,7 @@ class DeleteSnipe: member: discord.Member = guild.get_member(self.snipe.user) embed = discord.Embed(title="Delete Snipe", colour=discord.Colour.blue()) - embed.set_author(name=member.display_name, icon_url=member.avatar_url) + embed.set_author(name=member.display_name, icon_url=member.avatar.url) embed.add_field(name="Message", value=self.snipe.old) return embed