Initial dpy2 commit

advancedlock/__init__.py

@@ -1,5 +1,5 @@
 from .advancedlock import AdvancedLock
 
 
-def setup(bot):
-    bot.add_cog(AdvancedLock(bot))
+async def setup(bot):
+    await bot.add_cog(AdvancedLock(bot))

advancedlock/advancedlock.py

@@ -363,7 +363,7 @@ async def setlock_settings(self, ctx: commands.Context):
         if c_list == []:
             c_desc = "Not specified"
         embed = discord.Embed(colour=await ctx.embed_colour(), timestamp=datetime.now())
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.title = "**__Advanced Lock settings:__**"
         embed.add_field(name="Enabled:", value=toggle)
         embed.add_field(name="Moderator role:", value=mod)

application/__init__.py

@@ -1,5 +1,5 @@
 from .application import Application
 
 
-def setup(bot):
-    bot.add_cog(Application(bot))
+async def setup(bot):
+    await bot.add_cog(Application(bot))

application/application.py

@@ -101,7 +101,7 @@ async def apply(self, ctx: commands.Context):
         embed = discord.Embed(
             color=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name="New application!", icon_url=ctx.author.avatar_url)
+        embed.set_author(name="New application!", icon_url=ctx.author.avatar)
         embed.set_footer(
             text=f"{ctx.author.name}#{ctx.author.discriminator} ({ctx.author.id})"
         )
