Fix for double posting issues

This if statement is such that if there is no title in this feed it meets the criteria for this If and the one above and thus gets placed in the queue twice and double posted. Ive seen this in Mastodon feeds for example.


                if (last_title == "" and entry_title == "") and (last_link != entry_link) and (last_time < entry_time):
                    log.debug(f"New entry found via time validation for feed {name} on cid {channel.id} - no title")
                    feedparser_plus_obj = await self._add_to_feedparser_object(entry, url)
                    feedparser_plus_objects.append(feedparser_plus_obj)

README.md

@@ -45,10 +45,10 @@ pingtime - Show all shards' pingtimes.
 
 pressf - A port/rewrite of NekoTony's v2 pressf cog. Pay your respects by pressing F.
 
-pupper - A cog for Ryan5374. A pet that comes around on an on_message listener and waits for someone to pet it (react with a standard wave emoji), and rewards with credits. Many attributes are configurable.
-
 quiz - A kahoot-like trivia game. Originally by Keane for Red v2.
 
+reminder - A continued fork of ZeLarpMaster's reminder cog. This cog is licensed under the GPL-3.0 License.
+
 rndstatus - A v3 port of Twentysix's rndstatus cog with a couple extra settings.
 
 rss - Will's RSS cog ported for v3 with a lot of extra bells and whistles.
@@ -73,4 +73,4 @@ wolfram - A v3 port of Paddo's abandoned Wolfram Alpha cog.
 
 youtube - A v3 port of Paddo's youtube search cog for v2.
 
-Support for these cogs is via opened issues on the appropriate repo or in the Red - Cog Support server at https://discord.gg/KcAbsvD, in the support-aikaterna-cogs channel.
+Support for these cogs is via opened issues on the appropriate repo or in the Red - Cog Support server at https://discord.gg/GET4DVk, in the support_aikaterna-cogs channel.

away/__init__.py

@@ -12,5 +12,5 @@ __red_end_user_data_statement__ = (
 )
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(Away(bot))
+    bot.add_cog(Away(bot))

away/away.py

@@ -1,6 +1,7 @@
 import discord
 from redbot.core import Config, commands, checks
 from typing import Optional, Literal
+import datetime
 import re
 
 IMAGE_LINKS = re.compile(r"(http[s]?:\/\/[^\"\']*\.(?:png|jpg|jpeg|gif|png))")
@@ -36,7 +37,7 @@ class Away(commands.Cog):
     def _draw_play(self, song):
         song_start_time = song.start
         total_time = song.duration
-        current_time = discord.utils.utcnow()
+        current_time = datetime.datetime.utcnow()
         elapsed_time = current_time - song_start_time
         sections = 12
         loc_time = round((elapsed_time / total_time) * sections)  # 10 sections
@@ -59,7 +60,7 @@ class Away(commands.Cog):
         """
             Makes the embed reply
         """
-        avatar = author.display_avatar  # This will return default avatar if no avatar is present
+        avatar = author.avatar_url_as()  # This will return default avatar if no avatar is present
         color = author.color
         if message:
             link = IMAGE_LINKS.search(message)
@@ -225,7 +226,7 @@ class Away(commands.Cog):
         return False
 
     @commands.Cog.listener()
-    async def on_message_without_command(self, message: discord.Message):
+    async def on_message(self, message: discord.Message):
         guild = message.guild
         if not guild or not message.mentions or message.author.bot:
             return
@@ -253,10 +254,10 @@ class Away(commands.Cog):
                     delete_after = None
                 if embed_links and not guild_config["TEXT_ONLY"]:
                     em = await self.make_embed_message(author, away_msg, "away")
-                    await message.channel.send(embed=em, delete_after=delete_after)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                 elif (embed_links and guild_config["TEXT_ONLY"]) or not embed_links:
                     msg = await self.make_text_message(author, away_msg, "away")
-                    await message.channel.send(msg, delete_after=delete_after)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             idle_msg = user_data["IDLE_MESSAGE"]
             # Convert possible `delete_after` of < 5s of before PR#212
@@ -270,10 +271,10 @@ class Away(commands.Cog):
                     delete_after = None
                 if embed_links and not guild_config["TEXT_ONLY"]:
                     em = await self.make_embed_message(author, idle_msg, "idle")
-                    await message.channel.send(embed=em, delete_after=delete_after)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                 elif (embed_links and guild_config["TEXT_ONLY"]) or not embed_links:
                     msg = await self.make_text_message(author, idle_msg, "idle")
-                    await message.channel.send(msg, delete_after=delete_after)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             dnd_msg = user_data["DND_MESSAGE"]
             # Convert possible `delete_after` of < 5s of before PR#212
@@ -287,10 +288,10 @@ class Away(commands.Cog):
                     delete_after = None
                 if embed_links and not guild_config["TEXT_ONLY"]:
                     em = await self.make_embed_message(author, dnd_msg, "dnd")
-                    await message.channel.send(embed=em, delete_after=delete_after)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                 elif (embed_links and guild_config["TEXT_ONLY"]) or not embed_links:
                     msg = await self.make_text_message(author, dnd_msg, "dnd")
-                    await message.channel.send(msg, delete_after=delete_after)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             offline_msg = user_data["OFFLINE_MESSAGE"]
             # Convert possible `delete_after` of < 5s of before PR#212
@@ -304,7 +305,7 @@ class Away(commands.Cog):
                     delete_after = None
                 if embed_links and not guild_config["TEXT_ONLY"]:
                     em = await self.make_embed_message(author, offline_msg, "offline")
-                    await message.channel.send(embed=em, delete_after=delete_after)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                 elif (embed_links and guild_config["TEXT_ONLY"]) or not embed_links:
                     msg = await self.make_text_message(author, offline_msg, "offline")
                     await message.channel.send(msg, delete_after=delete_after)
@@ -318,10 +319,10 @@ class Away(commands.Cog):
                 streaming_msg, delete_after = streaming_msg
                 if embed_links and not guild_config["TEXT_ONLY"]:
                     em = await self.make_embed_message(author, streaming_msg, "streaming")
-                    await message.channel.send(embed=em, delete_after=delete_after)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                 elif (embed_links and guild_config["TEXT_ONLY"]) or not embed_links:
                     msg = await self.make_text_message(author, streaming_msg, "streaming")
-                    await message.channel.send(msg, delete_after=delete_after)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             if streaming_msg and type(author.activity) is discord.CustomActivity:
                 stream_status = [c for c in author.activities if c.type == discord.ActivityType.streaming]
@@ -330,10 +331,10 @@ class Away(commands.Cog):
                 streaming_msg, delete_after = streaming_msg
                 if embed_links and not guild_config["TEXT_ONLY"]:
                     em = await self.make_embed_message(author, streaming_msg, "streamingcustom")
-                    await message.channel.send(embed=em, delete_after=delete_after)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                 elif (embed_links and guild_config["TEXT_ONLY"]) or not embed_links:
                     msg = await self.make_text_message(author, streaming_msg, "streamingcustom")
-                    await message.channel.send(msg, delete_after=delete_after)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             listening_msg = user_data["LISTENING_MESSAGE"]
             # Convert possible `delete_after` of < 5s of before PR#212
@@ -344,10 +345,10 @@ class Away(commands.Cog):
                 listening_msg, delete_after = listening_msg
                 if embed_links and not guild_config["TEXT_ONLY"]:
                     em = await self.make_embed_message(author, listening_msg, "listening")
-                    await message.channel.send(embed=em, delete_after=delete_after)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                 elif (embed_links and guild_config["TEXT_ONLY"]) or not embed_links:
                     msg = await self.make_text_message(author, listening_msg, "listening")
-                    await message.channel.send(msg, delete_after=delete_after)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             if listening_msg and type(author.activity) is discord.CustomActivity:
                 listening_status = [c for c in author.activities if c.type == discord.ActivityType.listening]
@@ -356,10 +357,10 @@ class Away(commands.Cog):
                 listening_msg, delete_after = listening_msg
                 if embed_links and not guild_config["TEXT_ONLY"]:
                     em = await self.make_embed_message(author, listening_msg, "listeningcustom")
-                    await message.channel.send(embed=em, delete_after=delete_after)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                 elif (embed_links and guild_config["TEXT_ONLY"]) or not embed_links:
                     msg = await self.make_text_message(author, listening_msg, "listeningcustom")
-                    await message.channel.send(msg, delete_after=delete_after)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             gaming_msgs = user_data["GAME_MESSAGE"]
             # Convert possible `delete_after` of < 5s of before PR#212
@@ -372,11 +373,11 @@ class Away(commands.Cog):
                         game_msg, delete_after = gaming_msgs[game]
                         if embed_links and not guild_config["TEXT_ONLY"]:
                             em = await self.make_embed_message(author, game_msg, "gaming")
-                            await message.channel.send(embed=em, delete_after=delete_after)
+                            await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                             break  # Let's not accidentally post more than one
                         elif (embed_links and guild_config["TEXT_ONLY"]) or not embed_links:
                             msg = await self.make_text_message(author, game_msg, "gaming")
-                            await message.channel.send(msg, delete_after=delete_after)
+                            await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                             break
             if gaming_msgs and type(author.activity) is discord.CustomActivity:
                 game_status = [c for c in author.activities if c.type == discord.ActivityType.playing]
@@ -387,11 +388,11 @@ class Away(commands.Cog):
                         game_msg, delete_after = gaming_msgs[game]
                         if embed_links and not guild_config["TEXT_ONLY"]:
                             em = await self.make_embed_message(author, game_msg, "gamingcustom")
-                            await message.channel.send(embed=em, delete_after=delete_after)
+                            await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                             break  # Let's not accidentally post more than one
                         elif (embed_links and guild_config["TEXT_ONLY"]) or not embed_links:
                             msg = await self.make_text_message(author, game_msg, "gamingcustom")
-                            await message.channel.send(msg, delete_after=delete_after)
+                            await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                             break
 
     @commands.command(name="away")
@@ -666,7 +667,7 @@ class Away(commands.Cog):
 
         if ctx.channel.permissions_for(ctx.me).embed_links:
             em = discord.Embed(description=msg[:2048], color=author.color)
-            em.set_author(name=f"{author.display_name}'s away settings", icon_url=author.avatar.url)
+            em.set_author(name=f"{author.display_name}'s away settings", icon_url=author.avatar_url)
             await ctx.send(embed=em)
         else:
             await ctx.send(f"{author.display_name} away settings\n" + msg)

blurplefy/__init__.py

@@ -3,5 +3,5 @@ from .blurplefy import Blurplefy
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(Blurplefy(bot))
+    bot.add_cog(Blurplefy(bot))

blurplefy/blurplefy.py

@@ -1,29 +1,38 @@
 #  Ported for Red v3 from: https://github.com/Rocked03/Blurplefied
-#  pip install python-resize-image
-#  pip install pillow
 
-import discord
-from PIL import Image, ImageEnhance, ImageSequence
-from io import BytesIO
 import aiohttp
 import asyncio
 import datetime
-import io
+from io import BytesIO
+import logging
 import math
+from PIL import Image, ImageEnhance, ImageSequence, UnidentifiedImageError
+import random
+import sys
 from resizeimage import resizeimage
-from redbot.core import Config, commands, checks
+from types import SimpleNamespace
 
-blurple = (114, 137, 218)
+import discord
-blurplehex = 0x7289DA
+
-darkblurple = (78, 93, 148)
+from redbot.core import Config, commands, checks
-white = (255, 255, 255)
+from redbot.core.utils.predicates import MessagePredicate
+
+
+log = logging.getLogger("red.aikaterna.blurplefy")
+
+
+# LEGACY_BLURPLE = (114, 137, 218)
+# LEGACY_DARK_BLURPLE = (78, 93, 148)
+BLURPLE = (88, 101, 242)
+DARK_BLURPLE = (69, 79, 191)
+WHITE = (255, 255, 255)
 
 
 class Blurplefy(commands.Cog):
     """Blurplefy images and check blurple content of images."""
 
     async def red_delete_data_for_user(self, **kwargs):
-        """ Nothing to delete """
+        """Nothing to delete"""
         return
 
     def __init__(self, bot):
@@ -40,16 +49,18 @@ class Blurplefy(commands.Cog):
     @commands.command()
     @checks.admin_or_permissions(manage_roles=True)
     async def blurplerole(self, ctx):
-        """Toggle a role award for having a blurple profile picture."""
+        """Toggle a role award for having a blurple profile picture.
+
+        A user's profile picture will be checked when they use [p]blurple.
+        """
         blurple_role_id = await self.config.guild(ctx.guild).blurple_role()
         if blurple_role_id is None:
-            await ctx.send("Enter the role name to award: it needs to be a valid, already existing role.")
+            msg = "Enter the role name to award: it needs to be a valid, already existing role, "
-
+            msg += "and the name must match exactly (don't use a role mention)."
-            def check(m):
+            await ctx.send(msg)
-                return m.author == ctx.author
+            pred = MessagePredicate.same_context(ctx)
-
             try:
-                blurple_role = await ctx.bot.wait_for("message", timeout=15.0, check=check)
+                blurple_role = await ctx.bot.wait_for("message", timeout=15.0, check=pred)
                 blurple_role_obj = discord.utils.get(ctx.guild.roles, name=blurple_role.content)
                 if blurple_role_obj is None:
                     return await ctx.send("No role with that name.")
@@ -59,12 +70,7 @@ class Blurplefy(commands.Cog):
 
         role_enabled = await self.config.guild(ctx.guild).role_enabled()
         await self.config.guild(ctx.guild).role_enabled.set(not role_enabled)
-
+        await ctx.send(f"Blurple role awarding {'enabled' if not role_enabled else 'disabled'}.")
-        if not role_enabled:
-            word = "enabled"
-        else:
-            word = "disabled"
-        await ctx.send("Blurple role awarding {}.".format(word))
 
     @commands.guild_only()
     @commands.command()
@@ -74,7 +80,7 @@ class Blurplefy(commands.Cog):
         await self.config.guild(ctx.guild).blurple_role.set(role_name.id)
         blurple_role_id = await self.config.guild(ctx.guild).blurple_role()
         blurple_role_obj = discord.utils.get(ctx.guild.roles, id=blurple_role_id)
-        await ctx.send("Blurple award role set to: {}.".format(blurple_role_obj.name))
+        await ctx.send(f"Blurple award role set to: {blurple_role_obj.name}.")
         blurple_role_enabled = await self.config.guild(ctx.guild).role_enabled()
         if not blurple_role_enabled:
             await ctx.invoke(self.blurplerole)
@@ -82,34 +88,33 @@ class Blurplefy(commands.Cog):
     async def blurplefy(self, ctx, user: discord.Member = None):
         """Blurplefy a user or image."""
         picture = None
-        await ctx.send("{}, starting blurple image analysis.".format(ctx.message.author.mention))
         link = ctx.message.attachments
         if user is None and not link:
-            picture = ctx.author.avatar.url
+            picture = ctx.author.avatar_url
         else:
             if not user:
                 if len(link) != 0:
                     for image in link:
                         picture = image.url
             else:
-                picture = user.avatar.url
+                picture = user.avatar_url
         try:
-            async with self.session.request("GET", str(picture)) as r:
+            async with self.session.get(str(picture)) as r:
                 response = await r.read()
         except ValueError:
-            await ctx.send("{}, please link a valid image URL.".format(ctx.author.display_name))
+            await ctx.send(f"{ctx.author.display_name}, please link a valid image URL.")
             return
 
     @commands.guild_only()
     @commands.command()
     @commands.cooldown(rate=1, per=30, type=commands.BucketType.user)
     async def blurple(self, ctx, user: discord.Member = None):
-        """Check a user or uploaded image for blurple content."""
+        """Check a user or an attached uploaded image for blurple content."""
+        await ctx.trigger_typing()
         picture = None
-        await ctx.send("{}, starting blurple image analysis.".format(ctx.message.author.mention))
         link = ctx.message.attachments
         if user is None and not link:
-            picture = ctx.author.avatar.url
+            picture = ctx.author.avatar_url
             role_check = True
         elif not user:
             if len(link) != 0:
@@ -117,19 +122,23 @@ class Blurplefy(commands.Cog):
                     picture = image.url
                     role_check = False
         else:
-            picture = user.avatar.url
+            picture = user.avatar_url
             role_check = False
 
         try:
-            async with self.session.request("GET", str(picture)) as r:
+            async with self.session.get(str(picture)) as r:
                 response = await r.read()
         except ValueError:
-            await ctx.send("{}, please link a valid image URL.".format(ctx.author.display_name))
+            await ctx.send(f"{ctx.author.display_name}, please link a valid image URL.")
             return
         try:
             im = Image.open(BytesIO(response))
-        except Exception:
+        except UnidentifiedImageError:
-            await ctx.send("{}, please link a valid image URL.".format(ctx.author.display_name))
+            await ctx.send(f"{ctx.author.display_name}, this doesn't look like an image.")
+            return
+        except Exception as exc:
+            log.exception("Blurplefy encountered an error:\n ", exc_info=exc)
+            await ctx.send(f"{ctx.author.display_name}, please link a valid image URL.")
             return
 
         im = im.convert("RGBA")
@@ -143,32 +152,30 @@ class Blurplefy(commands.Cog):
             im = resizeimage.resize_width(im, (imsize[0] * downsizefraction))
             imsize = list(im.size)
             impixels = imsize[0] * imsize[1]
-            await ctx.send("{}, image resized smaller for easier processing.".format(ctx.message.author.display_name))
 
-        image = self.blurple_imager(im, imsize)
+            msg = f"{ctx.author.display_name}, image resized smaller for easier processing."
-        image = discord.File(fp=image, filename="image.png")
+            await ctx.send(msg)
 
-        blurplenesspercentage = round(((nooftotalpixels / noofpixels) * 100), 2)
+        image_object = await self.blurple_imager(im, imsize)
-        percentblurple = round(((noofblurplepixels / noofpixels) * 100), 2)
+        image = discord.File(fp=image_object.file, filename=f"{random.randint(1,10000)}_image.png")
-        percentdblurple = round(((noofdarkblurplepixels / noofpixels) * 100), 2)
+
-        percentwhite = round(((noofwhitepixels / noofpixels) * 100), 2)
+        blurpleness_percentage = round(((image_object.nooftotalpixels / image_object.noofpixels) * 100), 2)
+        percent_blurple = round(((image_object.noofblurplepixels / image_object.noofpixels) * 100), 2)
+        percent_dblurple = round(((image_object.noofdarkblurplepixels / image_object.noofpixels) * 100), 2)
+        percent_white = round(((image_object.noofwhitepixels / image_object.noofpixels) * 100), 2)
 
         embed = discord.Embed(title="", colour=0x7289DA)