@@ -284,7 +284,7 @@ async def applyset_settings(self, ctx: commands.Context):
         embed = discord.Embed(
             colour=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.set_footer(text="*required to function properly")
 
         embed.title = "**__Application settings:__**"

cookies/__init__.py

@@ -13,8 +13,8 @@ async def setup_after_ready(bot):
             for alias in command.aliases:
                 if bot.get_command(alias):
                     command.aliases[command.aliases.index(alias)] = f"c{alias}"
-    bot.add_cog(cog)
+    await bot.add_cog(cog)
 
 
-def setup(bot):
+async def setup(bot):
     create_task(setup_after_ready(bot))

cookies/cookies.py

@@ -572,7 +572,7 @@ async def cookieset_settings(self, ctx: commands.Context):
         embed = discord.Embed(
             colour=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.title = "**__Cookies settings:__**"
         embed.set_footer(text="*required to function properly")
 

cookiestore/__init__.py

@@ -13,8 +13,8 @@ async def setup_after_ready(bot):
             for alias in command.aliases:
                 if bot.get_command(alias):
                     command.aliases[command.aliases.index(alias)] = f"c{alias}"
-    bot.add_cog(cog)
+    await bot.add_cog(cog)
 
 
-def setup(bot):
+async def setup(bot):
     create_task(setup_after_ready(bot))

cookiestore/cookiestore.py

@@ -306,7 +306,7 @@ async def cookiestoreset_settings(self, ctx: commands.Context):
         embed = discord.Embed(
             colour=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.title = "**__Cookie Store settings:__**"
         embed.set_footer(text="*required to function properly")
 
@@ -543,7 +543,7 @@ async def inventory(self, ctx: commands.Context):
         )
         embed.set_author(
             name=f"{ctx.author.display_name}'s inventory",
-            icon_url=ctx.author.avatar_url,
+            icon_url=ctx.author.avatar,
         )
 
         await ctx.send(embed=embed)
@@ -632,7 +632,7 @@ async def _show_store(self, ctx):
             )
             embed.set_author(
                 name=f"{ctx.guild.name}'s cookie store",
-                icon_url=ctx.guild.icon_url,
+                icon_url=ctx.guild.icon,
             )
             page_list.append(embed)
         return page_list

counting/__init__.py

@@ -1,5 +1,5 @@
 from .counting import Counting
 
 
-def setup(bot):
-    bot.add_cog(Counting(bot))
+async def setup(bot):
+    await bot.add_cog(Counting(bot))

counting/counting.py

@@ -188,7 +188,7 @@ async def countset_settings(self, ctx: commands.Context):
         embed = discord.Embed(
             colour=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.title = "**__Counting settings:__**"
         embed.set_footer(text="*required to function properly")
 

economyraffle/__init__.py

@@ -1,5 +1,5 @@
 from .economyraffle import EconomyRaffle
 
 
-def setup(bot):
-    bot.add_cog(EconomyRaffle(bot))
+async def setup(bot):
+    await bot.add_cog(EconomyRaffle(bot))

economyraffle/economyraffle.py

@@ -72,7 +72,7 @@ async def economyraffleset_settings(self, ctx: commands.Context):
         embed = discord.Embed(
             colour=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.title = "**__Economy Raffle settings:__**"
         embed.set_footer(text="*required to function properly")
 

forwarding/__init__.py

@@ -1,6 +1,6 @@
 from .forwarding import Forwarding
 
 
-def setup(bot):
+async def setup(bot):
     n = Forwarding(bot)
-    bot.add_cog(n)
+    await bot.add_cog(n)

forwarding/forwarding.py

@@ -73,7 +73,7 @@ async def on_message_without_command(self, message):
                 description=message.content,
                 timestamp=message.created_at,
             )
-            embed.set_author(name=message.author, icon_url=message.author.avatar_url)
+            embed.set_author(name=message.author, icon_url=message.author.avatar)
             embed.set_footer(text=f"User ID: {message.author.id}")
             await message.author.send("Message has been delivered.")
         else:
@@ -82,7 +82,7 @@ async def on_message_without_command(self, message):
                 description=message.content,
                 timestamp=message.created_at,
             )
-            embed.set_author(name=message.author, icon_url=message.author.avatar_url)
+            embed.set_author(name=message.author, icon_url=message.author.avatar)
             embed.set_image(url=message.attachments[0].url)
             embed.set_footer(text=f"User ID: {message.author.id}")
             await message.author.send(
@@ -173,7 +173,7 @@ async def forwardset_settings(self, ctx: commands.Context):
         embed = discord.Embed(
             colour=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.title = "**__Unique Name settings:__**"
         embed.set_footer(text="*required to function properly")
 

gallery/__init__.py

@@ -1,5 +1,5 @@
 from .gallery import Gallery
 
 
-def setup(bot):
-    bot.add_cog(Gallery(bot))
+async def setup(bot):
+    await bot.add_cog(Gallery(bot))

gallery/gallery.py

@@ -107,7 +107,7 @@ async def galleryset_settings(self, ctx: commands.Context):
         embed = discord.Embed(
             colour=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.title = "**__Unique Name settings:__**"
         embed.set_footer(text="*required to function properly")
 

lock/__init__.py

@@ -1,5 +1,5 @@
 from .lock import Lock
 
 
-def setup(bot):
-    bot.add_cog(Lock(bot))
+async def setup(bot):
+    await bot.add_cog(Lock(bot))

lock/lock.py

@@ -96,7 +96,7 @@ async def lockset_settings(self, ctx: commands.Context):
         embed = discord.Embed(
             colour=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.title = "**__Lock settings:__**"
         embed.set_footer(text="*required to function properly")
 

lvlupcookies/__init__.py

@@ -1,5 +1,5 @@
 from .lvlupcookies import LevelUpCookies
 
 
-def setup(bot):
-    bot.add_cog(LevelUpCookies(bot))
+async def setup(bot):
+    await bot.add_cog(LevelUpCookies(bot))

lvlupcookies/lvlupcookies.py

@@ -77,7 +77,7 @@ async def levelupcookiesset_show(self, ctx: commands.Context):
             )
             embed.set_author(
                 name=f"Cookie rewards for {ctx.guild.name}",
-                icon_url=ctx.guild.icon_url,
+                icon_url=ctx.guild.icon,
             )
             page_list.append(embed)
         await menu(ctx, page_list, DEFAULT_CONTROLS)

marriage/__init__.py

@@ -13,7 +13,7 @@ async def setup_after_ready(bot):
             for alias in command.aliases:
                 if bot.get_command(alias):
                     command.aliases[command.aliases.index(alias)] = f"m{alias}"
-    bot.add_cog(cog)
+    await bot.add_cog(cog)
 
-def setup(bot):
+async def setup(bot):
     create_task(setup_after_ready(bot))

marriage/marriage.py

@@ -275,7 +275,7 @@ async def marryset_settings(self, ctx: commands.Context):
         embed = discord.Embed(
             colour=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.title = "**__Marriage settings:__**"
         embed.add_field(name="Global:", value=str(is_global))
         embed.add_field(name="Enabled*:", value=str(data["toggle"]))
@@ -492,9 +492,9 @@ async def about(
                 giftos.append(textos)
         gift_text = "None" if giftos == [] else humanize_list(giftos)
         e = discord.Embed(colour=member.color)
-        e.set_author(name=f"{member.name}'s Profile", icon_url=member.avatar_url)
+        e.set_author(name=f"{member.name}'s Profile", icon_url=member.avatar)
         e.set_footer(text=f"{member.name}#{member.discriminator} ({member.id})")
-        e.set_thumbnail(url=member.avatar_url)
+        e.set_thumbnail(url=member.avatar)
         e.add_field(name="About:", value=await m_conf.about(), inline=False)
         e.add_field(name="Status:", value=rs_status)
         if is_married:

mentionable/__init__.py

@@ -1,5 +1,5 @@
 from .mentionable import Mentionable
 
 
-def setup(bot):
-    bot.add_cog(Mentionable(bot))
+async def setup(bot):
+    await bot.add_cog(Mentionable(bot))

pick/__init__.py

@@ -1,5 +1,5 @@
 from .pick import Pick
 
 
-def setup(bot):
-    bot.add_cog(Pick(bot))
+async def setup(bot):
+    await bot.add_cog(Pick(bot))

pingable/__init__.py

@@ -1,5 +1,5 @@
 from .pingable import Pingable
 
 
-def setup(bot):
-    bot.add_cog(Pingable(bot))
+async def setup(bot):
+    await bot.add_cog(Pingable(bot))

pingable/pingable.py

@@ -82,7 +82,7 @@ async def pingableset_settings(self, ctx: commands.Context):
         embed = discord.Embed(
             colour=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.title = "**__Pingable settings:__**"
         embed.set_footer(text="*required to function properly")
 

reacttickets/__init__.py

@@ -3,5 +3,5 @@
 
 async def setup(bot):
     cog = ReactTickets(bot)
-    bot.add_cog(cog)
+    await bot.add_cog(cog)
     await cog.initialize()

reacttickets/reacttickets.py

@@ -289,7 +289,7 @@ async def ticketset_settings(self, ctx: commands.Context):
         embed = discord.Embed(
             colour=await ctx.embed_colour(), timestamp=datetime.datetime.now()
         )
-        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon_url)
+        embed.set_author(name=ctx.guild.name, icon_url=ctx.guild.icon)
         embed.title = "**__Reaction Tickets settings:__**"
         embed.set_footer(text="*required to function properly")
 
@@ -444,7 +444,7 @@ async def _open_ticket(
                 description="To close this ticket, react with 🔒 below.",
                 timestamp=datetime.datetime.utcnow(),
             )
-            embed.set_thumbnail(url=user.avatar_url)
+            embed.set_thumbnail(url=user.avatar)
             embed.set_footer(text=f"{user.name}#{user.discriminator} ({user.id})")
             embed_user_message = await user_channel.send(
                 content=f"{user.mention}, a staff member will be with you shortly.",
@@ -457,7 +457,7 @@ async def _open_ticket(
                 description=reason,
                 timestamp=datetime.datetime.utcnow(),
             )
-            embed.set_thumbnail(url=user.avatar_url)
+            embed.set_thumbnail(url=user.avatar)
             manager_msg = await guild.get_channel(settings["channel"]).send(
                 content=f"User: {user.mention}\nChannel: {user_channel.mention}",
                 embed=embed,

suggestion/__init__.py

@@ -1,5 +1,5 @@
 from .suggestion import Suggestion
 
 
-def setup(bot):
-    bot.add_cog(Suggestion(bot))
+async def setup(bot):
+    await bot.add_cog(Suggestion(bot))