-        embed.add_field(name="Total amount of Blurple", value="{}%".format(blurplenesspercentage), inline=False)
+        embed.add_field(name=f"Total amount of Blurple", value=f"{blurpleness_percentage}%", inline=False)
-        embed.add_field(name="Blurple (rgb(114, 137, 218))", value="{}%".format(percentblurple), inline=True)
+        embed.add_field(name=f"Blurple (rgb(88, 101, 242))", value=f"{percent_blurple}%", inline=True)
-        embed.add_field(name="White (rgb(255, 255, 255))", value="{}\\%".format(percentwhite), inline=True)
+        embed.add_field(name=f"White (rgb(255, 255, 255))", value=f"{percent_white}%", inline=True)
-        embed.add_field(
+        embed.add_field(name=f"Dark Blurple (rgb(69, 79, 191))", value=f"{percent_dblurple}%", inline=True)
-            name="Dark Blurple (rgb(78, 93, 148))", value="{}\\%".format(percentdblurple), inline=True,
-        )
         embed.add_field(
             name="Guide",
             value="Blurple, White, Dark Blurple =  \nBlurple, White, and Dark Blurple (respectively) \nBlack = Not Blurple, White, or Dark Blurple",
             inline=False,
         )
         embed.set_footer(
-            text="Please note: Discord slightly reduces quality of the images, therefore the percentages may be slightly inaccurate. | Content requested by {}".format(
+            text=f"Please note: Discord slightly reduces quality of the images, therefore the percentages may be slightly inaccurate.\nContent requested by {str(ctx.author)}"
-                ctx.author
-            )
         )
         embed.set_image(url="attachment://image.png")
         embed.set_thumbnail(url=picture)
@@ -178,52 +185,58 @@ class Blurplefy(commands.Cog):
         if role_check and blurple_role_enabled:
             blurple_role_id = await self.config.guild(ctx.guild).blurple_role()
             blurple_role_obj = discord.utils.get(ctx.guild.roles, id=blurple_role_id)
+            if not blurple_role_obj:
+                msg = "The role that is set for the blurple role doesn't exist, so I can't award the role to any qualifying users."
+                return await ctx.send(msg)
+            if not ctx.channel.permissions_for(ctx.me).manage_roles:
+                msg = "I need the Manage Roles permission here to be able to add the set blurple role to users that have a qualifying profile picture set."
+                return await ctx.send(msg)
             if (
-                blurplenesspercentage > 75
+                blurpleness_percentage > 75
-                and picture == ctx.author.avatar.url
+                and picture == ctx.author.avatar_url
                 and blurple_role_obj not in ctx.author.roles
-                and percentblurple > 5
+                and percent_blurple > 5
             ):
-                await ctx.send(
+                msg = f"{ctx.author.display_name}, as your profile pic has enough blurple (over 75% in total and over 5% blurple), "
-                    "{}, as your profile pic has enough blurple (over 75% in total and over 5% blurple), you have recieved the role **{}**!".format(
+                msg += f"you have recieved the role **{blurple_role_obj.name}**!"
-                        ctx.message.author.display_name, blurple_role_obj.name
+                await ctx.send(msg)
-                    )
-                )
                 await ctx.author.add_roles(blurple_role_obj)
-            elif picture == ctx.author.avatar.url and blurple_role_obj not in ctx.author.roles:
+            elif picture == ctx.author.avatar_url and blurple_role_obj not in ctx.author.roles:
-                await ctx.send(
+                msg = f"{ctx.author.display_name}, your profile pic does not have enough blurple (over 75% in total and over 5% blurple), "
-                    "{}, your profile pic does not have enough blurple (over 75% in total and over 5% blurple), therefore you are not eligible for the role {}.".format(
+                msg += f"therefore you are not eligible for the role {blurple_role_obj.name}."
-                        ctx.message.author.display_name, blurple_role_obj.name
+                await ctx.send(msg)
-                    )
-                )
 
     @commands.guild_only()
     @commands.command()
     @commands.cooldown(rate=1, per=30, type=commands.BucketType.user)
     async def blurplefy(self, ctx, user: discord.Member = None):
-        """Blurplefy a user or uploaded image."""
+        """Blurplefy a user or an uploaded image attached to the command."""
+        await ctx.trigger_typing()
         picture = None
-        await ctx.send("{}, starting blurple image analysis.".format(ctx.message.author.mention))
         link = ctx.message.attachments
         if user is None and not link:
-            picture = ctx.author.avatar.url
+            picture = ctx.author.avatar_url
         else:
             if not user:
                 if len(link) != 0:
                     for image in link:
                         picture = image.url
             else:
-                picture = user.avatar.url
+                picture = user.avatar_url
         try:
-            async with self.session.request("GET", str(picture)) as r:
+            async with self.session.get(str(picture)) as r:
                 response = await r.read()
         except ValueError:
-            await ctx.send("{}, please link a valid image URL.".format(ctx.author.display_name))
+            await ctx.send(f"{ctx.author.display_name}, please link a valid image URL.")
             return
         try:
             im = Image.open(BytesIO(response))
-        except Exception:
+        except UnidentifiedImageError:
-            await ctx.send("{}, please link a valid image URL.".format(ctx.author.display_name))
+            await ctx.send(f"{ctx.author.display_name}, this doesn't look like an image.")
+            return
+        except Exception as exc:
+            log.exception("Blurplefy encountered an error:\n ", exc_info=exc)
+            await ctx.send(f"{ctx.author.display_name}, please link a valid image URL.")
             return
 
         imsize = list(im.size)
@@ -235,67 +248,58 @@ class Blurplefy(commands.Cog):
             i = im.info["version"]
             isgif = True
             gifloop = int(im.info["loop"])
-        except Exception:
+        except KeyError:
+            # no version key
             isgif = False
-
+        except Exception as exc:
-        await ctx.send("{}, image fetched, analyzing image...".format(ctx.message.author.display_name))
+            log.exception("Blurplefy encountered an error:\n ", exc_info=exc)
 
         if impixels > maxpixelcount:
             downsizefraction = math.sqrt(maxpixelcount / impixels)
             im = resizeimage.resize_width(im, (imsize[0] * downsizefraction))
             imsize = list(im.size)
             impixels = imsize[0] * imsize[1]
-            await ctx.send("{}, image resized smaller for easier processing".format(ctx.message.author.display_name))
+            await ctx.send(f"{ctx.author.display_name}, image resized smaller for easier processing.")
 
         if isgif is False:
-            image = self.imager(im, imsize)
+            image = await self.imager(im, imsize)
         else:
-            image = self.gifimager(im, gifloop, imsize)
+            image = await self.gifimager(im, gifloop, imsize)
-        await ctx.send("{}, image data extracted.".format(ctx.author.display_name))
+
+        max_size = 8 * 1024 * 1024
+        size = sys.getsizeof(image)
+        if size > max_size:
+            await ctx.send(
+                f"{ctx.author.display_name}, whoops! It looks like this image is too big to upload. Try a smaller image (less than 8mb)."
+            )
+            return
+
         if isgif is False:
             image = discord.File(fp=image, filename="image.png")
         else:
             image = discord.File(fp=image, filename="image.gif")
 
-        try:
+        embed = discord.Embed(title="", colour=0x7289DA)
-            embed = discord.Embed(title="", colour=0x7289DA)
+        embed.set_author(name="Blurplefier - makes your image blurple!")
-            embed.set_author(name="Blurplefier - makes your image blurple!")
+        if isgif is False:
-            if isgif is False:
+            embed.set_image(url="attachment://image.png")
-                embed.set_image(url="attachment://image.png")
+        else:
-            else:
+            embed.set_image(url="attachment://image.gif")
-                embed.set_image(url="attachment://image.gif")
+        embed.set_footer(
-            embed.set_footer(
+            text=f"Please note - This blurplefier is automated and therefore may not always give you the best result.\nContent requested by {str(ctx.author)}"
-                text="Please note - This blurplefier is automated and therefore may not always give you the best result. | Content requested by {}".format(
+        )
-                    ctx.author
+        embed.set_thumbnail(url=picture)
-                )
+        await ctx.send(embed=embed, file=image)
-            )
-            embed.set_thumbnail(url=picture)
-            await ctx.send(embed=embed, file=image)
-        except Exception:
-            await ctx.send(
-                "{}, whoops! It looks like this gif is too big to upload. Try a smaller image (less than 8mb).".format(
-                    ctx.author.name
-                )
-            )
 
     @staticmethod
-    def blurple_imager(im, imsize):
+    async def blurple_imager(im, imsize):
         colourbuffer = 20
-        global noofblurplepixels
         noofblurplepixels = 0
-        global noofwhitepixels
         noofwhitepixels = 0
-        global noofdarkblurplepixels
         noofdarkblurplepixels = 0
-        global nooftotalpixels
         nooftotalpixels = 0
-        global noofpixels
         noofpixels = 0
 
-        blurple = (114, 137, 218)
-        darkblurple = (78, 93, 148)
-        white = (255, 255, 255)
-
         img = im.load()
         for x in range(imsize[0]):
             i = 1
@@ -306,11 +310,11 @@ class Blurplefy(commands.Cog):
                 checkwhite = 1
                 checkdarkblurple = 1
                 for i in range(3):
-                    if not (blurple[i] + colourbuffer > pixel[i] > blurple[i] - colourbuffer):
+                    if not (BLURPLE[i] + colourbuffer > pixel[i] > BLURPLE[i] - colourbuffer):
                         checkblurple = 0
-                    if not (darkblurple[i] + colourbuffer > pixel[i] > darkblurple[i] - colourbuffer):
+                    if not (DARK_BLURPLE[i] + colourbuffer > pixel[i] > DARK_BLURPLE[i] - colourbuffer):
                         checkdarkblurple = 0
-                    if not (white[i] + colourbuffer > pixel[i] > white[i] - colourbuffer):
+                    if not (WHITE[i] + colourbuffer > pixel[i] > WHITE[i] - colourbuffer):
                         checkwhite = 0
                     if checkblurple == 0 and checkdarkblurple == 0 and checkwhite == 0:
                         check = 0
@@ -326,13 +330,20 @@ class Blurplefy(commands.Cog):
                     noofwhitepixels += 1
                 noofpixels += 1
 
-        image_file_object = io.BytesIO()
+        image_file_object = BytesIO()
         im.save(image_file_object, format="png")
         image_file_object.seek(0)
-        return image_file_object
+        return SimpleNamespace(
+            file=image_file_object,
+            noofblurplepixels=noofblurplepixels,
+            noofwhitepixels=noofwhitepixels,
+            noofdarkblurplepixels=noofdarkblurplepixels,
+            nooftotalpixels=nooftotalpixels,
+            noofpixels=noofpixels,
+        )
 
     @staticmethod
-    def imager(im, imsize):
+    async def imager(im, imsize):
         im = im.convert(mode="L")
         im = ImageEnhance.Contrast(im).enhance(1000)
         im = im.convert(mode="RGB")
@@ -345,15 +356,15 @@ class Blurplefy(commands.Cog):
                 pixel = img[x, y]
 
                 if pixel != (255, 255, 255):
-                    img[x, y] = (114, 137, 218)
+                    img[x, y] = BLURPLE
 
-        image_file_object = io.BytesIO()
+        image_file_object = BytesIO()
         im.save(image_file_object, format="png")
         image_file_object.seek(0)
         return image_file_object
 
     @staticmethod
-    def gifimager(im, gifloop, imsize):
+    async def gifimager(im, gifloop, imsize):
         frames = [frame.copy() for frame in ImageSequence.Iterator(im)]
         newgif = []
 
@@ -368,10 +379,10 @@ class Blurplefy(commands.Cog):
                 for y in range(imsize[1]):
                     pixel = img[x, y]
                     if pixel != (255, 255, 255):
-                        img[x, y] = (114, 137, 218)
+                        img[x, y] = BLURPLE
             newgif.append(frame)
 
-        image_file_object = io.BytesIO()
+        image_file_object = BytesIO()
         gif = newgif[0]
         gif.save(image_file_object, format="gif", save_all=True, append_images=newgif[1:], loop=0)
         image_file_object.seek(0)
@@ -379,19 +390,22 @@ class Blurplefy(commands.Cog):
 
     @commands.command()
     async def countdown(self, ctx):
-        """Countdown to Discord's 7th Anniversary."""
+        """Countdown to Discord's next anniversary."""
-        embed = discord.Embed()
+        embed = discord.Embed(name="\N{ZERO WIDTH SPACE}", colour=0x7289DA)
-        embed.description="\N{ZERO WIDTH SPACE}"
+        now = datetime.datetime.utcnow()
-        embed.colour=0x7289DA
+
-        timeleft = datetime.datetime(2021, 5, 13, tzinfo=datetime.timezone.utc) + datetime.timedelta(hours=7) - discord.utils.utcnow()
+        timeleft = datetime.datetime(now.year, 5, 13) + datetime.timedelta(hours=7) - datetime.datetime.utcnow()
-        embed.set_author(name="Time left until Discord's 7th Anniversary")
+        discord_years = now.year - 2015
-        if int(timeleft.total_seconds()) < 0:
+        if timeleft.total_seconds() < 0:
-            timeleft = datetime.datetime(2022, 5, 13, tzinfo=datetime.timezone.utc) + datetime.timedelta(hours=7) - discord.utils.utcnow()
+            timeleft = (
-            embed.set_author(name="Time left until Discord's 7th Anniversary")
+                datetime.datetime((now.year + 1), 5, 13) + datetime.timedelta(hours=7) - datetime.datetime.utcnow()
-        embed.add_field(
+            )
-            name="Countdown to midnight, May 13, California time (UTC-7):",
+            discord_years = (now.year + 1) - 2015
-            value=("{}".format(self._dynamic_time(int(timeleft.total_seconds())))),
+
-        )
+        discord_years_suffix = self._get_suffix(discord_years)
+        embed.set_author(name=f"Time left until Discord's {discord_years}{discord_years_suffix} Anniversary")
+        time = self._dynamic_time(int(timeleft.total_seconds()))
+        embed.add_field(name="Countdown to midnight, May 13, California time (UTC-7):", value=f"{time}")
         await ctx.send(embed=embed)
 
     @staticmethod
@@ -412,5 +426,14 @@ class Blurplefy(commands.Cog):
             msg = ""
         return msg.format(d, h, m, s)
 
+    @staticmethod
+    def _get_suffix(num):
+        suffixes = {1: "st", 2: "nd", 3: "rd"}
+        if 10 <= num % 100 <= 20:
+            suffix = "th"
+        else:
+            suffix = suffixes.get(num % 10, "th")
+        return suffix
+
     def cog_unload(self):
         self.bot.loop.create_task(self.session.close())

cah/__init__.py

@@ -3,5 +3,5 @@ from .cah import CardsAgainstHumanity
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(CardsAgainstHumanity(bot))
+    bot.add_cog(CardsAgainstHumanity(bot))

cah/cah.py

@@ -374,11 +374,7 @@ class CardsAgainstHumanity(commands.Cog):
                     member["Task"] = None
         # Set running to false
         game["Running"] = False
-        try:
+        self.games.remove(game)
-            self.games.remove(game)
-        except ValueError:
-            # game was in progress but players left, leaving the open game with less than 3 people
-            pass
         return False
 
     async def typing(self, game, typeTime=5):
@@ -706,7 +702,7 @@ class CardsAgainstHumanity(commands.Cog):
         await self.sendToUser(user, msg)
 
     async def drawCard(self, game):
-        with open(str(bundled_data_path(self)) + "/deck.json", "r", encoding='utf-8') as deck_file:
+        with open(str(bundled_data_path(self)) + "/deck.json", "r") as deck_file:
             deck = json.load(deck_file)
         # Draws a random unused card and shuffles the deck if needed
         totalDiscard = len(game["Discard"])
@@ -756,7 +752,7 @@ class CardsAgainstHumanity(commands.Cog):
                     i += 1
 
     async def drawBCard(self, game):
-        with open(str(bundled_data_path(self)) + "/deck.json", "r", encoding='utf-8') as deck_file:
+        with open(str(bundled_data_path(self)) + "/deck.json", "r") as deck_file:
             deck = json.load(deck_file)
         # Draws a random black card
         totalDiscard = len(game["BDiscard"])
@@ -894,11 +890,7 @@ class CardsAgainstHumanity(commands.Cog):
         if message == None:
             msg = "Ooookay, you say *nothing...*"
             return await self.sendToUser(ctx.author, msg)
-        long_message = False
         msg = f"*{ctx.author.name}* says: {message}"
-        if len(msg) > 1999:
-            msg = msg[:1990] + " [...]"
-            long_message = True
         for member in userGame["Members"]:
             if member["IsBot"]:
                 continue
@@ -909,10 +901,7 @@ class CardsAgainstHumanity(commands.Cog):
             else:
                 # Update member's time
                 member["Time"] = int(time.time())
-        msg = "Message sent!"
+        await self.sendToUser(ctx.author, "Message sent!")
-        if long_message:
-            msg += " Your message was cut short to keep it under the 2000 character limit."
-        await self.sendToUser(ctx.author, msg)
 
     @commands.command()
     async def lay(self, ctx, *, card=None):
@@ -1080,7 +1069,7 @@ class CardsAgainstHumanity(commands.Cog):
         """Starts a new Cards Against Humanity game."""
         try:
             embed = discord.Embed(color=discord.Color.green())
-            embed.set_author(name="Setting up the game...")
+            embed.set_author(name="**Setting up the game...**")
             await ctx.author.send(embed=embed)
         except discord.errors.Forbidden:
             return await ctx.send("You must allow Direct Messages from the bot for this game to work.")

chatchart/__init__.py

@@ -3,5 +3,5 @@ from .chatchart import Chatchart
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(Chatchart(bot))
+    bot.add_cog(Chatchart(bot))

dadjokes/__init__.py

@@ -3,5 +3,5 @@ from .dadjokes import DadJokes
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(DadJokes(bot))
+    bot.add_cog(DadJokes(bot))

dictionary/__init__.py

@@ -3,5 +3,5 @@ from .dictionary import Dictionary
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(Dictionary(bot))
+    bot.add_cog(Dictionary(bot))

discordexperiments/__init__.py

@@ -3,5 +3,5 @@ from .discordexperiments import DiscordExperiments
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(DiscordExperiments(bot))
+    bot.add_cog(DiscordExperiments(bot))

discordexperiments/discordexperiments.py

@@ -24,7 +24,10 @@ class DiscordExperiments(commands.Cog):
 
         r = Route("POST", "/channels/{channel_id}/invites", channel_id=voice.channel.id)
         payload = {"max_age": max_age, "target_type": 2, "target_application_id": app_id}
-        code = (await self.bot.http.request(r, json=payload))["code"]
+        reason = (
+            f"DiscordExperiments: {ctx.author} ({ctx.author.id}) created an invite for {app_name}."
+        )
+        code = (await self.bot.http.request(r, json=payload, reason=reason))["code"]
 
         await ctx.send(
             embed=discord.Embed(
@@ -45,7 +48,7 @@ class DiscordExperiments(commands.Cog):
         await self._create_invite(ctx, 880218394199220334, invite_max_age_in_seconds, app_name)
 
     @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
-    @commands.command()
+    @commands.command(hidden=True)
     async def betrayal(self, ctx, invite_max_age_in_seconds=86400):
         """
         Create a Betrayal.io voice channel invite.
@@ -56,7 +59,7 @@ class DiscordExperiments(commands.Cog):
         await self._create_invite(ctx, 773336526917861400, invite_max_age_in_seconds, app_name)
 
     @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
-    @commands.command()
+    @commands.command(hidden=True)
     async def fishington(self, ctx, invite_max_age_in_seconds=86400):
         """
         Create a Fishington.io voice channel invite.
@@ -150,7 +153,7 @@ class DiscordExperiments(commands.Cog):
         Create a Blazing 8s voice channel invite.
         Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
         """
-        app_name = "Blazing 8s"
+        app_name = "the Blazing 8s game"
         await self._create_invite(ctx, 832025144389533716, invite_max_age_in_seconds, app_name)
 
     @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
@@ -160,7 +163,7 @@ class DiscordExperiments(commands.Cog):
         Create a Putt Party voice channel invite.
         Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
         """
-        app_name = "Putt Party"
+        app_name = "the Putt Party game"
         await self._create_invite(ctx, 945737671223947305, invite_max_age_in_seconds, app_name)
 
     @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
@@ -170,5 +173,45 @@ class DiscordExperiments(commands.Cog):
         Create a Land-io voice channel invite.
         Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
         """
-        app_name = "Land-io"
+        app_name = "the Land-io game"
         await self._create_invite(ctx, 903769130790969345, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def bobbleleague(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Bobble League voice channel invite.
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Bobble League game"
+        await self._create_invite(ctx, 947957217959759964, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def askaway(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create an Ask Away voice channel invite.
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Ask Away game"
+        await self._create_invite(ctx, 976052223358406656, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def knowwhatimeme(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Know What I Meme voice channel invite.
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Know What I Meme game"
+        await self._create_invite(ctx, 950505761862189096, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def bashout(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Bash Out voice channel invite.
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Bash Out game"
+        await self._create_invite(ctx, 1006584476094177371, invite_max_age_in_seconds, app_name)

embedpeek/__init__.py

@@ -3,5 +3,5 @@ from .embedpeek import EmbedPeek
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(EmbedPeek(bot))
+    bot.add_cog(EmbedPeek(bot))

hunting/__init__.py

@@ -11,4 +11,4 @@ __red_end_user_data_statement__ = (
 
 
 async def setup(bot):
-    await bot.add_cog(Hunting(bot))
+    bot.add_cog(Hunting(bot))

hunting/hunting.py

@@ -14,7 +14,7 @@ from redbot.core.utils.chat_formatting import (bold, box, humanize_list,
 from redbot.core.utils.menus import DEFAULT_CONTROLS, menu
 from redbot.core.utils.predicates import MessagePredicate
 
-__version__ = "3.1.7"
+__version__ = "3.1.9"
 
 
 class Hunting(commands.Cog):
@@ -55,7 +55,7 @@ class Hunting(commands.Cog):
         default_user = {"score": {}, "total": 0}
         self.config.register_user(**default_user)
         self.config.register_guild(**default_guild)
-        self.config.register_guild(**default_global)
+        self.config.register_global(**default_global)
 
     @commands.guild_only()
     @commands.group()
@@ -208,8 +208,8 @@ class Hunting(commands.Cog):
     async def next(self, ctx):
         """When will the next occurrence happen?"""
         try:
-            self.next_bang[ctx.guild.id]
+            hunt = self.next_bang[ctx.guild.id]
-            time = abs(datetime.datetime.utcnow() - self.next_bang[ctx.guild.id])
+            time = abs(datetime.datetime.utcnow() - hunt)
             total_seconds = int(time.total_seconds())
             hours, remainder = divmod(total_seconds, 60 * 60)
             minutes, seconds = divmod(remainder, 60)
@@ -480,7 +480,7 @@ class Hunting(commands.Cog):
         self.game_tasks.append(task)
         try:
             del self.next_bang[message.guild.id]
-        except KeyError:
+        except (KeyError, AttributeError):
             pass
 
     def cog_unload(self):

icyparser/__init__.py

@@ -3,5 +3,5 @@ from .icyparser import IcyParser
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(IcyParser(bot))
+    bot.add_cog(IcyParser(bot))

icyparser/icyparser.py

@@ -1,53 +1,95 @@
 import aiohttp
+from aiohttp.client_proto import ResponseHandler
+from aiohttp.http_parser import HttpResponseParserPy
 import discord
+import functools
+import io
 import lavalink
+import logging
+from pkg_resources import parse_version
 import struct
 import re
+from types import SimpleNamespace
+from typing import List, Pattern, Optional
+
 from redbot.core import commands
+from redbot.core.utils.chat_formatting import pagify
+from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
+
+
+log = logging.getLogger("red.aikaterna.icyparser")
+
+
+HTML_CLEANUP: Pattern = re.compile("<.*?>|&([a-z0-9]+|#[0-9]{1,6}|#x[0-9a-f]{1,6});")
+
+
+# Now utilizing Jack1142's answer for ICY 200 OK -> 200 OK at
+# https://stackoverflow.com/questions/4247248/record-streaming-and-saving-internet-radio-in-python/71890980
+
+
+class ICYHttpResponseParser(HttpResponseParserPy):
+    def parse_message(self, lines):
+        if lines[0].startswith(b"ICY "):
+            lines[0] = b"HTTP/1.0 " + lines[0][4:]
+        return super().parse_message(lines)
+
+
+class ICYResponseHandler(ResponseHandler):
+    def set_response_params(
+        self,
+        *,
+        timer=None,
+        skip_payload=False,
+        read_until_eof=False,
+        auto_decompress=True,
+        read_timeout=None,
+        read_bufsize=2 ** 16,
+        timeout_ceil_threshold=5,
+    ) -> None:
+        # this is a copy of the implementation from here:
+        # https://github.com/aio-libs/aiohttp/blob/v3.8.1/aiohttp/client_proto.py#L137-L165
+        self._skip_payload = skip_payload
+
+        self._read_timeout = read_timeout
+        self._reschedule_timeout()
+
+        self._timeout_ceil_threshold = timeout_ceil_threshold
+
+        self._parser = ICYHttpResponseParser(
+            self,
+            self._loop,
+            read_bufsize,
+            timer=timer,
+            payload_exception=aiohttp.ClientPayloadError,
+            response_with_body=not skip_payload,
+            read_until_eof=read_until_eof,
+            auto_decompress=auto_decompress,
+        )
+
+        if self._tail:
+            data, self._tail = self._tail, b""
+            self.data_received(data)
+
+
+class ICYConnector(aiohttp.TCPConnector):
+    def __init__(self, *args, **kwargs):
+        super().__init__(*args, **kwargs)
+        self._factory = functools.partial(ICYResponseHandler, loop=self._loop)
 
 
 class IcyParser(commands.Cog):
     """Icyparser/Shoutcast stream reader."""
 
     async def red_delete_data_for_user(self, **kwargs):
-        """ Nothing to delete """
+        """Nothing to delete."""
         return
 
     def __init__(self, bot):
         self.bot = bot
-        self.session = aiohttp.ClientSession()
+        self.timeout = aiohttp.ClientTimeout(total=20)
-
+        self.session = session = aiohttp.ClientSession(
-    async def _icyparser(self, url: str):
+            connector=ICYConnector(), headers={"Icy-MetaData": "1"}, timeout=self.timeout
-        try:
+        )
-            async with self.session.get(url, headers={"Icy-MetaData": "1"}) as resp:
-                metaint = int(resp.headers["icy-metaint"])
-                for _ in range(5):
-                    await resp.content.readexactly(metaint)
-                    metadata_length = struct.unpack("B", await resp.content.readexactly(1))[0] * 16
-                    metadata = await resp.content.readexactly(metadata_length)
-                    m = re.search(br"StreamTitle='([^']*)';", metadata.rstrip(b"\0"))
-                    if m:
-                        title = m.group(1)
-                        if title:
-                            title = title.decode("utf-8", errors="replace")
-                    else:
-                        title = None
-                    image = False
-                    t = re.search(br"StreamUrl='([^']*)';", metadata.rstrip(b"\0"))
-                    if t:
-                        streamurl = t.group(1)
-                        if streamurl:
-                            streamurl = streamurl.decode("utf-8", errors="replace")
-                            image_ext = ["webp", "png", "jpg", "gif"]
-                            if streamurl.split(".")[-1] in image_ext:
-                                image = True
-                    else:
-                        streamurl = None
-
-                    return title, streamurl, image
-
-        except (KeyError, aiohttp.client_exceptions.ClientConnectionError):
-            return None, None, None
 
     def cog_unload(self):
         self.bot.loop.create_task(self.session.close())
@@ -55,28 +97,234 @@ class IcyParser(commands.Cog):
     @commands.guild_only()
     @commands.command(aliases=["icynp"])
     async def icyparser(self, ctx, url=None):
-        """Show Icecast or Shoutcast stream information, if any."""
+        """Show Icecast or Shoutcast stream information, if any.
+
+        Supported link formats:
+        \tDirect links to MP3, AAC, or OGG/Opus encoded Icecast or Shoutcast streams
+        \tLinks to PLS, M3U, or M3U8 files that contain said stream types
+        """
         if not url:
             audiocog = self.bot.get_cog("Audio")
             if not audiocog:
-                return await ctx.send("Audio is not loaded.")
+                return await ctx.send(
-            try:
+                    "The Audio cog is not loaded. Provide a url with this command instead, to read from an online Icecast or Shoutcast stream."
-                player = lavalink.get_player(ctx.guild.id)
+                )
-            except KeyError:
+
-                return await ctx.send("The bot is not playing any music.")
+            if parse_version(lavalink.__version__) <=  parse_version("0.9.0"):
+                try:
+                    player = lavalink.get_player(ctx.guild.id)
+                except KeyError:
+                    return await ctx.send("The bot is not playing any music.")
+            else:
+                try:
+                    player = lavalink.get_player(ctx.guild.id)
+                except lavalink.PlayerNotFound:
+                    return await ctx.send("The bot is not playing any music.")
             if not player.current:
                 return await ctx.send("The bot is not playing any music.")
             if not player.current.is_stream:
                 return await ctx.send("The bot is not playing a stream.")
-            icy = await self._icyparser(player.current.uri)
+            async with ctx.typing():
+                radio_obj = await self._icyreader(ctx, player.current.uri)
         else:
-            icy = await self._icyparser(url)
+            async with ctx.typing():
-        if not icy[0]:
+                radio_obj = await self._icyreader(ctx, url)
-            return await ctx.send(
+
-                f"Can't read the stream information for <{player.current.uri if not url else url}>, it may not be an Icecast or Shoutcast radio station or there may be no stream information available."
+        if not radio_obj:
-            )
+            return
-        song = f"**[{icy[0]}]({player.current.uri if not url else url})**\n"
+
+        embed_menu_list = []
+
+        # Now Playing embed
+        title = radio_obj.title if radio_obj.title is not None else "No stream title available"
+        song = f"**[{title}]({player.current.uri if not url else url})**\n"
         embed = discord.Embed(colour=await ctx.embed_colour(), title="Now Playing", description=song)
-        if icy[2]:
+
-            embed.set_thumbnail(url=icy[1])
+        # Set radio image if scraped or provided by the Icy headers
-        await ctx.send(embed=embed)
+        if radio_obj.image:
+            embed.set_thumbnail(url=radio_obj.image)
+        else:
+            icylogo = dict(radio_obj.resp_headers).get("icy-logo", None)
+            if icylogo:
+                embed.set_thumbnail(url=icylogo)
+            else:
+                icyfavicon = dict(radio_obj.resp_headers).get("icy-favicon", None)
+                if icyfavicon:
+                    embed.set_thumbnail(url=icyfavicon)
+
+        # Set radio description if present
+        radio_station_description = dict(radio_obj.resp_headers).get("icy-description", None)
+        if radio_station_description == "Unspecified description":
+            radio_station_description = None
+        if radio_station_description:
+            embed.set_footer(text=radio_station_description)
+
+        embed_menu_list.append(embed)
+
+        # Metadata info embed(s)
+        stream_info_text = ""
+        sorted_radio_obj_dict = dict(sorted(radio_obj.resp_headers))
+        for k, v in sorted_radio_obj_dict.items():
+            v = self._clean_html(v)
+            stream_info_text += f"**{k}**: {v}\n"
+
+        if len(stream_info_text) > 1950:
+            for page in pagify(stream_info_text, delims=["\n"], page_length=1950):
+                info_embed = discord.Embed(
+                    colour=await ctx.embed_colour(), title="Radio Station Metadata", description=page
+                )
+                embed_menu_list.append(info_embed)
+        else:
+            info_embed = discord.Embed(
+                colour=await ctx.embed_colour(), title="Radio Station Metadata", description=stream_info_text
+            )
+            embed_menu_list.append(info_embed)
+
+        await menu(ctx, embed_menu_list, DEFAULT_CONTROLS)
+
+    async def _icyreader(self, ctx: commands.Context, url: Optional[str]) -> Optional[SimpleNamespace]:
+        """
+        Icecast/Shoutcast stream reader.
+        """
+        try:
+            extensions = [".pls", ".m3u", ".m3u8"]
+            if any(url.endswith(x) for x in extensions):
+                async with self.session.get(url) as resp:
+                    lines = []
+                    async for line in resp.content:
+                        lines.append(line)
+
+                    if url.endswith(".pls"):
+                        url = await self._pls_reader(lines)
+                    else:
+                        url = await self._m3u_reader(lines)
+
+                    if url:
+                        await self._icyreader(ctx, url)
+                    else:
+                        await ctx.send("That url didn't seem to contain any valid Icecast or Shoutcast links.")
+                        return
+
+            async with self.session.get(url) as resp:
+                metaint = await self._metaint_read(ctx, resp)
+                if metaint:
+                    radio_obj = await self._metadata_read(int(metaint), resp)
+                    return radio_obj
+
+        except aiohttp.client_exceptions.InvalidURL:
+            await ctx.send(f"{url} is not a valid url.")
+            return None
+        except aiohttp.client_exceptions.ClientConnectorError:
+            await ctx.send("The connection failed.")
+            return None
+        except aiohttp.client_exceptions.ClientPayloadError as e:
+            friendly_msg = "The website closed the connection prematurely or the response was malformed.\n"
+            friendly_msg += f"The error returned was: `{str(e)}`\n"
+            await ctx.send(friendly_msg)
+            return None
+        except asyncio.exceptions.TimeoutError:
+            await ctx.send("The bot timed out while trying to access that url.")
+            return None
+        except aiohttp.client_exceptions.ServerDisconnectedError:
+            await ctx.send("The target server disconnected early without a response.")
+            return None
+        except Exception:
+            log.error(
+                f"Icyparser's _icyreader encountered an error while trying to read a stream at {url}", exc_info=True
+            )
+            return None
+
+    @staticmethod
+    async def _metaint_read(ctx: commands.Context, resp: aiohttp.client_reqrep.ClientResponse) -> Optional[int]:
+        """Fetch the metaint value to know how much of the stream header to read, for metadata."""
+        metaint = resp.headers.get("icy-metaint", None)
+        if not metaint:
+            error_msg = (
+                "The url provided doesn't seem like an Icecast or Shoutcast direct stream link, "
+                "or doesn't contain a supported format stream link: couldn't read the metadata length."
+            )
+            await ctx.send(error_msg)
+            return None
+
+        try:
+            metaint = int(metaint)
+            return metaint
+        except ValueError:
+            return None
+
+    @staticmethod
+    async def _metadata_read(metaint: int, resp: aiohttp.client_reqrep.ClientResponse) -> Optional[SimpleNamespace]:
+        """Read the metadata at the beginning of the stream chunk."""
+        try:
+            for _ in range(5):
+                await resp.content.readexactly(metaint)
+                metadata_length = struct.unpack("B", await resp.content.readexactly(1))[0] * 16
+                metadata = await resp.content.readexactly(metadata_length)
+                m = re.search(br"StreamTitle='([^']*)';", metadata.rstrip(b"\0"))
+                if m:
+                    title = m.group(1)
+                    if len(title) > 0:
+                        title = title.decode("utf-8", errors="replace")
+                    else:
+                        title = None
+                else:
+                    title = None
+
+                image = False
+                t = re.search(br"StreamUrl='([^']*)';", metadata.rstrip(b"\0"))
+                if t:
+                    streamurl = t.group(1)
+                    if streamurl:
+                        streamurl = streamurl.decode("utf-8", errors="replace")
+                        image_ext = ["webp", "png", "jpg", "gif"]
+                        if streamurl.split(".")[-1] in image_ext:
+                            image = True
+                else:
+                    streamurl = None
+
+                radio_obj = SimpleNamespace(title=title, image=streamurl, resp_headers=resp.headers.items())
+                return radio_obj
+
+        except Exception:
+            log.error(
+                f"Icyparser's _metadata_read encountered an error while trying to read a stream at {url}", exc_info=True
+            )
+        return None
+
+    @staticmethod
+    def _clean_html(html: str) -> str:
+        """
+        Strip out any html, as subtle as a hammer.
+        """
+        plain_text = re.sub(HTML_CLEANUP, "", html)
+        return plain_text
+
+    @staticmethod
+    async def _m3u_reader(readlines: List[bytes]) -> Optional[str]:
+        """
+        Helper function for a quick and dirty M3U or M3U8 file read.
+        M3U8's will most likely contain .ts files, which are not readable by this cog.
+
+        Some M3Us seem to follow the standard M3U format, some only have a bare url in
+        the file, so let's just return the very first url with an http or https prefix
+        found, if it's formatted like a real url and not a relative url, and is not a .ts chunk.
+        """
+        for text_line in readlines:
+            text_line_str = text_line.decode()
+            if text_line_str.startswith("http"):
+                if not text_line_str.endswith(".ts"):
+                    return text_line_str
+
+        return None
+
+    @staticmethod
+    async def _pls_reader(readlines: List[bytes]) -> Optional[str]:
+        """
+        Helper function for a quick and dirty PLS file read.
+        """
+        for text_line in readlines:
+            text_line_str = text_line.decode()
+            if text_line_str.startswith("File1="):
+                return text_line_str[6:]
+
+        return None

inspirobot/__init__.py

@@ -3,5 +3,5 @@ from .inspirobot import Inspirobot
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(Inspirobot(bot))
+    bot.add_cog(Inspirobot(bot))

invites/__init__.py

@@ -3,5 +3,5 @@ from .invites import Invites
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(Invites(bot))
+    bot.add_cog(Invites(bot))

invites/invites.py

@@ -42,7 +42,7 @@ class Invites(commands.Cog):
     @invites.command()
     async def show(self, ctx: commands.Context, invite_code_or_url: str = None):
         """Show the stats for an invite, or show all invites."""
-        if not ctx.channel.permissions_for(ctx.guild.me).administrator:
+        if not ctx.me.permissions_in(ctx.channel).administrator:
             return await self._send_embed(ctx, PERM_MSG)
 
         if not invite_code_or_url:
@@ -57,7 +57,7 @@ class Invites(commands.Cog):
     @invites.command()
     async def leaderboard(self, ctx: commands.Context, list_all_invites: bool = False):
         """List pinned invites or all invites in a leaderboard style."""
-        if not ctx.channel.permissions_for(ctx.guild.me).administrator:
+        if not ctx.me.permissions_in(ctx.channel).administrator:
             return await self._send_embed(ctx, PERM_MSG)
 
         if not list_all_invites:
@@ -96,7 +96,7 @@ class Invites(commands.Cog):
     @invites.command()
     async def pin(self, ctx: commands.Context, invite_code_or_url: str):
         """Pin an invite to the leaderboard."""
-        if not ctx.channel.permissions_for(ctx.guild.me).administrator:
+        if not ctx.me.permissions_in(ctx.channel).administrator:
             return await self._send_embed(ctx, PERM_MSG)
 
         invite_code = await self._find_invite_code(invite_code_or_url)

latex/__init__.py

@@ -2,6 +2,5 @@ from .latex import Latex
 
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
-
+def setup(bot):
-async def setup(bot):
+  bot.add_cog(Latex(bot))
-    await bot.add_cog(Latex(bot))

luigipoker/__init__.py

@@ -3,5 +3,5 @@ from .luigipoker import LuigiPoker
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(LuigiPoker(bot))
+    bot.add_cog(LuigiPoker(bot))

massunban/__init__.py

@@ -3,5 +3,5 @@ from .massunban import MassUnban
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(MassUnban(bot))
+    bot.add_cog(MassUnban(bot))

noflippedtables/__init__.py

@@ -3,5 +3,5 @@ from .noflippedtables import NoFlippedTables
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(NoFlippedTables(bot))
+    bot.add_cog(NoFlippedTables(bot))

otherbot/__init__.py

@@ -1,11 +1,11 @@
 from .otherbot import Otherbot
 
 __red_end_user_data_statement__ = (
-    "This cog does not persistently store end user data. This cog does store discord IDs as needed for operation."
+    "This cog does not persistently store end user data. " "This cog does store discord IDs as needed for operation. "
 )
 
 
 async def setup(bot):
-    n = Otherbot(bot)
+    cog = Otherbot(bot)
-    await n.generate_cache()
+    await cog.generate_cache()
-    await bot.add_cog(n)
+    bot.add_cog(cog)

otherbot/otherbot.py

@@ -4,6 +4,7 @@ import discord
 from redbot.core.bot import Red
 from redbot.core import commands, checks, Config
 
+from datetime import datetime
 
 DEFAULT_OFFLINE_EMOJI = "\N{LARGE RED CIRCLE}"
 DEFAULT_ONLINE_EMOJI = "\N{WHITE HEAVY CHECK MARK}"
@@ -11,7 +12,7 @@ DEFAULT_ONLINE_EMOJI = "\N{WHITE HEAVY CHECK MARK}"
 
 class Otherbot(commands.Cog):
     __author__ = ["aikaterna", "Predä 。#1001"]
-    __version__ = "0.11"
+    __version__ = "0.10"
 
     async def red_delete_data_for_user(
         self, *, requester: Literal["discord", "owner", "user", "user_strict"], user_id: int,
@@ -125,8 +126,7 @@ class Otherbot(commands.Cog):
                     else:
                         msg += f"**{name}**: {guild_data[attr]}\n"
                 em.description = msg
-                if guild.icon:
+                em.set_thumbnail(url=guild.icon_url)
-                    em.set_thumbnail(url=guild.icon.url)
                 await ctx.send(embed=em)
             else:
                 msg = "```\n"
@@ -346,7 +346,7 @@ class Otherbot(commands.Cog):
         await self.generate_cache()
 
     @commands.Cog.listener()
-    async def on_presence_update(self, before: discord.Member, after: discord.Member):
+    async def on_member_update(self, before: discord.Member, after: discord.Member):
         if after.guild is None or not after.bot:
             return
 
@@ -368,16 +368,19 @@ class Otherbot(commands.Cog):
                     em = discord.Embed(
                         color=0x8B0000,
                         description=f"{after.mention} is offline. {data['offline_emoji']}",
-                        timestamp=discord.utils.utcnow(),
+                        timestamp=datetime.utcnow(),
                     )
                     if not data["ping"]:
                         await channel.send(embed=em)
                     else:
-                        await channel.send(
+                        if discord.version_info.minor < 4:
-                            f"<@&{data['ping']}>",
+                            await channel.send(f"<@&{data['ping']}>", embed=em)
-                            embed=em,
+                        else:
-                            allowed_mentions=discord.AllowedMentions(roles=True),
+                            await channel.send(
-                        )
+                                f"<@&{data['ping']}>",
+                                embed=em,
+                                allowed_mentions=discord.AllowedMentions(roles=True),
+                            )
                 else:
                     if not data["ping"]:
                         await channel.send(f"{after.mention} is offline. {data['offline_emoji']}")
@@ -398,16 +401,19 @@ class Otherbot(commands.Cog):
                     em = discord.Embed(
                         color=0x008800,
                         description=f"{after.mention} is back online. {data['online_emoji']}",
-                        timestamp=discord.utils.utcnow(),
+                        timestamp=datetime.utcnow(),
                     )
                     if not data["ping"]:
                         await channel.send(embed=em)
                     else:
-                        await channel.send(
+                        if discord.version_info.minor < 4:
-                            f"<@&{data['ping']}>",
+                            await channel.send(f"<@&{data['ping']}>", embed=em)
-                            embed=em,
+                        else:
-                            allowed_mentions=discord.AllowedMentions(roles=True),
+                            await channel.send(
-                        )
+                                f"<@&{data['ping']}>",
+                                embed=em,
+                                allowed_mentions=discord.AllowedMentions(roles=True),
+                            )
                 else:
                     if not data["ping"]:
                         await channel.send(

partycrash/__init__.py

@@ -3,5 +3,5 @@ from .partycrash import PartyCrash
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(PartyCrash(bot))
+    bot.add_cog(PartyCrash(bot))

pingtime/__init__.py

@@ -3,5 +3,5 @@ from .pingtime import Pingtime
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(Pingtime(bot))
+    bot.add_cog(Pingtime(bot))

pressf/__init__.py

@@ -3,5 +3,5 @@ from .pressf import PressF
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(PressF(bot))
+    bot.add_cog(PressF(bot))

pupper/__init__.py

@@ -1,7 +0,0 @@
-from .pupper import Pupper
-
-__red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
-
-
-async def setup(bot):
-    await bot.add_cog(Pupper(bot))

pupper/info.json

@@ -1,9 +0,0 @@
-{
-    "author": ["aikaterna"],
-    "description": "Pupper is a configurable pet that can hand out credits.",
-    "install_msg": "This cog and its countdowns are triggered by messages. If your bot doesn't see any messages posted anywhere in any server, the pet will never come around. This pet helps to keep chat active but it needs to be slightly active in the first place. If you see a message asking for pats (or whatever other greeting message you set), the first person to react with a wave emoji will get a random amount of credits. This cog also deletes the messages involved in the game, which can lead to channels showing an unread message when there really isn't anything there any more. Use `[p]help pets` to get started. If this command doesn't work for you, the `pets` command is only usable by people with the bot's Admin or Mod role, or if the user has administrative perms on the Discord server.",
-    "short": "Pet the dog.",
-    "tags": ["pets"],
-    "type": "COG",
-    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}

pupper/pupper.py

@@ -1,285 +0,0 @@
-import asyncio
-import datetime
-import discord
-import logging
-import random
-from redbot.core import commands, checks, Config, bank
-from redbot.core.errors import BalanceTooHigh
-from redbot.core.utils.chat_formatting import box, humanize_list, pagify
-
-
-log = logging.getLogger("red.aikaterna.pupper")
-
-
-class Pupper(commands.Cog):
-    async def red_delete_data_for_user(self, **kwargs):
-        """ Nothing to delete """
-        return
-
-    def __init__(self, bot):
-        self.bot = bot
-        self.config = Config.get_conf(self, 2767241393, force_registration=True)
-        self.pets = {}
-
-        default_guild = {
-            "borf_msg": "borf! (thank for pats h00man, have a doggocoin)",
-            "channel": [],
-            "cooldown": 3600,
-            "credits": [100, 500],
-            "hello_msg": "Hi! Can someone pet me?",
-            "last_pet": "2019-08-01 00:00:00.000001",
-            "toggle": False,
-            "delete_after": 10,
-        }
-
-        self.config.register_guild(**default_guild)
-
-    @commands.guild_only()
-    @checks.mod_or_permissions(administrator=True)
-    @commands.group()
-    async def pets(self, ctx):
-        """Manage your pet."""
-        if ctx.invoked_subcommand is None:
-            guild_data = await self.config.guild(ctx.guild).all()
-            if not guild_data["channel"]:
-                channel_names = ["No channels set."]
-            else:
-                channel_names = []
-                for channel_id in guild_data["channel"]:
-                    channel_obj = self.bot.get_channel(channel_id)
-                    if channel_obj:
-                        channel_names.append(channel_obj.name)
-
-            space = "\N{EN SPACE}"
-            toggle = "Active" if guild_data["toggle"] else "Inactive"
-            delete_after = "No deletion" if not guild_data["delete_after"] else guild_data["delete_after"]
-
-            msg = f"[Channels]:       {humanize_list(channel_names)}\n"
-            msg += f"[Cooldown]:       {guild_data['cooldown']} seconds\n"
-            msg += f"[Credit range]:   {guild_data['credits'][0]} - {guild_data['credits'][1]} credits\n"
-            msg += f"[Delete after]:   {delete_after}\n"
-            msg += f"[Toggle]:         {toggle}\n"
-            msg += f"{space}\n"
-            msg += f"[Hello message]:  {guild_data['hello_msg']}\n"
-            msg += f"[Thanks message]: {guild_data['borf_msg']}\n"
-
-            for page in pagify(msg, delims=["\n"]):
-                await ctx.send(box(page, lang="ini"))
-
-    @pets.command()
-    async def toggle(self, ctx):
-        """Toggle pets on the server."""
-        toggle = await self.config.guild(ctx.guild).toggle()
-        await self.config.guild(ctx.guild).toggle.set(not toggle)
-        await ctx.send(f"The pet is now {'' if not toggle else 'in'}active.")
-
-    @pets.command()
-    async def delete(self, ctx, amount: int = 0):
-        """
-        Set how long to wait before deleting the thanks message.
-        To leave the thanks message with no deletion, use 0 as the amount.
-        10 is the default.
-        Max is 5 minutes (300).
-		"""
-        if amount < 0:
-            return await ctx.send("Use a positive number.")
-        if 1 <= amount <= 5:
-            return await ctx.send("Use a slightly larger number, greater than 5.")
-        if amount > 300:
-            return await ctx.send("Use a smaller number, less than or equal to 300.")
-
-        set_amount = None if amount == 0 else amount
-        await self.config.guild(ctx.guild).delete_after.set(set_amount)
-        msg = f"Timer set to {amount}." if set_amount else "Delete timer has been turned off."
-        await ctx.send(msg)
-
-    @pets.command()
-    async def cooldown(self, ctx, seconds: int = None):
-        """Set the pet appearance cooldown in seconds.
-
-        300s/5 minute minimum. Default is 3600s/1 hour."""
-
-        if not seconds:
-            seconds = 3600
-        if seconds < 300:
-            seconds = 300
-        await self.config.guild(ctx.guild).cooldown.set(seconds)
-        await ctx.send(f"Pet appearance cooldown set to {seconds}.")
-
-    @pets.command()
-    async def credits(self, ctx, min_amt: int, max_amt: int):
-        """Set the pet credits range on successful petting."""
-        if min_amt > max_amt:
-            return await ctx.send("Min must be less than max.")
-        if min_amt < 1 or max_amt < 1:
-            return await ctx.send("Min and max amounts must be greater than 1.")
-        await self.config.guild(ctx.guild).credits.set([min_amt, max_amt])
-        await ctx.send(f"Pet credit range set to {min_amt} - {max_amt}.")
-
-    @pets.command()
-    async def hello(self, ctx, *, message: str = None):
-        """Set the pet greeting message."""
-        if not message:
-            hello = await self.config.guild(ctx.guild).hello_msg()
-            return await ctx.send(
-                f"Current greeting message: `{hello}`\nUse this command with the message you would like to set."
-            )
-        if len(message) > 1000:
-            return await ctx.send("That dog sure likes to talk a lot. Try a shorter message.")
-        await self.config.guild(ctx.guild).hello_msg.set(message)
-        await ctx.send(f"Pet hello message set to: `{message}`.")
-
-    @pets.command()
-    async def thanks(self, ctx, *, message: str = None):
-        """Set the pet thanks message."""
-        if not message:
-            bye = await self.config.guild(ctx.guild).borf_msg()
-            return await ctx.send(
-                f"Current thanks message: `{bye}`\nUse this command with the message you would like to set."
-            )
-        if len(message) > 1000:
-            return await ctx.send("That dog sure likes to talk a lot. Try a shorter message.")
-        await self.config.guild(ctx.guild).borf_msg.set(message)
-        await ctx.send(f"Pet thanks message set to: `{message}`.")
-
-    @commands.guild_only()
-    @checks.mod_or_permissions(administrator=True)
-    @pets.group(invoke_without_command=True)
-    async def channel(self, ctx):
-        """Channel management for pet appearance."""
-        await ctx.send_help()
-        channel_list = await self.config.guild(ctx.guild).channel()
-        channel_msg = "[Petting Channels]:\n"
-        if not channel_list:
-            channel_msg += "None."
-        for chan in channel_list:
-            channel_obj = self.bot.get_channel(chan)
-            channel_msg += f"{channel_obj.name}\n"
-        await ctx.send(box(channel_msg, lang="ini"))
-
-    @channel.command()
-    async def add(self, ctx, channel: discord.TextChannel):
-        """Add a text channel for pets."""
-        channel_list = await self.config.guild(ctx.guild).channel()
-        if channel.id not in channel_list:
-            channel_list.append(channel.id)
-            await self.config.guild(ctx.guild).channel.set(channel_list)
-            await ctx.send(f"{channel.mention} added to the valid petting channels.")
-        else:
-            await ctx.send(f"{channel.mention} is already in the list of petting channels.")
-
-    @channel.command()
-    async def addall(self, ctx):
-        """Add all valid channels for the guild that the bot can speak in."""
-        bot_text_channels = [
-            c for c in ctx.guild.text_channels if c.permissions_for(ctx.guild.me).send_messages is True
-        ]
-        channel_list = await self.config.guild(ctx.guild).channel()
-        channels_appended = []
-        channels_in_list = []
-
-        for text_channel in bot_text_channels:
-            if text_channel.id not in channel_list:
-                channel_list.append(text_channel.id)
-                channels_appended.append(text_channel.mention)
-            else:
-                channels_in_list.append(text_channel.mention)
-                pass
-
-        first_msg = ""
-        second_msg = ""
-        await self.config.guild(ctx.guild).channel.set(channel_list)
-        if len(channels_appended) > 0:
-            first_msg = f"{humanize_list(channels_appended)} added to the valid petting channels.\n"
-        if len(channels_in_list) > 0:
-            second_msg = f"{humanize_list(channels_in_list)}: already in the list of petting channels."
-        await ctx.send(f"{first_msg}{second_msg}")
-
-    @channel.command()
-    async def remove(self, ctx, channel: discord.TextChannel):
-        """Remove a text channel from petting."""
-        channel_list = await self.config.guild(ctx.guild).channel()
-        if channel.id in channel_list:
-            channel_list.remove(channel.id)
-        else:
-            return await ctx.send(f"{channel.mention} not in the active channel list.")
-        await self.config.guild(ctx.guild).channel.set(channel_list)
-        await ctx.send(f"{channel.mention} removed from the list of petting channels.")
-
-    @channel.command()
-    async def removeall(self, ctx):
-        """Remove all petting channels from the list."""
-        await self.config.guild(ctx.guild).channel.set([])
-        await ctx.send("All channels have been removed from the list of petting channels.")
-
-    def _pet_lock(self, guild_id, tf):
-        if tf:
-            self.pets[guild_id] = True
-        else:
-            self.pets[guild_id] = False
-
-    @commands.Cog.listener()
-    async def on_message(self, message):
-        try:
-            if isinstance(message.channel, discord.abc.PrivateChannel):
-                return
-            if message.author.bot:
-                return
-            guild_data = await self.config.guild(message.guild).all()
-            if not guild_data["toggle"]:
-                return
-            if not guild_data["channel"]:
-                return
-            self.pets.setdefault(message.guild.id, False)
-            if self.pets[message.guild.id]:
-                return
-
-            last_time = datetime.datetime.strptime(str(guild_data["last_pet"]), "%Y-%m-%d %H:%M:%S.%f")
-            now = datetime.datetime.now(datetime.timezone.utc)
-            now = now.replace(tzinfo=None)
-            if int((now - last_time).total_seconds()) > await self.config.guild(message.guild).cooldown():
-                self._pet_lock(message.guild.id, True)
-                rando_channel = random.choice(guild_data["channel"])
-                await asyncio.sleep(random.randint(60, 480))
-                rando_channel_obj = self.bot.get_channel(rando_channel)
-                if not rando_channel_obj:
-                    async with self.config.guild(message.guild).all() as data:
-                        data["channel"].remove(rando_channel)
-                        rando_channel = random.choice(data["channel"])
-                        rando_channel_obj = self.bot.get_channel(rando_channel)
-                borf_msg = await rando_channel_obj.send(guild_data["hello_msg"])
-                pets = "👋"
-                pets_action = {"veryfastpats": "👋"}
-
-                def check(r, u):
-                    return r.message.id == borf_msg.id and any(e in str(r.emoji) for e in pets)
-
-                try:
-                    r, u = await self.bot.wait_for("reaction_add", check=check, timeout=300.0)
-                except asyncio.TimeoutError:
-                    return await borf_msg.delete()
-
-                reacts = {v: k for k, v in pets_action.items()}
-                react = reacts[r.emoji]
-                if react == "veryfastpats":
-                    await borf_msg.delete()
-                    deposit = random.randint(guild_data["credits"][0], guild_data["credits"][1])
-                    try:
-                        large_bank = False
-                        await bank.deposit_credits(u, deposit)
-                    except BalanceTooHigh as e:
-                        large_bank = True
-                        await bank.set_balance(u, e.max_balance)
-                    credits_name = await bank.get_currency_name(message.guild)
-                    msg = (
-                        f"{guild_data['borf_msg']} (`+{deposit}` {credits_name})"
-                        if not large_bank
-                        else guild_data["borf_msg"]
-                    )
-                    await rando_channel_obj.send(content=msg, delete_after=guild_data["delete_after"])
-                else:
-                    pass
-                self._pet_lock(message.guild.id, False)
-                await self.config.guild(message.guild).last_pet.set(str(now))
-        except Exception:
-            log.error("Error in pupper loop.", exc_info=True)

quiz/__init__.py

@@ -3,5 +3,5 @@ from .quiz import Quiz
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(Quiz(bot))
+    bot.add_cog(Quiz(bot))

reminder/LICENSE

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU General Public License from time to time.  Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

reminder/__init__.py

@@ -0,0 +1,12 @@
+from .reminder import Reminder
+
+__red_end_user_data_statement__ = (
+    "This cog stores data provided by users for the express purpose of redisplaying. "
+    "It does not store user data which was not provided through a command. "
+    "Users may remove their own content without making a data removal request. "
+    "This cog does not support data requests, but will respect deletion requests."
+)
+
+
+async def setup(bot):
+    bot.add_cog(Reminder(bot))

reminder/info.json

@@ -0,0 +1,10 @@
+{
+    "author" : ["ZeLarpMaster#0818", "aikaterna"],
+    "description" : "Lets users tell the bot to remind them about anything they want. Originally by ZeLarpMaster.",
+    "install_msg" : "Enjoy reminding yourself of whatever you wanna remind yourself of! Use `[p]help Reminder` to get started.\nIf you have had ZeLarpMaster's version of Reminder installed in the past, this version of it uses the same data location for ease of switching to a supported version of the cog, as his repo has been archived.",
+    "short" : "Allows users to remind themselves about anything they want.",
+    "hidden": false,
+    "disabled": false,
+    "permissions" : ["embed_links"],
+    "tags" : ["remind", "reminder", "remindme"]
+}

reminder/reminder.py

@@ -0,0 +1,264 @@
+# Reminder was originally written by ZeLarpMaster#0818
+# https://github.com/ZeLarpMaster/ZeCogsV3/blob/master/reminder/reminder.py
+
+import asyncio
+import collections
+import datetime
+import discord
+import hashlib
+from itertools import islice
+from math import ceil
+import re
+from typing import List, Literal, Optional
+
+from redbot.core import commands, Config
+from redbot.core.bot import Red
+from redbot.core.commands import Context
+from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
+
+
+class Reminder(commands.Cog):
+    """Utilities to remind yourself of whatever you want"""
+
+    __author__ = ["ZeLarpMaster#0818", "aikaterna#1393"]
+
+    TIME_AMNT_REGEX = re.compile("([1-9][0-9]*)([a-z]+)", re.IGNORECASE)
+    TIME_QUANTITIES = collections.OrderedDict(
+        [
+            ("seconds", 1),
+            ("minutes", 60),
+            ("hours", 3600),
+            ("days", 86400),
+            ("weeks", 604800),
+            ("months", 2628000),
+            ("years", 31540000),
+        ]
+    )
+    MAX_SECONDS = TIME_QUANTITIES["years"] * 2
+
+    async def red_delete_data_for_user(
+        self,
+        *,
+        requester: Literal["discord", "owner", "user", "user_strict"],
+        user_id: int,
+    ):
+        await self.config.user_from_id(user_id).clear()
+
+    def __init__(self, bot: Red):
+        super().__init__()
+        self.bot = bot
+        unique_id = int(hashlib.sha512((self.__author__[0] + "@" + self.__class__.__name__).encode()).hexdigest(), 16)
+        self.config = Config.get_conf(self, identifier=unique_id, force_registration=True)
+        self.config.register_user(reminders=[], offset=0)
+        self.futures = {}
+        asyncio.ensure_future(self.start_saved_reminders())
+
+    def cog_unload(self):
+        for user_futures in self.futures.values():
+            for future in user_futures:
+                future.cancel()
+
+    @commands.group(invoke_without_command=True, aliases=["remindme"], name="remind")
+    async def command_remind(self, ctx: Context, time: str, *, reminder_text: str):
+        """
+        Remind yourself of something in a specific amount of time
+
+        Examples for time: `5d`, `10m`, `10m30s`, `1h`, `1y1mo2w5d10h30m15s`
+        Abbreviations: `s` for seconds, `m` for minutes, `h` for hours, `d` for days, `w` for weeks, `mo` for months, `y` for years
+        Any longer abbreviation is accepted. `m` assumes minutes instead of months.
+        One month is counted as exact 365/12 days.
+        Ignores all invalid abbreviations.
+        """
+        seconds = self.get_seconds(time)
+        if seconds is None:
+            response = ":x: Invalid time format."
+        elif seconds >= self.MAX_SECONDS:
+            response = f":x: Too long amount of time. Maximum: 2 years"
+        else:
+            user = ctx.message.author
+            time_now = datetime.datetime.utcnow()
+            days, secs = divmod(seconds, 3600 * 24)
+            end_time = time_now + datetime.timedelta(days=days, seconds=secs)
+            reminder = {"content": reminder_text, "start_time": time_now.timestamp(), "end_time": end_time.timestamp()}
+            async with self.config.user(user).reminders() as user_reminders:
+                user_reminders.append(reminder)
+            self.futures.setdefault(user.id, []).append(
+                asyncio.ensure_future(self.remind_later(user, seconds, reminder_text, reminder))
+            )
+            user_offset = await self.config.user(ctx.author).offset()
+            offset = user_offset * 3600
+            formatted_time = round(end_time.timestamp()) + offset
+            if seconds > 86400:
+                response = f":white_check_mark: I will remind you of that on <t:{int(formatted_time)}:F>."
+            else:
+                response = f":white_check_mark: I will remind you of that in {self.time_from_seconds(seconds)}."
+        await ctx.send(response)
+
+    @command_remind.group(name="forget")
+    async def command_remind_forget(self, ctx: Context):
+        """Forget your reminders"""
+        pass
+
+    @command_remind_forget.command(name="all")
+    async def command_remind_forget_all(self, ctx: Context):
+        """Forget **all** of your reminders"""
+        for future in self.futures.get(ctx.message.author.id, []):
+            future.cancel()
+        async with self.config.user(ctx.message.author).reminders() as user_reminders:
+            user_reminders.clear()
+        await ctx.send(":put_litter_in_its_place: Forgot **all** of your reminders!")
+
+    @command_remind_forget.command(name="one")
+    async def command_remind_forget_one(self, ctx: Context, index_number_of_reminder: int):
+        """
+        Forget one of your reminders
+
+        Use `[p]remind list` to find the index number of the reminder you wish to forget.
+        """
+        async with self.config.user(ctx.message.author).all() as user_data:
+            if not user_data["reminders"]:
+                await ctx.send("You don't have any reminders saved.")
+                return
+            time_sorted_reminders = sorted(user_data["reminders"], key=lambda x: (x["end_time"]))
+            try:
+                removed = time_sorted_reminders.pop(index_number_of_reminder - 1)
+            except IndexError:
+                await ctx.send(f"There is no reminder at index {index_number_of_reminder}.")
+                return
+            user_data["reminders"] = time_sorted_reminders
+            offset = user_data["offset"] * 3600
+            end_time = round((removed["end_time"]) + offset)
+            msg = f":put_litter_in_its_place: Forgot reminder **#{index_number_of_reminder}**\n"
+            msg += f"Date: <t:{end_time}:f>\nContent: `{removed['content']}`"
+            await ctx.send(msg)
+
+    @command_remind.command(name="list")
+    async def command_remind_list(self, ctx: Context):
+        """List your reminders"""
+        user_data = await self.config.user(ctx.message.author).all()
+        if not user_data["reminders"]:
+            await ctx.send("There are no reminders to show.")
+            return
+
+        if not ctx.channel.permissions_for(ctx.me).embed_links:
+            return await ctx.send("I need the `Embed Messages` permission here to be able to display this information.")
+
+        embed_pages = await self.create_remind_list_embeds(ctx, user_data)
+        await ctx.send(embed=embed_pages[0]) if len(embed_pages) == 1 else await menu(
+            ctx, embed_pages, DEFAULT_CONTROLS
+        )
+
+    @command_remind.command(name="offset")
+    async def command_remind_offset(self, ctx: Context, offset_time_in_hours: str):
+        """
+        Set a basic timezone offset
+        from the default of UTC for use in [p]remindme list.
+
+        This command accepts number values from `-23.75` to `+23.75`.
+        You can look up your timezone offset on https://en.wikipedia.org/wiki/List_of_UTC_offsets
+        """
+        offset = self.remind_offset_check(offset_time_in_hours)
+        if offset is not None:
+            await self.config.user(ctx.author).offset.set(offset)
+            await ctx.send(f"Your timezone offset was set to {str(offset).replace('.0', '')} hours from UTC.")
+        else:
+            await ctx.send(f"That doesn't seem like a valid hour offset. Check `{ctx.prefix}help remind offset`.")
+
+    @staticmethod
+    async def chunker(input: List[dict], chunk_size: int) -> List[List[str]]:
+        chunk_list = []
+        iterator = iter(input)
+        while chunk := list(islice(iterator, chunk_size)):
+            chunk_list.append(chunk)
+        return chunk_list
+
+    async def create_remind_list_embeds(self, ctx: Context, user_data: dict) -> List[discord.Embed]:
+        """Embed creator for command_remind_list."""
+        offset = user_data["offset"] * 3600
+        reminder_list = []
+        time_sorted_reminders = sorted(user_data["reminders"], key=lambda x: (x["end_time"]))
+        entry_size = len(str(len(time_sorted_reminders)))
+
+        for i, reminder_dict in enumerate(time_sorted_reminders, 1):
+            entry_number = f"{str(i).zfill(entry_size)}"
+            end_time = round((reminder_dict["end_time"]) + offset)
+            exact_time_timestamp = f"<t:{end_time}:f>"
+            relative_timestamp = f"<t:{end_time}:R>"
+            content = reminder_dict["content"]
+            display_content = content if len(content) < 200 else f"{content[:200]} [...]"
+            reminder = f"`{entry_number}`. {exact_time_timestamp}, {relative_timestamp}:\n{display_content}\n\n"
+            reminder_list.append(reminder)
+
+        reminder_text_chunks = await self.chunker(reminder_list, 7)
+        max_pages = ceil(len(reminder_list) / 7)
+        offset_hours = str(user_data["offset"]).replace(".0", "")
+        offset_text = f" • UTC offset of {offset_hours}h applied" if offset != 0 else ""
+        menu_pages = []
+        for chunk in reminder_text_chunks:
+            embed = discord.Embed(title="", description="".join(chunk))
+            embed.set_author(name=f"Reminders for {ctx.author}", icon_url=ctx.author.avatar_url)
+            embed.set_footer(text=f"Page {len(menu_pages) + 1} of {max_pages}{offset_text}")
+            menu_pages.append(embed)
+        return menu_pages
+
+    def get_seconds(self, time: str):
+        """Returns the amount of converted time or None if invalid"""
+        seconds = 0
+        for time_match in self.TIME_AMNT_REGEX.finditer(time):
+            time_amnt = int(time_match.group(1))
+            time_abbrev = time_match.group(2)
+            time_quantity = discord.utils.find(lambda t: t[0].startswith(time_abbrev), self.TIME_QUANTITIES.items())
+            if time_quantity is not None:
+                seconds += time_amnt * time_quantity[1]
+        return None if seconds == 0 else seconds
+
+    async def remind_later(self, user: discord.User, time: float, content: str, reminder):
+        """Reminds the `user` in `time` seconds with a message containing `content`"""
+        await asyncio.sleep(time)
+        embed = discord.Embed(title="Reminder", description=content, color=discord.Colour.blue())
+        await user.send(embed=embed)
+        async with self.config.user(user).reminders() as user_reminders:
+            user_reminders.remove(reminder)
+
+    @staticmethod
+    def remind_offset_check(offset: str) -> Optional[float]:
+        """Float validator for command_remind_offset."""
+        try:
+            offset = float(offset.replace("+", ""))
+        except ValueError:
+            return None
+        offset = round(offset * 4) / 4.0
+        if not -23.75 < offset < 23.75 or 23.75 < offset < -23.75:
+            return None
+        return offset
+
+    async def start_saved_reminders(self):
+        await self.bot.wait_until_red_ready()
+        user_configs = await self.config.all_users()
+        for user_id, user_config in list(user_configs.items()):  # Making a copy
+            for reminder in user_config["reminders"]:
+                user = self.bot.get_user(user_id)
+                if user is None:
+                    # Delete the reminder if the user doesn't have a mutual server anymore
+                    await self.config.user_from_id(user_id).clear()
+                else:
+                    time_diff = datetime.datetime.fromtimestamp(reminder["end_time"]) - datetime.datetime.utcnow()
+                    time = max(0.0, time_diff.total_seconds())
+                    fut = asyncio.ensure_future(self.remind_later(user, time, reminder["content"], reminder))
+                    self.futures.setdefault(user.id, []).append(fut)
+
+    @staticmethod
+    def time_from_seconds(seconds: int) -> str:
+        hours, remainder = divmod(seconds, 3600)
+        minutes, seconds = divmod(remainder, 60)
+        if hours:
+            msg = f"{hours} hour" if hours == 1 else f"{hours} hours"
+            if minutes != 0:
+                msg += f" and {minutes} minute" if minutes == 1 else f" and {minutes} minutes"
+        elif minutes:
+            msg = f"{minutes} minute" if minutes == 1 else f"{minutes} minutes"
+            if seconds != 0:
+                msg += f" and {seconds} second" if seconds == 1 else f" and {seconds} seconds"
+        else:
+            msg = f"{seconds} seconds" if seconds == 1 else f"and {seconds} seconds"
+        return msg

rndstatus/__init__.py

@@ -3,5 +3,5 @@ from .rndstatus import RndStatus
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(RndStatus(bot))
+    bot.add_cog(RndStatus(bot))

rss/__init__.py

@@ -7,5 +7,5 @@ __red_end_user_data_statement__ = "This cog does not persistently store data or
 
 async def setup(bot: commands.Bot):
     n = RSS(bot)
-    await bot.add_cog(n)
+    bot.add_cog(n)
     n.initialize()

rss/rss.py

@@ -1,6 +1,6 @@
 import asyncio
 import aiohttp
-from bs4 import BeautifulSoup
+from bs4 import BeautifulSoup, MarkupResemblesLocatorWarning
 import copy
 import datetime
 import discord
@@ -10,6 +10,7 @@ import io
 import logging
 import re
 import time
+import warnings
 from typing import Optional
 from types import MappingProxyType, SimpleNamespace
 from urllib.parse import urlparse
@@ -29,7 +30,20 @@ IPV4_RE = re.compile("\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}\\.\\d{1,3}")
 IPV6_RE = re.compile("([a-f0-9:]+:+)+[a-f0-9]+")
 
 
-__version__ = "1.8.1"
+__version__ = "1.8.3"
+
+warnings.filterwarnings(
+    "ignore",
+    category=DeprecationWarning,
+    # Ignore the warning in feedparser module *and* our module to account for the unreleased fix of this warning:
+    # https://github.com/kurtmckee/feedparser/pull/278
+    module=r"^(feedparser|rss)(\..+)?$",
+    message=(
+        "To avoid breaking existing software while fixing issue 310, a temporary mapping has been created from"
+        " `updated_parsed` to `published_parsed` if `updated_parsed` doesn't exist"
+    )
+)
+warnings.filterwarnings("ignore", category=MarkupResemblesLocatorWarning)
 
 
 class RSS(commands.Cog):
@@ -1391,10 +1405,6 @@ class RSS(commands.Cog):
                     log.debug(f"New entry found via time and link validation for feed {name} on cid {channel.id}")
                     feedparser_plus_obj = await self._add_to_feedparser_object(entry, url)
                     feedparser_plus_objects.append(feedparser_plus_obj)
-                if (last_title == "" and entry_title == "") and (last_link != entry_link) and (last_time < entry_time):
-                    log.debug(f"New entry found via time validation for feed {name} on cid {channel.id} - no title")
-                    feedparser_plus_obj = await self._add_to_feedparser_object(entry, url)
-                    feedparser_plus_objects.append(feedparser_plus_obj)
 
             # this is a post that has no time information attached to it and we can only
             # verify that the title and link did not match the previously posted entry
@@ -1463,7 +1473,7 @@ class RSS(commands.Cog):
                 return
 
             embed_toggle = rss_feed["embed"]
-            red_embed_settings = await self.bot.embed_requested(channel)
+            red_embed_settings = await self.bot.embed_requested(channel, None)
             embed_permissions = channel.permissions_for(channel.guild.me).embed_links
 
             rss_limit = rss_feed.get("limit", 0)

seen/__init__.py

@@ -9,4 +9,4 @@ __red_end_user_data_statement__ = (
 async def setup(bot):
     cog = Seen(bot)
     await cog.initialize()
-    await bot.add_cog(cog)
+    bot.add_cog(cog)

seen/seen.py

@@ -76,7 +76,7 @@ class Seen(commands.Cog):
     @commands.guild_only()
     @commands.command(name="seen")
     @commands.bot_has_permissions(embed_links=True)
-    async def _seen(self, ctx, author: discord.Member):
+    async def _seen(self, ctx, *, author: discord.Member):
         """Shows last time a user was seen in chat."""
         member_seen_config = await self.config.member(author).seen()
         member_seen_cache = self._cache.get(author.guild.id, {}).get(author.id, None)
@@ -117,7 +117,7 @@ class Seen(commands.Cog):
             elif output[2] > 1:
                 ts += "{} minutes ago".format(output[2])
         em = discord.Embed(colour=discord.Color.green())
-        avatar = author.display_avatar
+        avatar = author.avatar_url or author.default_avatar_url
         em.set_author(name="{} was seen {}".format(author.display_name, ts), icon_url=avatar)
         await ctx.send(embed=em)
 

snacktime/__init__.py

@@ -4,4 +4,4 @@ __red_end_user_data_statement__ = "This cog does not persistently store data or
 
 
 async def setup(bot):
-    await bot.add_cog(Snacktime(bot))
+    bot.add_cog(Snacktime(bot))

timezone/__init__.py

@@ -12,5 +12,5 @@ __red_end_user_data_statement__ = (
 )
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(Timezone(bot))
+    bot.add_cog(Timezone(bot))

tools/__init__.py

@@ -3,5 +3,5 @@ from .tools import Tools
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(Tools(bot))
+    bot.add_cog(Tools(bot))

tools/tools.py

@@ -24,7 +24,7 @@ class Tools(commands.Cog):
     """Mod and Admin tools."""
 
     async def red_delete_data_for_user(self, **kwargs):
-        """Nothing to delete"""
+        """ Nothing to delete """
         return
 
     def __init__(self, bot):
@@ -47,7 +47,9 @@ class Tools(commands.Cog):
 
     @access.command()
     async def compare(self, ctx, user: discord.Member, guild: int = None):
-        """Compare channel access with another user."""
+        """Compare channel access with [user]."""
+        if user is None:
+            return
         if guild is None:
             guild = ctx.guild
         else:
@@ -65,35 +67,42 @@ class Tools(commands.Cog):
         user_text_channels = [c for c in tcs if c.permissions_for(user).read_messages is True]
         user_voice_channels = [c for c in vcs if c.permissions_for(user).connect is True]
 
-        # text channels only the author has access to
+        author_only_t = set(author_text_channels) - set(
-        author_only_t = set(author_text_channels) - set(user_text_channels)
+            user_text_channels
-        # voice channels only the author has access to
+        )  # text channels only the author has access to
-        author_only_v = set(author_voice_channels) - set(user_voice_channels)
+        author_only_v = set(author_voice_channels) - set(
+            user_voice_channels
+        )  # voice channels only the author has access to
 
-        # text channels only the user has access to
+        user_only_t = set(user_text_channels) - set(author_text_channels)  # text channels only the user has access to
-        user_only_t = set(user_text_channels) - set(author_text_channels)
+        user_only_v = set(user_voice_channels) - set(
-        # voice channels only the user has access to
+            author_voice_channels
-        user_only_v = set(user_voice_channels) - set(author_voice_channels)
+        )  # voice channels only the user has access to
 
-        # text channels that author and user have in common
+        common_t = list(
-        common_t = list(set([c for c in tcs]) - author_only_t - user_only_t)
+            set([c for c in tcs]) - author_only_t - user_only_t
-        # voice channels that author and user have in common
+        )  # text channels that author and user have in common
-        common_v = list(set([c for c in vcs]) - author_only_v - user_only_v)
+        common_v = list(
+            set([c for c in vcs]) - author_only_v - user_only_v
+        )  # voice channels that author and user have in common
 
-        text_common_access = ", ".join([c.name for c in common_t])
+        msg = "```ini\n"
-        text_user_exclusive_access = ", ".join([c.name for c in user_only_t])
+        msg += "{} [TEXT CHANNELS IN COMMON]:\n\n{}\n\n".format(len(common_t), ", ".join([c.name for c in common_t]))
-        text_author_exclusive_access = ", ".join([c.name for c in author_only_t])
+        msg += "{} [TEXT CHANNELS {} HAS EXCLUSIVE ACCESS TO]:\n\n{}\n\n".format(
-        voice_common_access = ", ".join([c.name for c in common_v])
+            len(user_only_t), user.name.upper(), ", ".join([c.name for c in user_only_t])
-        voice_user_exclusive_access = ", ".join([c.name for c in user_only_v])
+        )
-        voice_author_exclusive_access = ", ".join([c.name for c in author_only_v])
+        msg += "{} [TEXT CHANNELS YOU HAVE EXCLUSIVE ACCESS TO]:\n\n{}\n\n\n".format(
-
+            len(author_only_t), ", ".join([c.name for c in author_only_t])
-        msg = f"{len(common_t)} [TEXT CHANNELS IN COMMON]:\n\n{text_common_access}\n\n"
+        )
-        msg += f"{len(user_only_t)} [TEXT CHANNELS {user.name.upper()} HAS EXCLUSIVE ACCESS TO]:\n\n{text_user_exclusive_access}\n\n"
+        msg += "{} [VOICE CHANNELS IN COMMON]:\n\n{}\n\n".format(len(common_v), ", ".join([c.name for c in common_v]))
-        msg += f"{len(author_only_t)} [TEXT CHANNELS YOU HAVE EXCLUSIVE ACCESS TO]:\n\n{text_author_exclusive_access}\n\n\n"
+        msg += "{} [VOICE CHANNELS {} HAS EXCLUSIVE ACCESS TO]:\n\n{}\n\n".format(
-        msg += f"{len(common_v)} [VOICE CHANNELS IN COMMON]:\n\n{voice_common_access}\n\n"
+            len(user_only_v), user.name.upper(), ", ".join([c.name for c in user_only_v])
-        msg += f"{len(user_only_v)} [VOICE CHANNELS {user.name.upper()} HAS EXCLUSIVE ACCESS TO]:\n\n{voice_user_exclusive_access}\n\n"
+        )
-        msg += f"{len(author_only_v)} [VOICE CHANNELS YOU HAVE EXCLUSIVE ACCESS TO]:\n\n{voice_author_exclusive_access}\n\n"
+        msg += "{} [VOICE CHANNELS YOU HAVE EXCLUSIVE ACCESS TO]:\n\n{}\n\n".format(
-        for page in cf.pagify(cf.box(msg, lang="ini"), delims=["\n"], shorten_by=16):
+            len(author_only_v), ", ".join([c.name for c in author_only_v])
+        )
+        msg += "```"
+        for page in cf.pagify(msg, delims=["\n"], shorten_by=16):
             await ctx.send(page)
 
     @access.command()
@@ -113,11 +122,13 @@ class Tools(commands.Cog):
             return await ctx.send("User is not in that guild or I do not have access to that guild.")
 
         prefix = "You have" if user.id == ctx.author.id else user.name + " has"
-        no_access = ", ".join(list(set(text_channels) - set(can_access)))
+        msg = "```ini\n[{} access to {} out of {} text channels]\n\n".format(
-        msg = f"\n[{prefix} access to {len(can_access)} out of {len(text_channels)} text channels]\n\n"
+            prefix, len(can_access), len(text_channels)
-        msg += f"[ACCESS]:\n{', '.join(can_access)}\n\n"
+        )
-        msg += f"[NO ACCESS]:\n{no_access}"
+
-        for page in cf.pagify(cf.box(msg, lang="ini"), delims=["\n"], shorten_by=16):
+        msg += "[ACCESS]:\n{}\n\n".format(", ".join(can_access))
+        msg += "[NO ACCESS]:\n{}\n```".format(", ".join(list(set(text_channels) - set(can_access))))
+        for page in cf.pagify(msg, delims=["\n"], shorten_by=16):
             await ctx.send(page)
 
     @access.command()
@@ -137,11 +148,13 @@ class Tools(commands.Cog):
             return await ctx.send("User is not in that guild or I do not have access to that guild.")
 
         prefix = "You have" if user.id == ctx.author.id else user.name + " has"
-        no_access = ", ".join(list(set(voice_channels) - set(can_access)))
+        msg = "```ini\n[{} access to {} out of {} voice channels]\n\n".format(
-        msg = f"\n[{prefix} access to {len(can_access)} out of {len(voice_channels)} voice channels]\n\n"
+            prefix, len(can_access), len(voice_channels)
-        msg += f"[ACCESS]:\n{', '.join(can_access)}\n\n"
+        )
-        msg += f"[NO ACCESS]:\n{no_access}"
+
-        for page in cf.pagify(cf.box(msg, lang="ini"), delims=["\n"], shorten_by=16):
+        msg += "[ACCESS]:\n{}\n\n".format(", ".join(can_access))
+        msg += "[NO ACCESS]:\n{}\n```".format(", ".join(list(set(voice_channels) - set(can_access))))
+        for page in cf.pagify(msg, delims=["\n"], shorten_by=16):
             await ctx.send(page)
 
     @commands.guild_only()
@@ -165,27 +178,20 @@ class Tools(commands.Cog):
                 msg += f"`{user_obj.user.id} - {user_name}`\n"
 
         banlist = sorted(msg)
-        if ctx.channel.permissions_for(ctx.guild.me).embed_links:
+        embed_list = []
-            embed_list = []
+        for page in cf.pagify(msg, shorten_by=1400):
-            for page in cf.pagify(msg, shorten_by=1400):
+            embed = discord.Embed(
-                embed = discord.Embed(
+                description="**Total bans:** {}\n\n{}".format(bancount, page),
-                    description=f"**Total bans:** {bancount}\n\n{page}",
+                colour=await ctx.embed_colour(),
-                    colour=await ctx.embed_colour(),
+            )
-                )
+            embed_list.append(embed)
-                embed_list.append(embed)
+        await menu(ctx, embed_list, DEFAULT_CONTROLS)
-            await menu(ctx, embed_list, DEFAULT_CONTROLS)
-        else:
-            text_list = []
-            for page in cf.pagify(msg, shorten_by=1400):
-                text = f"**Total bans:** {bancount}\n{page}"
-                text_list.append(text)
-            await menu(ctx, text_list, DEFAULT_CONTROLS)
 
     @commands.guild_only()
     @commands.command()
     async def cid(self, ctx):
-        """Shows the channel id for the current channel."""
+        """Shows the channel ID."""
-        await ctx.send(f"**#{ctx.channel.name} ID:** {ctx.channel.id}")
+        await ctx.send("**#{0.name} ID:** {0.id}".format(ctx.channel))
 
     @commands.guild_only()
     @commands.command()
@@ -207,41 +213,32 @@ class Tools(commands.Cog):
             discord.TextChannel: "Text Channel",
             discord.VoiceChannel: "Voice Channel",
             discord.CategoryChannel: "Category",
-            discord.StageChannel: "Stage Channel",
-            discord.Thread: "Thread",
         }
 
+        load = "```\nLoading channel info...```"
+        waiting = await ctx.send(load)
+
         with sps(Exception):
             caller = inspect.currentframe().f_back.f_code.co_name.strip()
 
-        data = ""
+        data = "```ini\n"
         if caller == "invoke" or channel.guild != ctx.guild:
-            data += f"[Server]:          {channel.guild.name}\n"
+            data += "[Server]:     {}\n".format(channel.guild.name)
-        data += f"[Name]:            {cf.escape(str(channel))}\n"
+        data += "[Name]:       {}\n".format(cf.escape(str(channel)))
-        data += f"[ID]:              {channel.id}\n"
+        data += "[ID]:         {}\n".format(channel.id)
-        data += f"[Private]:         {yesno[isinstance(channel, discord.abc.PrivateChannel)]}\n"
+        data += "[Private]:    {}\n".format(yesno[isinstance(channel, discord.abc.PrivateChannel)])
-        if isinstance(channel, discord.TextChannel) and channel.topic != None:
+        if isinstance(channel, discord.TextChannel) and channel.topic != "":
-            data += f"[Topic]:           {channel.topic}\n"
+            data += "[Topic]:      {}\n".format(channel.topic)
-        try:
+        data += "[Position]:   {}\n".format(channel.position)
-            data += f"[Position]:        {channel.position}\n"
+        data += "[Created]:    {}\n".format(self._dynamic_time(channel.created_at))
-        except AttributeError:
+        data += "[Type]:       {}\n".format(typemap[type(channel)])
-            # this is a thread
-            data += f"[Parent Channel]:  {channel.parent.name} ({channel.parent.id})\n"
-            data += f"[Parent Position]: {channel.parent.position}\n"
-        try:
-            data += f"[Created]:         {self._dynamic_time(channel.created_at)}\n"
-        except AttributeError:
-            # this is a thread
-            data += f"[Updated]:         {self._dynamic_time(channel.archive_timestamp)}\n"
-        data += f"[Type]:            {typemap[type(channel)]}\n"
-        if isinstance(channel, discord.TextChannel) and channel.is_news():
-            data += f"[News Channel]:    {yesno[channel.is_news()]}\n"
         if isinstance(channel, discord.VoiceChannel):
-            data += f"[Users]:           {len(channel.members)}\n"
+            data += "[Users]:      {}\n".format(len(channel.members))
-            data += f"[User limit]:      {channel.user_limit}\n"
+            data += "[User limit]: {}\n".format(channel.user_limit)
-            data += f"[Bitrate]:         {int(channel.bitrate / 1000)}kbps\n"
+            data += "[Bitrate]:    {}kbps\n".format(int(channel.bitrate / 1000))
-
+        data += "```"
-        await ctx.send(cf.box(data, lang="ini"))
+        await asyncio.sleep(1)
+        await waiting.edit(content=data)
 
     @commands.guild_only()
     @commands.command()
@@ -253,20 +250,22 @@ class Tools(commands.Cog):
     @commands.command()
     async def einfo(self, ctx, emoji: discord.Emoji):
         """Emoji information."""
-        yesno = {True: "Yes", False: "No"}
+        e = emoji
-        header = f"{str(emoji)}\n"
         m = (
-            f"[Name]:       {emoji.name}\n"
+            f"{str(e)}\n"
-            f"[Guild]:      {emoji.guild}\n"
+            f"```ini\n"
-            f"[URL]:        {emoji.url}\n"
+            f"[NAME]:       {e.name}\n"
-            f"[Animated]:   {yesno[emoji.animated]}"
+            f"[GUILD]:      {e.guild}\n"
+            f"[URL]:        {e.url}\n"
+            f"[ANIMATED]:   {e.animated}"
+            "```"
         )
-        await ctx.send(header + cf.box(m, lang="ini"))
+        await ctx.send(m)
 
     @commands.guild_only()
     @commands.command()
     @checks.mod_or_permissions(manage_guild=True)
-    async def inrole(self, ctx, *, rolename: str):
+    async def inrole(self, ctx, *, rolename):
         """Check members in the role specified."""
         guild = ctx.guild
         await ctx.trigger_typing()
@@ -287,7 +286,7 @@ class Tools(commands.Cog):
             if len(roles) == 1:
                 role = roles[0]
             elif len(roles) < 1:
-                await ctx.send(f"No roles containing `{rolename}` were found.")
+                await ctx.send("No roles were found.")
                 return
             else:
                 msg = (
@@ -321,46 +320,41 @@ class Tools(commands.Cog):
                 else:
                     role = roles[response - 1]
 
+        awaiter = await ctx.send(
+            embed=discord.Embed(description="Getting member names...", colour=await ctx.embed_colour())
+        )
+        await asyncio.sleep(1.5)  # taking time to retrieve the names
         users_in_role = "\n".join(sorted(m.display_name for m in guild.members if role in m.roles))
         if len(users_in_role) == 0:
-            if ctx.channel.permissions_for(ctx.guild.me).embed_links:
+            embed = discord.Embed(
-                embed = discord.Embed(
+                description=cf.bold(f"0 users found in the {role.name} role."),
-                    description=cf.bold(f"0 users found in the {role.name} role."),
+                colour=await ctx.embed_colour(),
-                    colour=await ctx.embed_colour(),
+            )
-                )
+            await awaiter.edit(embed=embed)
-                return await ctx.send(embed=embed)
+            return
-            else:
+        try:
-                return await ctx.send(cf.bold(f"0 users found in the {role.name} role."))
+            await awaiter.delete()
-
+        except discord.NotFound:
+            pass
         embed_list = []
-        role_len = len([m for m in guild.members if role in m.roles])
+        for page in cf.pagify(users_in_role, delims=["\n"], page_length=200):
-        if ctx.channel.permissions_for(ctx.guild.me).embed_links:
+            embed = discord.Embed(
-            for page in cf.pagify(users_in_role, delims=["\n"], page_length=200):
+                description=cf.bold("{1} users found in the {0} role.\n").format(
-                embed = discord.Embed(
+                    role.name, len([m for m in guild.members if role in m.roles])
-                    description=cf.bold(f"{role_len} users found in the {role.name} role.\n"),
+                ),
-                    colour=await ctx.embed_colour(),
+                colour=await ctx.embed_colour(),
-                )
+            )
-                embed.add_field(name="Users", value=page)
+            embed.add_field(name="Users", value=page)
-                embed_list.append(embed)
+            embed_list.append(embed)
-            final_embed_list = []
+        final_embed_list = []
-            for i, embed in enumerate(embed_list):
+        for i, embed in enumerate(embed_list):
-                embed.set_footer(text=f"Page {i + 1}/{len(embed_list)}")
+            embed.set_footer(text=f"Page {i + 1}/{len(embed_list)}")
-                final_embed_list.append(embed)
+            final_embed_list.append(embed)
-            if len(embed_list) == 1:
+        if len(embed_list) == 1:
-                close_control = {"\N{CROSS MARK}": close_menu}
+            close_control = {"\N{CROSS MARK}": close_menu}
-                await menu(ctx, final_embed_list, close_control)
+            await menu(ctx, final_embed_list, close_control)
-            else:
-                await menu(ctx, final_embed_list, DEFAULT_CONTROLS)
         else:
-            for page in cf.pagify(users_in_role, delims=["\n"], page_length=200):
+            await menu(ctx, final_embed_list, DEFAULT_CONTROLS)
-                msg = f"**{role_len} users found in the {role.name} role.**\n"
-                msg += page
-                embed_list.append(msg)
-            if len(embed_list) == 1:
-                close_control = {"\N{CROSS MARK}": close_menu}
-                await menu(ctx, embed_list, close_control)
-            else:
-                await menu(ctx, embed_list, DEFAULT_CONTROLS)
 
     @commands.guild_only()
     @commands.command()
@@ -382,15 +376,18 @@ class Tools(commands.Cog):
             )
             await ctx.send(embed=embed)
         else:
-            await ctx.send(f"**{user.display_name}** joined this guild on **{joined_on}**.")
+            await ctx.send(f"{user.display_name} joined this guild on {joined_on}.")
 
     @commands.command(name="listguilds", aliases=["listservers", "guildlist", "serverlist"])
     @checks.mod_or_permissions()
     async def listguilds(self, ctx):
         """List the guilds|servers the bot is in."""
+        asciidoc = lambda m: "```asciidoc\n{}\n```".format(m)
         guilds = sorted(self.bot.guilds, key=lambda g: -g.member_count)
-        plural = "s" if len(guilds) > 1 else ""
+        header = ("```\n" "The bot is in the following {} server{}:\n" "```").format(
-        header = f"The bot is in the following {len(guilds)} server{plural}:\n"
+            len(guilds), "s" if len(guilds) > 1 else ""
+        )
+
         max_zpadding = max([len(str(g.member_count)) for g in guilds])
         form = "{gid} :: {mems:0{zpadding}} :: {name}"
         all_forms = [
@@ -399,13 +396,13 @@ class Tools(commands.Cog):
         ]
         final = "\n".join(all_forms)
 
-        await ctx.send(cf.box(header))
+        await ctx.send(header)
         page_list = []
         for page in cf.pagify(final, delims=["\n"], page_length=1000):
-            page_list.append(cf.box(page, lang="asciidoc"))
+            page_list.append(asciidoc(page))
 
         if len(page_list) == 1:
-            return await ctx.send(cf.box(page, lang="asciidoc"))
+            return await ctx.send(asciidoc(page))
         await menu(ctx, page_list, DEFAULT_CONTROLS)
 
     @commands.guild_only()
@@ -415,40 +412,38 @@ class Tools(commands.Cog):
         """
         List the channels of the current server
         """
+        asciidoc = lambda m: "```asciidoc\n{}\n```".format(m)
+        channels = ctx.guild.channels
         top_channels, category_channels = self.sort_channels(ctx.guild.channels)
 
-        top_channels_formed = "\n".join(self.channels_format(top_channels))
+        topChannels_formed = "\n".join(self.channels_format(top_channels))
         categories_formed = "\n\n".join([self.category_format(tup) for tup in category_channels])
 
-        await ctx.send(
+        await ctx.send(f"{ctx.guild.name} has {len(channels)} channel{'s' if len(channels) > 1 else ''}.")
-            f"{ctx.guild.name} has {len(ctx.guild.channels)} channel{'s' if len(ctx.guild.channels) > 1 else ''}."
-        )
 
-        for page in cf.pagify(top_channels_formed, delims=["\n"], shorten_by=16):
+        for page in cf.pagify(topChannels_formed, delims=["\n"], shorten_by=16):
-            await ctx.send(cf.box(page, lang="asciidoc"))
+            await ctx.send(asciidoc(page))
 
         for page in cf.pagify(categories_formed, delims=["\n\n"], shorten_by=16):
-            await ctx.send(cf.box(page, lang="asciidoc"))
+            await ctx.send(asciidoc(page))
 
     @commands.guild_only()
     @commands.command()
     @checks.mod_or_permissions(manage_guild=True)
-    async def newusers(self, ctx, count: int = 5, text_format: str = "py"):
+    async def newusers(self, ctx, count: int = 5, fm: str = "py"):
-        """
+        """Lists the newest 5 members."""
-        Lists the newest 5 members.
+        guild = ctx.guild
-
-        `text_format` is the markdown language to use. Defaults to `py`.
-        """
         count = max(min(count, 25), 5)
-        members = sorted(ctx.guild.members, key=lambda m: m.joined_at, reverse=True)[:count]
+        members = sorted(guild.members, key=lambda m: m.joined_at, reverse=True)[:count]
 
-        header = f"{count} newest members"
+        head1 = "{} newest members".format(count)
-        disp = "{:>33}\n{}\n\n".format(header, "-" * 57)
+        header = "{:>33}\n{}\n\n".format(head1, "-" * 57)
 
-        user_body = " {mem} ({memid})\n"
+        user_body = (
-        user_body += " {spcs}Joined Guild:    {sp1}{join}\n"
+            " {mem} ({memid})\n" " {spcs}Joined Guild:    {sp1}{join}\n" " {spcs}Account Created: {sp2}{created}\n\n"
-        user_body += " {spcs}Account Created: {sp2}{created}\n\n"
+        )
 
+        disp = header
         spcs = [" " * (len(m.name) // 2) for m in members]
         smspc = min(spcs, key=lambda it: len(it))
 
@@ -478,7 +473,7 @@ class Tools(commands.Cog):
             )
 
         for page in cf.pagify(disp, delims=["\n\n"]):
-            await ctx.send(cf.box(page, lang=text_format))
+            await ctx.send(cf.box(page, lang=fm))
 
     @commands.guild_only()
     @commands.command()
@@ -493,10 +488,10 @@ class Tools(commands.Cog):
         perms_we_dont = ""
         for x in sorted(perms):
             if "True" in str(x):
-                perms_we_have += "+ {0}\n".format(str(x).split("'")[1])
+                perms_we_have += "+\t{0}\n".format(str(x).split("'")[1])
             else:
-                perms_we_dont += "- {0}\n".format(str(x).split("'")[1])
+                perms_we_dont += "-\t{0}\n".format(str(x).split("'")[1])
-        await ctx.send(cf.box(f"{perms_we_have}{perms_we_dont}", lang="diff"))
+        await ctx.send(cf.box("{0}{1}".format(perms_we_have, perms_we_dont), lang="diff"))
 
     @commands.guild_only()
     @commands.command()
@@ -506,9 +501,9 @@ class Tools(commands.Cog):
         if rolename is discord.Role:
             role = rolename
         else:
-            role = self.role_from_string(ctx.guild, rolename)
+            role = self._role_from_string(ctx.guild, rolename)
         if role is None:
-            await ctx.send(f"Cannot find role: `{rolename}`")
+            await ctx.send(embed=discord.Embed(description="Cannot find role.", colour=await ctx.embed_colour()))
             return
         await ctx.send(f"**{rolename} ID:** {role.id}")
 
@@ -516,6 +511,8 @@ class Tools(commands.Cog):
     @commands.command()
     async def rinfo(self, ctx, *, rolename: discord.Role):
         """Shows role info."""
+        channel = ctx.channel
+        guild = ctx.guild
         await ctx.trigger_typing()
 
         try:
@@ -524,18 +521,16 @@ class Tools(commands.Cog):
             pass
 
         if not isinstance(rolename, discord.Role):
-            role = self.role_from_string(ctx.guild, rolename, ctx.guild.roles)
+            role = self._role_from_string(guild, rolename, guild.roles)
         else:
             role = rolename
         if role is None:
             await ctx.send("That role cannot be found.")
             return
-
+        if role is not None:
-        perms = iter(role.permissions)
+            perms = iter(role.permissions)
-        perms_we_have = ""
+            perms_we_have = ""
-        perms_we_dont = ""
+            perms_we_dont = ""
-
-        if ctx.channel.permissions_for(ctx.guild.me).embed_links:
             for x in sorted(perms):
                 if "True" in str(x):
                     perms_we_have += "{0}\n".format(str(x).split("'")[1])
@@ -545,42 +540,52 @@ class Tools(commands.Cog):
                 perms_we_have = "None"
             if perms_we_dont == "":
                 perms_we_dont = "None"
-            role_color = role.color if role.color else discord.Colour(value=0x000000)
+            msg = discord.Embed(description="Gathering role stats...", colour=role.color)
-            em = discord.Embed(colour=role_color)
+            if role.color is None:
+                role.color = discord.Colour(value=0x000000)
+            loadingmsg = await ctx.send(embed=msg)
+            em = discord.Embed(colour=role.colour)
             if caller == "invoke":
                 em.add_field(name="Server", value=role.guild.name)
             em.add_field(name="Role Name", value=role.name)
             em.add_field(name="Created", value=self._dynamic_time(role.created_at))
-            em.add_field(name="Users in Role", value=len([m for m in ctx.guild.members if role in m.roles]))
+            em.add_field(name="Users in Role", value=len([m for m in guild.members if role in m.roles]))
             em.add_field(name="ID", value=role.id)
             em.add_field(name="Color", value=role.color)
             em.add_field(name="Position", value=role.position)
-            em.add_field(name="Valid Permissions", value=perms_we_have)
+            em.add_field(name="Valid Permissions", value="{}".format(perms_we_have))
-            em.add_field(name="Invalid Permissions", value=perms_we_dont)
+            em.add_field(name="Invalid Permissions", value="{}".format(perms_we_dont))
-            if role.guild.icon:
+            em.set_thumbnail(url=role.guild.icon_url)
-                em.set_thumbnail(url=role.guild.icon.url)
+        try:
-            await ctx.send(embed=em)
+            await loadingmsg.edit(embed=em)
-        else:
+        except discord.HTTPException:
-            role = self.role_from_string(ctx.guild, rolename, ctx.guild.roles)
+            permss = "```diff\n"
+            role = self._role_from_string(guild, rolename, guild.roles)
             if role is None:
                 await ctx.send("That role cannot be found.")
                 return
-
+            if role is not None:
-            for x in sorted(perms):
+                perms = iter(role.permissions)
-                if "True" in str(x):
+                perms_we_have2 = ""
-                    perms_we_have += "+ {0}\n".format(str(x).split("'")[1])
+                perms_we_dont2 = ""
-                else:
+                for x in sorted(perms):
-                    perms_we_dont += "- {0}\n".format(str(x).split("'")[1])
+                    if "True" in str(x):
-            msg = ""
+                        perms_we_have2 += "+{0}\n".format(str(x).split("'")[1])
-            msg += f"Name: {role.name}\n"
+                    else:
-            msg += f"Created: {self._dynamic_time(role.created_at)}\n"
+                        perms_we_dont2 += "-{0}\n".format(str(x).split("'")[1])
-            msg += f"Users in Role : {len([m for m in role.guild.members if role in m.roles])}\n"
+            await ctx.send(
-            msg += f"ID: {role.id}\n"
+                "{}Name: {}\nCreated: {}\nUsers in Role : {}\nId : {}\nColor : {}\nPosition : {}\nValid Perms : \n{}\nInvalid Perms : \n{}```".format(
-            msg += f"Color: {role.color}\n"
+                    permss,
-            msg += f"Position: {role.position}\n"
+                    role.name,
-            msg += f"Valid Perms: \n{perms_we_have}\n"
+                    self._dynamic_time(role.created_at),
-            msg += f"Invalid Perms: \n{perms_we_dont}"
+                    len([m for m in guild.members if role in m.roles]),
-            await ctx.send(cf.box(msg, lang="diff"))
+                    role.id,
+                    role.color,
+                    role.position,
+                    perms_we_have2,
+                    perms_we_dont2,
+                )
+            )
 
     @commands.guild_only()
     @commands.command(aliases=["listroles"])
@@ -593,28 +598,25 @@ class Tools(commands.Cog):
             form.format(rpos=r.position, zpadding=max_zpadding, rid=r.id, rment=r.mention, rcolor=r.color)
             for r in ctx.guild.roles
         ]
+
         rolelist = sorted(rolelist, reverse=True)
         rolelist = "\n".join(rolelist)
         embed_list = []
-        if ctx.channel.permissions_for(ctx.guild.me).embed_links:
+        for page in cf.pagify(rolelist, shorten_by=1400):
-            for page in cf.pagify(rolelist, shorten_by=1400):
+            embed = discord.Embed(
-                embed = discord.Embed(
+                description=f"**Total roles:** {len(ctx.guild.roles)}\n\n{page}",
-                    description=f"**Total roles:** {len(ctx.guild.roles)}\n\n{page}",
+                colour=await ctx.embed_colour(),
-                    colour=await ctx.embed_colour(),
+            )
-                )
+            embed_list.append(embed)
-                embed_list.append(embed)
-        else:
-            for page in cf.pagify(rolelist, shorten_by=1400):
-                msg = f"**Total roles:** {len(ctx.guild.roles)}\n{page}"
-                embed_list.append(msg)
-
         await menu(ctx, embed_list, DEFAULT_CONTROLS)
 
     @commands.command(hidden=True)
     async def sharedservers(self, ctx, user: discord.Member = None):
         """Shows shared server info. Defaults to author."""
+        author = ctx.author
+        guild = ctx.guild
         if not user:
-            user = ctx.author
+            user = author
 
         mutual_guilds = user.mutual_guilds
         data = f"[Guilds]:     {len(mutual_guilds)} shared\n"
@@ -622,13 +624,13 @@ class Tools(commands.Cog):
         data += f"[In Guilds]:  {cf.humanize_list(shared_servers, style='unit')}"
 
         for page in cf.pagify(data, ["\n"], page_length=1800):
-            await ctx.send(cf.box(data, lang="ini"))
+            await ctx.send(f"```ini\n{data}```")
 
     @commands.guild_only()
     @commands.command()
     async def sid(self, ctx):
-        """Show the server id."""
+        """Show the server ID."""
-        await ctx.send(f"**{ctx.guild.name} ID:** {ctx.guild.id}")
+        await ctx.send("**{0.name} ID:** {0.id}".format(ctx.guild))
 
     @commands.guild_only()
     @commands.command(aliases=["ginfo"])
@@ -646,49 +648,22 @@ class Tools(commands.Cog):
         text_channels = [x for x in guild.channels if isinstance(x, discord.TextChannel)]
         voice_channels = [x for x in guild.channels if isinstance(x, discord.VoiceChannel)]
 
-        data = f"[Name]:     {guild.name}\n"
+        load = "```\nLoading guild info...```"
-        data += f"[ID]:       {guild.id}\n"
+        waiting = await ctx.send(load)
-        data += f"[Owner]:    {guild.owner}\n"
-        data += f"[Users]:    {online}/{total_users}\n"
-        data += f"[Text]:     {len(text_channels)} channels\n"
-        data += f"[Voice]:    {len(voice_channels)} channels\n"
-        data += f"[Emojis]:   {len(guild.emojis)}\n"
-        data += f"[Stickers]: {len(guild.stickers)}\n"
-        data += f"[Roles]:    {len(guild.roles)}\n"
-        data += f"[Created]:  {self._dynamic_time(guild.created_at)}\n"
 
-        await ctx.send(cf.box(data, lang="ini"))
+        data = "```ini\n"
-
+        data += "[Name]:     {}\n".format(guild.name)
-    @commands.guild_only()
+        data += "[ID]:       {}\n".format(guild.id)
-    @commands.command(aliases=["stickerinfo"])
+        data += "[Region]:   {}\n".format(guild.region)
-    async def stinfo(self, ctx, message_link: str = None):
+        data += "[Owner]:    {}\n".format(guild.owner)
-        """
+        data += "[Users]:    {}/{}\n".format(online, total_users)
-        Sticker information.
+        data += "[Text]:     {} channels\n".format(len(text_channels))
-
+        data += "[Voice]:    {} channels\n".format(len(voice_channels))
-        Attach a sticker to the command message or provide a link to a message with a sticker.
+        data += "[Emojis]:   {}\n".format(len(guild.emojis))
-        """
+        data += "[Roles]:    {} \n".format(len(guild.roles))
-        if message_link:
+        data += "[Created]:  {}\n```".format(self._dynamic_time(guild.created_at))
-            message = await self.message_from_message_link(ctx, message_link)
+        await asyncio.sleep(1)
-        else:
+        await waiting.edit(content=data)
-            message = ctx.message
-
-        if isinstance(message, str):
-            return await ctx.send(message)
-
-        stickers = message.stickers
-        for sticker_item in stickers:
-            sticker = await sticker_item.fetch()
-
-            msg = f"[Name]:        {sticker.name}\n"
-            msg += f"[Guild]:       {sticker.guild if sticker.guild != None else 'Guild name is unavailable'}\n"
-            msg += f"[ID]:          {sticker.id}\n"
-            msg += f"[URL]:         {str(sticker.url)}\n"
-            msg += f"[Format]:      {sticker.format.file_extension if sticker.format.file_extension else 'lottie'}\n"
-            if sticker.description:
-                msg += f"[Description]: {sticker.description}\n"
-            msg += f"[Created]:     {self._dynamic_time(sticker.created_at)}\n"
-
-            await ctx.send(cf.box(msg, lang="ini"))
 
     @commands.guild_only()
     @commands.command()
@@ -713,40 +688,6 @@ class Tools(commands.Cog):
         else:
             await menu(ctx, pages, DEFAULT_CONTROLS)
 
-    @commands.guild_only()
-    @commands.command()
-    async def uimages(self, ctx, user: discord.Member = None, embed=False):
-        """
-        Shows user image urls. Defaults to author.
-
-        `embed` is a True/False value for whether to display the info in an embed.
-        """
-        if user is None:
-            user = ctx.author
-
-        fetch_user = await self.bot.fetch_user(user.id)
-
-        if not embed or not ctx.channel.permissions_for(ctx.guild.me).embed_links:
-            data = f"[Name]:              {cf.escape(str(user))}\n"
-            data += f"[Avatar URL]:        {user.avatar if user.avatar is not None else user.default_avatar}\n"
-            if user.guild_avatar:
-                data += f"[Server Avatar URL]: {user.guild_avatar}\n"
-            if fetch_user.banner:
-                data += f"[Banner URL]:        {fetch_user.banner}\n"
-
-            await ctx.send(cf.box(data, lang="ini"))
-        else:
-            embed = discord.Embed(
-                description=f"**{cf.escape(str(user))}**",
-                colour=await ctx.embed_colour(),
-            )
-            if user.guild_avatar:
-                embed.add_field(name="Server Avatar", value=user.guild_avatar, inline=False)
-            embed.set_thumbnail(url=user.avatar if user.avatar is not None else user.default_avatar)
-            if fetch_user.banner:
-                embed.set_image(url=fetch_user.banner)
-            await ctx.send(embed=embed)
-
     @commands.guild_only()
     @commands.command()
     async def uinfo(self, ctx, user: discord.Member = None):
@@ -763,42 +704,47 @@ class Tools(commands.Cog):
                 roles[0].name,
             ] + [f"{r.name:>{len(r.name)+17}}" for r in roles[1:]]
         except IndexError:
+            # if there are no roles then roles[0] will raise the IndexError here
             _roles = ["None"]
 
         seen = str(len(set([member.guild.name for member in self.bot.get_all_members() if member.id == user.id])))
 
-        data = f"[Name]:          {cf.escape(str(user))}\n"
+        load = "```\nLoading user info...```"
-        data += f"[ID]:            {user.id}\n"
+        waiting = await ctx.send(load)
-        data += f"[Status]:        {user.status}\n"
+
-        data += f"[Servers]:       {seen} shared\n"
+        data = "```ini\n"
+        data += "[Name]:          {}\n".format(cf.escape(str(user)))
+        data += "[ID]:            {}\n".format(user.id)
+        data += "[Status]:        {}\n".format(user.status)
+        data += "[Servers]:       {} shared\n".format(seen)
         if actplay := discord.utils.get(user.activities, type=discord.ActivityType.playing):
-            data += f"[Playing]:       {cf.escape(str(actplay.name))}\n"
+            data += "[Playing]:       {}\n".format(cf.escape(str(actplay.name)))
         if actlisten := discord.utils.get(user.activities, type=discord.ActivityType.listening):
             if isinstance(actlisten, discord.Spotify):
-                _form = f"{actlisten.artist} - {actlisten.title}"
+                _form = "{} - {}".format(actlisten.artist, actlisten.title)
             else:
                 _form = actlisten.name
-            data += f"[Listening]:     {cf.escape(_form)}\n"
+            data += "[Listening]:     {}\n".format(cf.escape(_form))
         if actwatch := discord.utils.get(user.activities, type=discord.ActivityType.watching):
-            data += f"[Watching]:      {cf.escape(str(actwatch.name))}\n"
+            data += "[Watching]:      {}\n".format(cf.escape(str(actwatch.name)))
         if actstream := discord.utils.get(user.activities, type=discord.ActivityType.streaming):
-            data += f"[Streaming]: [{cf.escape(str(actstream.name))}]({cf.escape(actstream.url)})\n"
+            data += "[Streaming]: [{}]({})\n".format(cf.escape(str(actstream.name)), cf.escape(actstream.url))
         if actcustom := discord.utils.get(user.activities, type=discord.ActivityType.custom):
             if actcustom.name is not None:
-                data += f"[Custom Status]: {cf.escape(str(actcustom.name))}\n"
+                data += "[Custom status]: {}\n".format(cf.escape(str(actcustom.name)))
         passed = (ctx.message.created_at - user.created_at).days
-        data += f"[Created]:       {self._dynamic_time(user.created_at)}\n"
+        data += "[Created]:       {}\n".format(self._dynamic_time(user.created_at))
         joined_at = self.fetch_joined_at(user, ctx.guild)
         if caller != "invoke":
-            role_list = "\n".join(_roles)
+            data += "[Joined]:        {}\n".format(self._dynamic_time(joined_at))
-            data += f"[Joined]:        {self._dynamic_time(joined_at)}\n"
+            data += "[Roles]:         {}\n".format("\n".join(_roles))
-            data += f"[Roles]:         {role_list}\n"
             if len(_roles) > 1:
                 data += "\n"
-            data += f"[In Voice]:      {user.voice.channel if user.voice is not None else None}\n"
+            data += "[In Voice]:      {}\n".format(user.voice.channel if user.voice is not None else None)
-            data += f"[AFK]:           {user.voice.afk if user.voice is not None else False}\n"
+            data += "[AFK]:           {}\n".format(user.voice.afk if user.voice is not None else False)
-
+        data += "```"
-        await ctx.send(cf.box(data, lang="ini"))
+        await asyncio.sleep(1)
+        await waiting.edit(content=data)
 
     @commands.guild_only()
     @commands.command()
@@ -833,8 +779,6 @@ class Tools(commands.Cog):
             await ctx.invoke(self.sinfo, id)
         elif isinstance(it_is, discord.abc.GuildChannel):
             await ctx.invoke(self.chinfo, id)
-        elif isinstance(it_is, discord.Thread):
-            await ctx.invoke(self.chinfo, id)
         elif isinstance(it_is, (discord.User, discord.Member)):
             await ctx.invoke(self.uinfo, it_is)
         elif isinstance(it_is, discord.Role):
@@ -845,7 +789,32 @@ class Tools(commands.Cog):
             await ctx.send("I could not find anything for this ID.")
 
     @staticmethod
-    def count_months(days):
+    def _dynamic_time(time):
+        try:
+            date_join = datetime.datetime.strptime(str(time), "%Y-%m-%d %H:%M:%S.%f")
+        except ValueError:
+            time = f"{str(time)}.0"
+            date_join = datetime.datetime.strptime(str(time), "%Y-%m-%d %H:%M:%S.%f")
+        date_now = datetime.datetime.now(datetime.timezone.utc)
+        date_now = date_now.replace(tzinfo=None)
+        since_join = date_now - date_join
+
+        mins, secs = divmod(int(since_join.total_seconds()), 60)
+        hrs, mins = divmod(mins, 60)
+        days, hrs = divmod(hrs, 24)
+        mths, wks, days = Tools._count_months(days)
+        yrs, mths = divmod(mths, 12)
+
+        m = f"{yrs}y {mths}mth {wks}w {days}d {hrs}h {mins}m {secs}s"
+        m2 = [x for x in m.split() if x[0] != "0"]
+        s = " ".join(m2[:2])
+        if s:
+            return f"{s} ago"
+        else:
+            return ""
+
+    @staticmethod
+    def _count_months(days):
         lens = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
         cy = itertools.cycle(lens)
         months = 0
@@ -863,107 +832,10 @@ class Tools(commands.Cog):
         weeks, days = divmod(m_temp, 7)
         return months, weeks, days
 
-    def category_format(self, cat_chan_tuple: tuple):
+    def fetch_joined_at(self, user, guild):
-        cat = cat_chan_tuple[0]
-        chs = cat_chan_tuple[1]
-
-        chfs = self.channels_format(chs)
-        if chfs != []:
-            ch_forms = ["\t" + f for f in chfs]
-            return "\n".join([f"{cat.name} :: {cat.id}"] + ch_forms)
-        else:
-            return "\n".join([f"{cat.name} :: {cat.id}"] + ["\tNo Channels"])
-
-    @staticmethod
-    def channels_format(channels: list):
-        if channels == []:
-            return []
-
-        channel_form = "{name} :: {ctype} :: {cid}"
-
-        def type_name(channel):
-            return channel.__class__.__name__[:-7]
-
-        name_justify = max([len(c.name[:24]) for c in channels])
-        type_justify = max([len(type_name(c)) for c in channels])
-
-        return [
-            channel_form.format(
-                name=c.name[:24].ljust(name_justify),
-                ctype=type_name(c).ljust(type_justify),
-                cid=c.id,
-            )
-            for c in channels
-        ]
-
-    def _dynamic_time(self, time):
-        try:
-            date_join = datetime.datetime.strptime(str(time), "%Y-%m-%d %H:%M:%S.%f%z")
-        except ValueError:
-            time = f"{str(time)}.0"
-            date_join = datetime.datetime.strptime(str(time), "%Y-%m-%d %H:%M:%S.%f%z")
-        date_now = discord.utils.utcnow()
-        since_join = date_now - date_join
-
-        mins, secs = divmod(int(since_join.total_seconds()), 60)
-        hrs, mins = divmod(mins, 60)
-        days, hrs = divmod(hrs, 24)
-        mths, wks, days = self.count_months(days)
-        yrs, mths = divmod(mths, 12)
-
-        m = f"{yrs}y {mths}mth {wks}w {days}d {hrs}h {mins}m {secs}s"
-        m2 = [x for x in m.split() if x[0] != "0"]
-        s = " ".join(m2[:2])
-        if s:
-            return f"{s} ago"
-        else:
-            return ""
-
-    @staticmethod
-    def fetch_joined_at(user, guild):
         return user.joined_at
 
-    async def message_from_message_link(self, ctx: commands.Context, message_link: str):
+    def _role_from_string(self, guild, rolename, roles=None):
-        bad_link_msg = "That doesn't look like a message link, I can't reach that message, "
-        bad_link_msg += "or you didn't attach a sticker to the command message."
-        no_guild_msg = "You aren't in that guild."
-        no_channel_msg = "You can't view that channel."
-        no_message_msg = "That message wasn't found."
-        no_sticker_msg = "There are no stickers attached to that message."
-
-        if not "discord.com/channels/" in message_link:
-            return bad_link_msg
-        ids = message_link.split("/")
-        if len(ids) != 7:
-            return bad_link_msg
-
-        guild = self.bot.get_guild(int(ids[4]))
-        if not guild:
-            return bad_link_msg
-
-        channel = guild.get_channel_or_thread(int(ids[5]))
-        if not channel:
-            channel = self.bot.get_channel(int(ids[5]))
-        if not channel:
-            return bad_link_msg
-
-        if ctx.author not in guild.members:
-            return no_guild_msg
-        if not channel.permissions_for(ctx.author).read_messages:
-            return no_channel_msg
-
-        try:
-            message = await channel.fetch_message(int(ids[6]))
-        except discord.errors.NotFound:
-            return no_message_msg
-
-        if not message.stickers:
-            return no_sticker_msg
-
-        return message
-
-    @staticmethod
-    def role_from_string(guild, rolename, roles=None):
         if roles is None:
             roles = guild.roles
         role = discord.utils.find(lambda r: r.name.lower() == str(rolename).lower(), roles)
@@ -989,3 +861,36 @@ class Tools(commands.Cog):
             key=lambda t: t[0].position,
         )
         return channels, category_channels
+
+    def channels_format(self, channels: list):
+        if channels == []:
+            return []
+
+        channel_form = "{name} :: {ctype} :: {cid}"
+
+        def type_name(channel):
+            return channel.__class__.__name__[:-7]
+
+        name_justify = max([len(c.name[:24]) for c in channels])
+        type_justify = max([len(type_name(c)) for c in channels])
+
+        return [
+            channel_form.format(
+                name=c.name[:24].ljust(name_justify),
+                ctype=type_name(c).ljust(type_justify),
+                cid=c.id,
+            )
+            for c in channels
+        ]
+
+    def category_format(self, cat_chan_tuple: tuple):
+
+        cat = cat_chan_tuple[0]
+        chs = cat_chan_tuple[1]
+
+        chfs = self.channels_format(chs)
+        if chfs != []:
+            ch_forms = ["\t" + f for f in chfs]
+            return "\n".join([f"{cat.name} :: {cat.id}"] + ch_forms)
+        else:
+            return "\n".join([f"{cat.name} :: {cat.id}"] + ["\tNo Channels"])

trackdecoder/__init__.py

@@ -3,5 +3,5 @@ from .trackdecoder import TrackDecoder
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(TrackDecoder(bot))
+    bot.add_cog(TrackDecoder(bot))

trickortreat/__init__.py

@@ -10,5 +10,5 @@ __red_end_user_data_statement__ = (
 )
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(TrickOrTreat(bot))
+    bot.add_cog(TrickOrTreat(bot))

trickortreat/trickortreat.py

@@ -9,7 +9,7 @@ from redbot.core import commands, checks, Config, bank
 from redbot.core.utils.chat_formatting import box, pagify, humanize_number
 from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
 
-__version__ = "0.1.6"
+__version__ = "0.1.7"
 
 
 class TrickOrTreat(commands.Cog):
@@ -32,6 +32,7 @@ class TrickOrTreat(commands.Cog):
         default_user = {
             "candies": 0,
             "chocolate": 0,
+            "cookies": 0,
             "eaten": 0,
             "last_tot": "2018-01-01 00:00:00.000001",
             "lollipops": 0,
@@ -48,7 +49,7 @@ class TrickOrTreat(commands.Cog):
     async def eatcandy(self, ctx, number: Optional[int] = 1, candy_type=None):
         """Eat some candy.
 
-        Valid types: candy/candie(s), chocolate(s), lollipop(s), star(s)
+        Valid types: candy/candie(s), chocolate(s), lollipop(s), cookie(s), star(s)
         Examples:
             `[p]eatcandy 3 lollipops`
             `[p]eatcandy star`
@@ -62,6 +63,9 @@ class TrickOrTreat(commands.Cog):
         \N{LOLLIPOP}
         Reduces sickness by 20.
 
+        \N{FORTUNE COOKIE}
+        Sets sickness to a random amount - fortune favours the brave.
+
         \N{WHITE MEDIUM STAR}
         Resets sickness to 0.
         """
@@ -81,7 +85,9 @@ class TrickOrTreat(commands.Cog):
             candy_type = "stars"
         if candy_type in ["chocolate", "chocolates"]:
             candy_type = "chocolate"
-        candy_list = ["candies", "chocolate", "lollipops", "stars"]
+        if candy_type in ["cookie", "cookies"]:
+            candy_type = "cookies"
+        candy_list = ["candies", "chocolate", "lollipops", "cookies", "stars"]
         if candy_type not in candy_list:
             return await ctx.reply("That's not a candy type! Use the inventory command to see what you have.")
         if userdata[candy_type] < number:
@@ -186,6 +192,21 @@ class TrickOrTreat(commands.Cog):
             await self.config.user(ctx.author).lollipops.set(userdata["lollipops"] - number)
             await self.config.user(ctx.author).eaten.set(userdata["eaten"] + number)
 
+        if candy_type in ["cookies", "cookie"]:
+            pluralcookie = "cookie" if number == 1 else "cookies"
+            new_sickness = random.randint(0, 100)
+            old_sickness = userdata["sickness"]
+            if new_sickness > old_sickness:
+                phrase = f"You feel worse!\n*Sickness has gone up by {new_sickness - old_sickness}*"
+            else:
+                phrase = f"You feel better!\n*Sickness has gone down by {old_sickness - new_sickness}*"
+            await ctx.reply(
+                f"{random.choice(eat_phrase)} {number} {pluralcookie}. {phrase}"
+            )
+            await self.config.user(ctx.author).sickness.set(new_sickness)
+            await self.config.user(ctx.author).cookies.set(userdata["cookies"] - number)
+            await self.config.user(ctx.author).eaten.set(userdata["eaten"] + number)
+
         if candy_type in ["stars", "star"]:
             pluralstar = "star" if number == 1 else "stars"
             await ctx.reply(
@@ -254,10 +275,11 @@ class TrickOrTreat(commands.Cog):
                     user_obj = await self.bot.fetch_user(account[0])
             except AttributeError:
                 user_obj = await self.bot.fetch_user(account[0])
-
+            
-            user_name = f"{user_obj.name}#{user_obj.discriminator}"
+            _user_name = discord.utils.escape_markdown(user_obj.name)
+            user_name = f"{_user_name}#{user_obj.discriminator}"
             if len(user_name) > 28:
-                user_name = f"{user_obj.name[:19]}...#{user_obj.discriminator}"
+                user_name = f"{_user_name[:19]}...#{user_obj.discriminator}"
             user_idx = pos + 1
             if user_obj == ctx.author:
                 temp_msg += (
@@ -296,6 +318,8 @@ class TrickOrTreat(commands.Cog):
             em.description += f"\n{userdata['chocolate']} \N{CHOCOLATE BAR}"
         if userdata["lollipops"]:
             em.description += f"\n{userdata['lollipops']} \N{LOLLIPOP}"
+        if userdata["cookies"]:
+            em.description += f"\n{userdata['cookies']} \N{FORTUNE COOKIE}"
         if userdata["stars"]:
             em.description += f"\n{userdata['stars']} \N{WHITE MEDIUM STAR}"
         if sickness in range(41, 56):
@@ -569,6 +593,7 @@ class TrickOrTreat(commands.Cog):
         lollipop = random.randint(0, 100)
         star = random.randint(0, 100)
         chocolate = random.randint(0, 100)
+        cookie = random.randint(0, 100)
         win_message = f"{message.author.mention}\nYou received:\n{candy}\N{CANDY}"
         await self.config.user(message.author).candies.set(userdata["candies"] + candy)
 
@@ -604,6 +629,19 @@ class TrickOrTreat(commands.Cog):
             await self.config.user(message.author).lollipops.set(userdata["lollipops"] + 1)
             win_message += "\n**BONUS**: 1 \N{LOLLIPOP}"
 
+        if cookie == 100:
+            await self.config.user(message.author).cookies.set(userdata["cookies"] + 4)
+            win_message += "\n**BONUS**: 4 \N{FORTUNE COOKIE}"
+        elif 99 >= cookie >= 97:
+            await self.config.user(message.author).cookies.set(userdata["cookies"] + 3)
+            win_message += "\n**BONUS**: 3 \N{FORTUNE COOKIE}"
+        elif 96 >= cookie >= 85:
+            await self.config.user(message.author).cookies.set(userdata["cookies"] + 2)
+            win_message += "\n**BONUS**: 2 \N{FORTUNE COOKIE}"
+        elif 84 >= cookie >= 75:
+            await self.config.user(message.author).cookies.set(userdata["cookies"] + 1)
+            win_message += "\n**BONUS**: 1 \N{FORTUNE COOKIE}"
+
         if star == 100:
             await self.config.user(message.author).stars.set(userdata["stars"] + 4)
             win_message += "\n**BONUS**: 4 \N{WHITE MEDIUM STAR}"

ttt/__init__.py

@@ -2,5 +2,5 @@ from .ttt import TTT
 
 __red_end_user_data_statement__ = "This cog does store temporarily (in memory) data about users, which is cleared after the game is done."
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(TTT(bot))
+    bot.add_cog(TTT(bot))

urlfetch/__init__.py

@@ -3,5 +3,5 @@ from .urlfetch import UrlFetch
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(UrlFetch(bot))
+    bot.add_cog(UrlFetch(bot))

voicelogs/__init__.py

@@ -2,5 +2,5 @@ from .voicelogs import VoiceLogs
 
 
 async def setup(bot):
-    n = VoiceLogs(bot)
+    cog = VoiceLogs(bot)
-    await bot.add_cog(n)
+    bot.add_cog(cog)

wolfram/__init__.py

@@ -3,5 +3,5 @@ from .wolfram import Wolfram
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(Wolfram(bot))
+    bot.add_cog(Wolfram(bot))

youtube/__init__.py

@@ -3,5 +3,5 @@ from .youtube import YouTube
 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
 
 
-async def setup(bot):
+def setup(bot):
-    await bot.add_cog(YouTube(bot))
+    bot.add_cog(YouTube(bot))