Await bot.add_cog

[RSS] Fix for bot.embed_requested
Merge in updates from v3 branch (#270 )
2022-04-04 13:05:52 -07:00 · 2022-04-04 12:38:29 -07:00 · 2022-04-04 12:20:34 -07:00 · 2022-04-04 12:15:02 -07:00 · 2022-03-24 16:15:42 -07:00 · 2022-03-04 16:32:23 -08:00
118 changed files with 4618 additions and 2742 deletions
--- a/209
+++ b/209
@@ -1,6 +1,6 @@
 MIT License

-Copyright (c) 2016 
+Copyright (c) 2016-present aikaterna

 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
@@ -19,3 +19,210 @@ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
 LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
 OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 SOFTWARE.
+
+
+This product bundles methods from https://github.com/hizkifw/discord-tictactoe
+which are available under an Apache-2.0 license. This license only applies 
+to the ttt.py file within the ttt directory on this repository.
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright 2017-present hizkifw
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/README.md
+++ b/README.md
@@ -3,8 +3,6 @@ v3 Cogs for Red-DiscordBot by Twentysix26.

 adventure - Original concept & cog by locastan. My version is a collaboration between TrustyJAID, Draper, and myself and is now markedly different than locastan's version. The repo can be found on my repo page here on github.

-antiphoneclapper - Detects and removes bad GIFs posted in chat that have malformed frames. Thanks to Sitryk for all of the code that actually mattered for detection in this cog.
-
 away - Originally by Paddo, written for v3 by Axas, final tests by aikaterna, and large improvements by TrustyJAID. Set and unset a user as being "away", or other statuses.

 blurplefy - Make an avatar or an image upload blurple for Discord's anniversaries.
@@ -15,9 +13,11 @@ chatchart - Generates a pie chart to display chat activity over the last 5000 me

 dadjokes - Another UltimatePancake cog. Get some dad jokes on command.

-dictonary - Define words and look up antonyms and synonyms. Originally by UltimatePancake.
+dictionary - Define words and look up antonyms and synonyms. Originally by UltimatePancake.

-dungeon - New users with new accounts will be shuffled off to a locked channel on-join to help mitigate raiders. Please see the [dungeon_readme.md](https://github.com/aikaterna/aikaterna-cogs/blob/v3/dungeon_readme.md) file on this repo for more information.
+discordexperiments - Create voice channel invites for various built-in apps. This is only for developers or for people that can read the code and assess the risk of using it.
+
+embedpeek - Take a closer look at or unpack embed content. This cog is mostly a developer tool.

 hunting - A long overdue port of Paddo's v2 hunting game to v3.

@@ -33,9 +33,9 @@ latex - A simple cog originally by Stevy for v2 that displayes LaTeX expressions

 luigipoker - Play the Luigi Poker minigame from New Super Mario Brothers. Ported from the v2 version written by themario30.

-noflippedtables - A v3 port of irdumb's v2 cog with a little extra surprise included. Unflip all the tables.
+massunban - Bot Admins or guild Administrators can use this tool to mass unban users via ban reason keywords, or mass unban everyone on the ban list.

-nolinks - A very blunt hammer to remove anything that looks like a link. Roles can be whitelisted and it can watch multiple channels.
+noflippedtables - A v3 port of irdumb's v2 cog with a little extra surprise included. Unflip all the tables.

 otherbot - Alert a role when bot(s) go offline.

@@ -49,10 +49,6 @@ pupper - A cog for Ryan5374. A pet that comes around on an on_message listener a

 quiz - A kahoot-like trivia game. Originally by Keane for Red v2.

-region - A command to change the voice region of a server. Requires the guild admin or mod role or guild administrator.
-
-retrosign - A v3 port of Anismash's retrosign cog.
-
 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.
@@ -61,11 +57,17 @@ snacktime - A v3 port of irdumb's snacktime cog. Now with friends!

 timezone - A v3 port of Fishyfing's timezone cog with a few improvements.

+trackdecoder - A dev utility cog to resolve Lavalink Track information from a b64 string.
+
 trickortreat - A trick or treat-based competitive candy eating game with a leaderboard and other fun commands like stealing candy from guildmates.

 tools - A collection of mod and admin tools, ported from my v2 version. Sitryk is responsible for a lot of the code in tools... thanks for the help with this cog.

-warcraftlogs - Fetch player info/metrics from the WarcraftLogs API for World of Warcraft Classic. Does not provide stats for non-Classic characters.
+ttt - A Tic Tac Toe cog originally for Red V2 by HizikiFW. This cog is licensed under the Apache-2.0 license.
+
+urlfetch - Fetch text from a URL. Mainly used for simple text API queries (not JSON).
+
+voicelogs - A record of people's time spent in voice channels by ZeLarpMaster for v2, and ported here for v3 use. This cog is licensed under the GPL-3.0 License.

 wolfram - A v3 port of Paddo's abandoned Wolfram Alpha cog.

--- a/antiphoneclapper/antiphoneclapper.py
+++ b/antiphoneclapper/antiphoneclapper.py
@@ -1,116 +0,0 @@
-from PIL import Image
-from io import BytesIO
-import aiohttp
-import discord
-import logging
-
-from redbot.core import commands, checks, Config
-
-
-log = logging.getLogger("red.aikaterna.antiphoneclapper")
-
-
-class AntiPhoneClapper(commands.Cog):
-    """This cog deletes bad GIFs that will crash phone clients."""
-
-    async def red_delete_data_for_user(self, **kwargs):
-        """ Nothing to delete """
-        return
-
-    def __init__(self, bot):
-        self.bot = bot
-        self.session = aiohttp.ClientSession()
-        self.config = Config.get_conf(self, 2719371001, force_registration=True)
-
-        default_guild = {"watching": []}
-
-        self.config.register_guild(**default_guild)
-
-    @commands.group()
-    @checks.mod_or_permissions(administrator=True)
-    @commands.guild_only()
-    async def nogif(self, ctx):
-        """Configuration options."""
-        pass
-
-    @nogif.command()
-    async def watch(self, ctx, channel: discord.TextChannel):
-        """
-        Add a channel to watch. 
-        Gif attachments that break mobile clients will be removed in these channels.
-        """
-        channel_list = await self.config.guild(ctx.guild).watching()
-        if channel.id not in channel_list:
-            channel_list.append(channel.id)
-        await self.config.guild(ctx.guild).watching.set(channel_list)
-        await ctx.send(f"{self.bot.get_channel(channel.id).mention} will have bad gifs removed.")
-
-    @nogif.command()
-    async def watchlist(self, ctx):
-        """List the channels being watched."""
-        channel_list = await self.config.guild(ctx.guild).watching()
-        msg = "Bad gifs will be removed in:\n"
-        for channel in channel_list:
-            channel_obj = self.bot.get_channel(channel)
-            msg += f"{channel_obj.mention}\n"
-        await ctx.send(msg)
-
-    @nogif.command()
-    async def unwatch(self, ctx, channel: discord.TextChannel):
-        """Remove a channel from the watch list."""
-        channel_list = await self.config.guild(ctx.guild).watching()
-        if channel.id in channel_list:
-            channel_list.remove(channel.id)
-        else:
-            return await ctx.send("Channel is not being watched.")
-        await self.config.guild(ctx.guild).watching.set(channel_list)
-        await ctx.send(f"{self.bot.get_channel(channel.id).mention} will not have bad gifs removed.")
-
-    def is_phone_clapper(self, im):
-        limit = im.size
-        tile_sizes = []
-        for frame in range(im.n_frames):
-            im.seek(frame)
-            tile_sizes.append(im.tile[0][1][2:])
-        return any([x[0] > limit[0] or x[1] > limit[1] for x in tile_sizes])
-
-    @commands.Cog.listener()
-    async def on_message(self, m):
-        if not m.attachments:
-            return
-        if isinstance(m.channel, discord.abc.PrivateChannel):
-            return
-        if m.author.bot:
-            return
-        watch_channel_list = await self.config.guild(m.guild).watching()
-        if not watch_channel_list:
-            return
-        if m.channel.id not in watch_channel_list:
-            return
-        for att in m.attachments:
-            if not att.filename.endswith(".gif") or att.size > 200000:
-                continue
-
-            async with self.session.get(att.url) as resp:
-                data = await resp.content.read()
-                f = BytesIO(data)
-                try:
-                    img = Image.open(f)
-                    phone_clapper = self.is_phone_clapper(img)
-                except Image.DecompressionBombError:
-                    phone_clapper = True
-
-            if phone_clapper:
-                try:
-                    await m.delete()
-                    await m.channel.send(f"{m.author.mention} just tried to send a phone-killing GIF and I removed it.")
-                    return
-                except discord.errors.Forbidden:
-                    await m.channel.send(f"Don't send GIFs that do that, {m.author.mention}")
-                    log.debug(f"Failed to delete message ({m.id}) that contained phone killing gif")
-                    return
-            else:
-                return
-
-    def cog_unload(self):
-        self.bot.loop.create_task(self.session.close())
--- a/antiphoneclapper/info.json
+++ b/antiphoneclapper/info.json
@@ -1,16 +0,0 @@
-{
-	"author": [
-		"sitryk", "aikaterna"
-	],
-	"description": "Deletes messages with malformed GIFs.",
-    "install_msg": "Thanks for installing, have fun.",
-    "permissions" : [
-		"manage_messages"
-	],
-	"requirements": [
-		"pillow"
-	],
-	"short": "Deletes messages with malformed GIFs.",
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
--- a/away/init.py
+++ b/away/init.py
@@ -12,5 +12,5 @@ __red_end_user_data_statement__ = (
 )


-def setup(bot):
-    bot.add_cog(Away(bot))
+async def setup(bot):
+    await bot.add_cog(Away(bot))
--- a/away/away.py
+++ b/away/away.py
@@ -1,7 +1,6 @@
 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))")
@@ -25,19 +24,19 @@ class Away(commands.Cog):
    async def red_delete_data_for_user(
        self, *, requester: Literal["discord", "owner", "user", "user_strict"], user_id: int,
    ):
-        await self._away.user_from_id(user_id).clear()
+        await self.config.user_from_id(user_id).clear()

    def __init__(self, bot):
        self.bot = bot
-        self._away = Config.get_conf(self, 8423491260, force_registration=True)
-        self._away.register_global(**self.default_global_settings)
-        self._away.register_guild(**self.default_guild_settings)
-        self._away.register_user(**self.default_user_settings)
+        self.config = Config.get_conf(self, 8423491260, force_registration=True)
+        self.config.register_global(**self.default_global_settings)
+        self.config.register_guild(**self.default_guild_settings)
+        self.config.register_user(**self.default_user_settings)

    def _draw_play(self, song):
        song_start_time = song.start
        total_time = song.duration
-        current_time = datetime.datetime.utcnow()
+        current_time = discord.utils.utcnow()
        elapsed_time = current_time - song_start_time
        sections = 12
        loc_time = round((elapsed_time / total_time) * sections)  # 10 sections
@@ -60,9 +59,8 @@ class Away(commands.Cog):
        """
            Makes the embed reply
        """
-        avatar = author.avatar_url_as()  # This will return default avatar if no avatar is present
+        avatar = author.display_avatar  # This will return default avatar if no avatar is present
        color = author.color
-        link = None
        if message:
            link = IMAGE_LINKS.search(message)
            if link:
@@ -175,14 +173,7 @@ class Away(commands.Cog):
        """
            Makes the message to display if embeds aren't available
        """
-        url = None
-        if message:
-            message = await self.find_user_mention(message)
-            link = IMAGE_LINKS.search(message)
-            if link:
-                url_loc = message.index(link.group(0))
-                url = message[url_loc:]
-                message = message.replace(link.group(0), " ")
+        message = await self.find_user_mention(message)

        if state == "away":
            msg = f"{author.display_name} is currently away"
@@ -214,13 +205,11 @@ class Away(commands.Cog):
        else:
            msg = f"{author.display_name} is currently away"

-        if message and state != "listeningcustom":
-            msg += f" and has set the following message: `{message.rstrip()}`"
-        elif message and state == "listeningcustom":
-            msg += f"\n\nCustom message: `{message.rstrip()}`"
+        if message != " " and state != "listeningcustom":
+            msg += f" and has set the following message: `{message}`"
+        elif message != " " and state == "listeningcustom":
+            msg += f"\n\nCustom message: `{message}`"

-        if url:
-            msg += f"\n{url}"
        return msg

    async def is_mod_or_admin(self, member: discord.Member):
@@ -236,87 +225,101 @@ class Away(commands.Cog):
        return False

    @commands.Cog.listener()
-    async def on_message(self, message):
-        tmp = {}
+    async def on_message_without_command(self, message: discord.Message):
        guild = message.guild
-        list_of_guilds_ign = await self._away.ign_servers()
-        if not guild:
+        if not guild or not message.mentions or message.author.bot:
            return
        if not message.channel.permissions_for(guild.me).send_messages:
            return
-        if not message.mentions:
-            return
-        if message.author.bot:
-            return

-        bl_members = await self._away.guild(guild).BLACKLISTED_MEMBERS()
+        blocked_guilds = await self.config.ign_servers()
+        guild_config = await self.config.guild(guild).all()
        for author in message.mentions:
-            if (guild.id in list_of_guilds_ign and not await self.is_mod_or_admin(author)) or author.id in bl_members:
+            if (guild.id in blocked_guilds and not await self.is_mod_or_admin(author)) or author.id in guild_config["BLACKLISTED_MEMBERS"]:
                continue
-            user_data = await self._away.user(author).all()
-            text_only = await self._away.guild(guild).TEXT_ONLY()
+            user_data = await self.config.user(author).all()
            embed_links = message.channel.permissions_for(guild.me).embed_links

            away_msg = user_data["MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            if isinstance(away_msg, list) and away_msg[1] is not None and away_msg[1] < 5:
+                await self.config.user(author).MESSAGE.set((away_msg[0], 5))
+                away_msg = away_msg[0], 5
            if away_msg:
                if type(away_msg) in [tuple, list]:
                    # This is just to keep backwards compatibility
                    away_msg, delete_after = away_msg
                else:
                    delete_after = None
-                if embed_links and not text_only:
+                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)
-                elif (embed_links and text_only) or not embed_links:
+                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)
                continue
            idle_msg = user_data["IDLE_MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            if isinstance(idle_msg, list) and idle_msg[1] is not None and idle_msg[1] < 5:
+                await self.config.user(author).IDLE_MESSAGE.set((idle_msg[0], 5))
+                idle_msg = idle_msg[0], 5
            if idle_msg and author.status == discord.Status.idle:
                if type(idle_msg) in [tuple, list]:
                    idle_msg, delete_after = idle_msg
                else:
                    delete_after = None
-                if embed_links and not text_only:
+                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)
-                elif (embed_links and text_only) or not embed_links:
+                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)
                continue
            dnd_msg = user_data["DND_MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            if isinstance(dnd_msg, list) and dnd_msg[1] is not None and dnd_msg[1] < 5:
+                await self.config.user(author).DND_MESSAGE.set((dnd_msg[0], 5))
+                dnd_msg = dnd_msg[0], 5
            if dnd_msg and author.status == discord.Status.dnd:
                if type(dnd_msg) in [tuple, list]:
                    dnd_msg, delete_after = dnd_msg
                else:
                    delete_after = None
-                if embed_links and not text_only:
+                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)
-                elif (embed_links and text_only) or not embed_links:
+                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)
                continue
            offline_msg = user_data["OFFLINE_MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            if isinstance(offline_msg, list) and offline_msg[1] is not None and offline_msg[1] < 5:
+                await self.config.user(author).OFFLINE_MESSAGE.set((offline_msg[0], 5))
+                offline_msg = offline_msg[0], 5
            if offline_msg and author.status == discord.Status.offline:
                if type(offline_msg) in [tuple, list]:
                    offline_msg, delete_after = offline_msg
                else:
                    delete_after = None
-                if embed_links and not text_only:
+                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)
-                elif (embed_links and text_only) or not embed_links:
+                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)
                continue
            streaming_msg = user_data["STREAMING_MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            if isinstance(streaming_msg, list) and streaming_msg[1] is not None and streaming_msg[1] < 5:
+                await self.config.user(author).STREAMING_MESSAGE.set((streaming_msg[0], 5))
+                streaming_msg = streaming_msg[0], 5
            if streaming_msg and type(author.activity) is discord.Streaming:
                streaming_msg, delete_after = streaming_msg
-                if embed_links and not text_only:
+                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)
-                elif (embed_links and text_only) or not embed_links:
+                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)
                continue
@@ -325,20 +328,24 @@ class Away(commands.Cog):
                if not stream_status:
                    continue
                streaming_msg, delete_after = streaming_msg
-                if embed_links and not text_only:
+                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)
-                elif (embed_links and text_only) or not embed_links:
+                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)
                continue
            listening_msg = user_data["LISTENING_MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            if isinstance(listening_msg, list) and listening_msg[1] is not None and listening_msg[1] < 5:
+                await self.config.user(author).LISTENING_MESSAGE.set((listening_msg[0], 5))
+                listening_msg = listening_msg[0], 5
            if listening_msg and type(author.activity) is discord.Spotify:
                listening_msg, delete_after = listening_msg
-                if embed_links and not text_only:
+                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)
-                elif (embed_links and text_only) or not embed_links:
+                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)
                continue
@@ -347,23 +354,27 @@ class Away(commands.Cog):
                if not listening_status:
                    continue
                listening_msg, delete_after = listening_msg
-                if embed_links and not text_only:
+                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)
-                elif (embed_links and text_only) or not embed_links:
+                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)
                continue
            gaming_msgs = user_data["GAME_MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            if isinstance(gaming_msgs, list) and gaming_msgs[1] is not None and gaming_msgs[1] < 5:
+                await self.config.user(author).GAME_MESSAGE.set((gaming_msgs[0], 5))
+                gaming_msgs = gaming_msgs[0], 5
            if gaming_msgs and type(author.activity) in [discord.Game, discord.Activity]:
                for game in gaming_msgs:
                    if game in author.activity.name.lower():
                        game_msg, delete_after = gaming_msgs[game]
-                        if embed_links and not text_only:
+                        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)
                            break  # Let's not accidentally post more than one
-                        elif (embed_links and text_only) or not embed_links:
+                        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)
                            break
@@ -374,11 +385,11 @@ class Away(commands.Cog):
                for game in gaming_msgs:
                    if game in game_status[0].name.lower():
                        game_msg, delete_after = gaming_msgs[game]
-                        if embed_links and not text_only:
+                        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)
                            break  # Let's not accidentally post more than one
-                        elif (embed_links and text_only) or not embed_links:
+                        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)
                            break
@@ -388,27 +399,22 @@ class Away(commands.Cog):
        """
        Tell the bot you're away or back.

-        `delete_after` Optional seconds to delete the automatic reply
+        `delete_after` Optional seconds to delete the automatic reply. Must be minimum 5 seconds
        `message` The custom message to display when you're mentioned
        """
+        if delete_after is not None and delete_after < 5:
+            return await ctx.send("Please set a time longer than 5 seconds for the `delete_after` argument")
+
        author = ctx.message.author
-        mess = await self._away.user(author).MESSAGE()
+        mess = await self.config.user(author).MESSAGE()
        if mess:
-            await self._away.user(author).MESSAGE.set(False)
+            await self.config.user(author).MESSAGE.set(False)
            msg = "You're now back."
        else:
-            if message is None and len(ctx.message.attachments) == 0:
-                await self._away.user(author).MESSAGE.set((" ", delete_after))
+            if message is None:
+                await self.config.user(author).MESSAGE.set((" ", delete_after))
            else:
-                if len(ctx.message.attachments) > 0:
-                    link = IMAGE_LINKS.search(ctx.message.attachments[0].url)
-                    url = link.group(0)
-                    if link:
-                        if message:
-                            message = f"{message} {url}"
-                        else:
-                            message = url
-                await self._away.user(author).MESSAGE.set((message, delete_after))
+                await self.config.user(author).MESSAGE.set((message, delete_after))
            msg = "You're now set as away."
        await ctx.send(msg)

@@ -417,19 +423,22 @@ class Away(commands.Cog):
        """
        Set an automatic reply when you're idle.

-        `delete_after` Optional seconds to delete the automatic reply
+        `delete_after` Optional seconds to delete the automatic reply. Must be minimum 5 seconds
        `message` The custom message to display when you're mentioned
        """
+        if delete_after is not None and delete_after < 5:
+            return await ctx.send("Please set a time longer than 5 seconds for the `delete_after` argument")
+
        author = ctx.message.author
-        mess = await self._away.user(author).IDLE_MESSAGE()
+        mess = await self.config.user(author).IDLE_MESSAGE()
        if mess:
-            await self._away.user(author).IDLE_MESSAGE.set(False)
+            await self.config.user(author).IDLE_MESSAGE.set(False)
            msg = "The bot will no longer reply for you when you're idle."
        else:
            if message is None:
-                await self._away.user(author).IDLE_MESSAGE.set((" ", delete_after))
+                await self.config.user(author).IDLE_MESSAGE.set((" ", delete_after))
            else:
-                await self._away.user(author).IDLE_MESSAGE.set((message, delete_after))
+                await self.config.user(author).IDLE_MESSAGE.set((message, delete_after))
            msg = "The bot will now reply for you when you're idle."
        await ctx.send(msg)

@@ -438,19 +447,22 @@ class Away(commands.Cog):
        """
        Set an automatic reply when you're offline.

-        `delete_after` Optional seconds to delete the automatic reply
+        `delete_after` Optional seconds to delete the automatic reply. Must be minimum 5 seconds
        `message` The custom message to display when you're mentioned
        """
+        if delete_after is not None and delete_after < 5:
+            return await ctx.send("Please set a time longer than 5 seconds for the `delete_after` argument")
+
        author = ctx.message.author
-        mess = await self._away.user(author).OFFLINE_MESSAGE()
+        mess = await self.config.user(author).OFFLINE_MESSAGE()
        if mess:
-            await self._away.user(author).OFFLINE_MESSAGE.set(False)
+            await self.config.user(author).OFFLINE_MESSAGE.set(False)
            msg = "The bot will no longer reply for you when you're offline."
        else:
            if message is None:
-                await self._away.user(author).OFFLINE_MESSAGE.set((" ", delete_after))
+                await self.config.user(author).OFFLINE_MESSAGE.set((" ", delete_after))
            else:
-                await self._away.user(author).OFFLINE_MESSAGE.set((message, delete_after))
+                await self.config.user(author).OFFLINE_MESSAGE.set((message, delete_after))
            msg = "The bot will now reply for you when you're offline."
        await ctx.send(msg)

@@ -459,19 +471,22 @@ class Away(commands.Cog):
        """
        Set an automatic reply when you're dnd.

-        `delete_after` Optional seconds to delete the automatic reply
+        `delete_after` Optional seconds to delete the automatic reply. Must be minimum 5 seconds
        `message` The custom message to display when you're mentioned
        """
+        if delete_after is not None and delete_after < 5:
+            return await ctx.send("Please set a time longer than 5 seconds for the `delete_after` argument")
+
        author = ctx.message.author
-        mess = await self._away.user(author).DND_MESSAGE()
+        mess = await self.config.user(author).DND_MESSAGE()
        if mess:
-            await self._away.user(author).DND_MESSAGE.set(False)
+            await self.config.user(author).DND_MESSAGE.set(False)
            msg = "The bot will no longer reply for you when you're set to do not disturb."
        else:
            if message is None:
-                await self._away.user(author).DND_MESSAGE.set((" ", delete_after))
+                await self.config.user(author).DND_MESSAGE.set((" ", delete_after))
            else:
-                await self._away.user(author).DND_MESSAGE.set((message, delete_after))
+                await self.config.user(author).DND_MESSAGE.set((message, delete_after))
            msg = "The bot will now reply for you when you're set to do not disturb."
        await ctx.send(msg)

@@ -480,19 +495,22 @@ class Away(commands.Cog):
        """
        Set an automatic reply when you're streaming.

-        `delete_after` Optional seconds to delete the automatic reply
+        `delete_after` Optional seconds to delete the automatic reply. Must be minimum 5 seconds
        `message` The custom message to display when you're mentioned
        """
+        if delete_after is not None and delete_after < 5:
+            return await ctx.send("Please set a time longer than 5 seconds for the `delete_after` argument")
+
        author = ctx.message.author
-        mess = await self._away.user(author).STREAMING_MESSAGE()
+        mess = await self.config.user(author).STREAMING_MESSAGE()
        if mess:
-            await self._away.user(author).STREAMING_MESSAGE.set(False)
+            await self.config.user(author).STREAMING_MESSAGE.set(False)
            msg = "The bot will no longer reply for you when you're mentioned while streaming."
        else:
            if message is None:
-                await self._away.user(author).STREAMING_MESSAGE.set((" ", delete_after))
+                await self.config.user(author).STREAMING_MESSAGE.set((" ", delete_after))
            else:
-                await self._away.user(author).STREAMING_MESSAGE.set((message, delete_after))
+                await self.config.user(author).STREAMING_MESSAGE.set((message, delete_after))
            msg = "The bot will now reply for you when you're mentioned while streaming."
        await ctx.send(msg)

@@ -501,16 +519,19 @@ class Away(commands.Cog):
        """
        Set an automatic reply when you're listening to Spotify.

-        `delete_after` Optional seconds to delete the automatic reply
+        `delete_after` Optional seconds to delete the automatic reply. Must be minimum 5 seconds
        `message` The custom message to display when you're mentioned
        """
+        if delete_after is not None and delete_after < 5:
+            return await ctx.send("Please set a time longer than 5 seconds for the `delete_after` argument")
+
        author = ctx.message.author
-        mess = await self._away.user(author).LISTENING_MESSAGE()
+        mess = await self.config.user(author).LISTENING_MESSAGE()
        if mess:
-            await self._away.user(author).LISTENING_MESSAGE.set(False)
+            await self.config.user(author).LISTENING_MESSAGE.set(False)
            msg = "The bot will no longer reply for you when you're mentioned while listening to Spotify."
        else:
-            await self._away.user(author).LISTENING_MESSAGE.set((message, delete_after))
+            await self.config.user(author).LISTENING_MESSAGE.set((message, delete_after))
            msg = "The bot will now reply for you when you're mentioned while listening to Spotify."
        await ctx.send(msg)

@@ -520,27 +541,31 @@ class Away(commands.Cog):
        Set an automatic reply when you're playing a specified game.

        `game` The game you would like automatic responses for
-        `delete_after` Optional seconds to delete the automatic reply
+        `delete_after` Optional seconds to delete the automatic reply. Must be minimum 5 seconds
        `message` The custom message to display when you're mentioned

        Use "double quotes" around a game's name if it is more than one word.
        """
+        if delete_after is not None and delete_after < 5:
+            return await ctx.send("Please set a time longer than 5 seconds for the `delete_after` argument")
+
        author = ctx.message.author
-        mess = await self._away.user(author).GAME_MESSAGE()
+        mess = await self.config.user(author).GAME_MESSAGE()
        if game.lower() in mess:
            del mess[game.lower()]
-            await self._away.user(author).GAME_MESSAGE.set(mess)
+            await self.config.user(author).GAME_MESSAGE.set(mess)
            msg = f"The bot will no longer reply for you when you're playing {game}."
        else:
            if message is None:
                mess[game.lower()] = (" ", delete_after)
            else:
                mess[game.lower()] = (message, delete_after)
-            await self._away.user(author).GAME_MESSAGE.set(mess)
+            await self.config.user(author).GAME_MESSAGE.set(mess)
            msg = f"The bot will now reply for you when you're playing {game}."
        await ctx.send(msg)

    @commands.command(name="toggleaway")
+    @commands.guild_only()
    @checks.admin_or_permissions(administrator=True)
    async def _ignore(self, ctx, member: discord.Member=None):
        """
@@ -550,31 +575,32 @@ class Away(commands.Cog):
        """
        guild = ctx.message.guild
        if member:
-            bl_mems = await self._away.guild(guild).BLACKLISTED_MEMBERS()
+            bl_mems = await self.config.guild(guild).BLACKLISTED_MEMBERS()
            if member.id not in bl_mems:
                bl_mems.append(member.id)
-                await self._away.guild(guild).BLACKLISTED_MEMBERS.set(bl_mems)
+                await self.config.guild(guild).BLACKLISTED_MEMBERS.set(bl_mems)
                msg = f"Away messages will not appear when {member.display_name} is mentioned in this guild."
                await ctx.send(msg)
            elif member.id in bl_mems:
                bl_mems.remove(member.id)
-                await self._away.guild(guild).BLACKLISTED_MEMBERS.set(bl_mems)
+                await self.config.guild(guild).BLACKLISTED_MEMBERS.set(bl_mems)
                msg = f"Away messages will appear when {member.display_name} is mentioned in this guild."
                await ctx.send(msg)
            return
-        if guild.id in (await self._away.ign_servers()):
-            guilds = await self._away.ign_servers()
+        if guild.id in (await self.config.ign_servers()):
+            guilds = await self.config.ign_servers()
            guilds.remove(guild.id)
-            await self._away.ign_servers.set(guilds)
+            await self.config.ign_servers.set(guilds)
            message = "Not ignoring this guild anymore."
        else:
-            guilds = await self._away.ign_servers()
+            guilds = await self.config.ign_servers()
            guilds.append(guild.id)
-            await self._away.ign_servers.set(guilds)
+            await self.config.ign_servers.set(guilds)
            message = "Ignoring this guild."
        await ctx.send(message)

    @commands.command()
+    @commands.guild_only()
    @checks.admin_or_permissions(administrator=True)
    async def awaytextonly(self, ctx):
        """
@@ -582,14 +608,14 @@ class Away(commands.Cog):

        This overrides the embed_links check this cog uses for message sending.
        """
-        text_only = await self._away.guild(ctx.guild).TEXT_ONLY()
+        text_only = await self.config.guild(ctx.guild).TEXT_ONLY()
        if text_only:
            message = "Away messages will now be embedded or text only based on the bot's permissions for embed links."
        else:
            message = (
                "Away messages are now forced to be text only, regardless of the bot's permissions for embed links."
            )
-        await self._away.guild(ctx.guild).TEXT_ONLY.set(not text_only)
+        await self.config.guild(ctx.guild).TEXT_ONLY.set(not text_only)
        await ctx.send(message)

    @commands.command(name="awaysettings", aliases=["awayset"])
@@ -605,7 +631,7 @@ class Away(commands.Cog):
            "LISTENING_MESSAGE": "Listening",
            "STREAMING_MESSAGE": "Streaming",
        }
-        settings = await self._away.user(author).get_raw()
+        settings = await self.config.user(author).get_raw()
        for attr, name in data.items():
            if type(settings[attr]) in [tuple, list]:
                # This is just to keep backwards compatibility
@@ -640,7 +666,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)
--- a/away/info.json
+++ b/away/info.json
@@ -1,13 +1,8 @@
 {
-	"author": [
-		"aikaterna",
-        "Axas"
-	],
-	"description": "Set and unset a user as being away. Originally by Paddo.",
-	"short": "Away message toggle for users",
-	"tags": [
-		"away"
-	],
-	"type": "COG",
-	"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."
-}
+    "author": ["aikaterna", "Axas", "TrustyJAID"],
+    "description": "Set and unset a user as being away. Originally by Paddo.",
+    "short": "Away message toggle for users",
+    "tags": ["away", "afk"],
+    "type": "COG",
+    "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."
+}
--- a/blurplefy/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(Blurplefy(bot))
+async def setup(bot):
+    await bot.add_cog(Blurplefy(bot))
--- a/blurplefy/blurplefy.py
+++ b/blurplefy/blurplefy.py
@@ -85,14 +85,14 @@ class Blurplefy(commands.Cog):
        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:
                response = await r.read()
@@ -109,7 +109,7 @@ class Blurplefy(commands.Cog):
        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,7 +117,7 @@ class Blurplefy(commands.Cog):
                    picture = image.url
                    role_check = False
        else:
-            picture = user.avatar_url
+            picture = user.avatar.url
            role_check = False

        try:
@@ -156,9 +156,9 @@ class Blurplefy(commands.Cog):
        embed = discord.Embed(title="", colour=0x7289DA)
        embed.add_field(name="Total amount of Blurple", value="{}%".format(blurplenesspercentage), inline=False)
        embed.add_field(name="Blurple (rgb(114, 137, 218))", value="{}%".format(percentblurple), inline=True)
-        embed.add_field(name="White (rgb(255, 255, 255))", value="{}\%".format(percentwhite), inline=True)
+        embed.add_field(name="White (rgb(255, 255, 255))", value="{}\\%".format(percentwhite), inline=True)
        embed.add_field(
-            name="Dark Blurple (rgb(78, 93, 148))", value="{}\%".format(percentdblurple), inline=True,
+            name="Dark Blurple (rgb(78, 93, 148))", value="{}\\%".format(percentdblurple), inline=True,
        )
        embed.add_field(
            name="Guide",
@@ -180,7 +180,7 @@ class Blurplefy(commands.Cog):
            blurple_role_obj = discord.utils.get(ctx.guild.roles, id=blurple_role_id)
            if (
                blurplenesspercentage > 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
            ):
@@ -190,7 +190,7 @@ class Blurplefy(commands.Cog):
                    )
                )
                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(
                    "{}, 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(
                        ctx.message.author.display_name, blurple_role_obj.name
@@ -206,14 +206,14 @@ class Blurplefy(commands.Cog):
        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:
                response = await r.read()
@@ -379,13 +379,15 @@ class Blurplefy(commands.Cog):

    @commands.command()
    async def countdown(self, ctx):
-        """Countdown to Discord's 6th Anniversary."""
-        embed = discord.Embed(name="", colour=0x7289DA)
-        timeleft = datetime.datetime(2020, 5, 13) + datetime.timedelta(hours=7) - datetime.datetime.utcnow()
-        embed.set_author(name="Time left until Discord's 6th Anniversary")
+        """Countdown to Discord's 7th Anniversary."""
+        embed = discord.Embed()
+        embed.description="\N{ZERO WIDTH SPACE}"
+        embed.colour=0x7289DA
+        timeleft = datetime.datetime(2021, 5, 13, tzinfo=datetime.timezone.utc) + datetime.timedelta(hours=7) - discord.utils.utcnow()
+        embed.set_author(name="Time left until Discord's 7th Anniversary")
        if int(timeleft.total_seconds()) < 0:
-            timeleft = datetime.datetime(2021, 5, 13) + datetime.timedelta(hours=7) - datetime.datetime.utcnow()
-            embed.set_author(name="Time left until Discord's 6th Anniversary")
+            timeleft = datetime.datetime(2022, 5, 13, tzinfo=datetime.timezone.utc) + datetime.timedelta(hours=7) - discord.utils.utcnow()
+            embed.set_author(name="Time left until Discord's 7th Anniversary")
        embed.add_field(
            name="Countdown to midnight, May 13, California time (UTC-7):",
            value=("{}".format(self._dynamic_time(int(timeleft.total_seconds())))),
--- a/blurplefy/info.json
+++ b/blurplefy/info.json
@@ -1,23 +1,11 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Blurplefy a user profile picture or image. Admins can configure an awardable role if a user's profile pic has more than a certain percentage of blurple in it.",
+    "author": ["aikaterna"],
+    "description": "Blurplefy a user profile picture or image. Admins can configure an awardable role if a user's profile pic has more than a certain percentage of blurple in it.",
    "install_msg": "Thanks for installing, have fun.",
-    "permissions" : [
-		"embed_links",
-		"manage_roles"
-	],
-	"requirements": [
-		"pillow",
-		"python-resize-image"
-	],
-	"short": "Blurplefy a user profile picture or image.",
-	"tags": [
-		"blurple",
-        "image",
-        "profile"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
+    "permissions" : ["embed_links", "manage_roles"],
+    "requirements": ["pillow", "python-resize-image"],
+    "short": "Blurplefy a user profile picture or image.",
+    "tags": ["blurple", "discord", "avatar"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
--- a/cah/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(CardsAgainstHumanity(bot))
+async def setup(bot):
+    await bot.add_cog(CardsAgainstHumanity(bot))
--- a/cah/cah.py
+++ b/cah/cah.py
@@ -374,7 +374,11 @@ class CardsAgainstHumanity(commands.Cog):
                    member["Task"] = None
        # Set running to false
        game["Running"] = False
-        self.games.remove(game)
+        try:
+            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):
@@ -702,7 +706,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") as deck_file:
+        with open(str(bundled_data_path(self)) + "/deck.json", "r", encoding='utf-8') as deck_file:
            deck = json.load(deck_file)
        # Draws a random unused card and shuffles the deck if needed
        totalDiscard = len(game["Discard"])
@@ -752,7 +756,7 @@ class CardsAgainstHumanity(commands.Cog):
                    i += 1

    async def drawBCard(self, game):
-        with open(str(bundled_data_path(self)) + "/deck.json", "r") as deck_file:
+        with open(str(bundled_data_path(self)) + "/deck.json", "r", encoding='utf-8') as deck_file:
            deck = json.load(deck_file)
        # Draws a random black card
        totalDiscard = len(game["BDiscard"])
@@ -890,7 +894,11 @@ 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
@@ -901,7 +909,10 @@ class CardsAgainstHumanity(commands.Cog):
            else:
                # Update member's time
                member["Time"] = int(time.time())
-        await self.sendToUser(ctx.author, "Message sent!")
+        msg = "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):
@@ -1069,7 +1080,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.")
@@ -1119,7 +1130,9 @@ class CardsAgainstHumanity(commands.Cog):
        task = self.bot.loop.create_task(self.checkCards(ctx, newGame))
        self.games.append(newGame)
        # Tell the user they created a new game and list its ID
-        await ctx.send(f"You created game id: *{gameID}*")
+        msg = f"{ctx.author.name} created a Cards Against Humanity game with ID#: **{gameID}**\n"
+        msg += f"To join the game, type `{ctx.prefix}joincah {gameID}`"
+        await ctx.send(msg)
        await self.drawCards(ctx.author)
        # await self.showHand(ctx, ctx.author)
        # await self.nextPlay(ctx, newGame)
--- a/cah/info.json
+++ b/cah/info.json
@@ -1,19 +1,10 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Cards Against Humanity, played in DMs.",
+    "author": ["aikaterna"],
+    "description": "Cards Against Humanity, played in DMs.",
    "install_msg": "Warning: This cog can send a lot of DMs, and the bot can become rate limited. Be warned that installing this cog on a bot with a lot of users or servers might be detrimental to the bot's performance. Thanks for installing, have fun.",
-    "permissions" : [
-		"embed_links",
-		"manage_roles"
-	],
-	"short": "Cards Against Humanity.",
-	"tags": [
-		"CAH",
-        "cards",
-        "games"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
+    "permissions" : ["embed_links"],
+    "short": "Cards Against Humanity.",
+    "tags": ["CAH", "cards", "game"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
--- a/chatchart/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(Chatchart(bot))
+async def setup(bot):
+    await bot.add_cog(Chatchart(bot))
--- a/chatchart/chatchart.py
+++ b/chatchart/chatchart.py
@@ -8,17 +8,15 @@ import asyncio
 import discord
 import heapq
 from io import BytesIO
-from typing import Optional
+from typing import List, Optional, Tuple, Union
+
+from redbot.core import checks, commands, Config

 import matplotlib
-
 matplotlib.use("agg")
 import matplotlib.pyplot as plt
-
 plt.switch_backend("agg")

-from redbot.core import commands, Config
-

 class Chatchart(commands.Cog):
    """Show activity."""
@@ -32,22 +30,68 @@ class Chatchart(commands.Cog):
        self.config = Config.get_conf(self, 2766691001, force_registration=True)

        default_guild = {"channel_deny": []}
+        default_global = {"limit": 0}

        self.config.register_guild(**default_guild)
+        self.config.register_global(**default_global)

    @staticmethod
-    async def create_chart(top, others, channel):
+    def calculate_member_perc(history: List[discord.Message]) -> dict:
+        """Calculate the member count from the message history"""
+        msg_data = {"total_count": 0, "users": {}}
+        for msg in history:
+            # Name formatting
+            if len(msg.author.display_name) >= 20:
+                short_name = "{}...".format(msg.author.display_name[:20]).replace("$", "\\$")
+            else:
+                short_name = msg.author.display_name.replace("$", "\\$").replace("_", "\\_ ").replace("*", "\\*")
+            whole_name = "{}#{}".format(short_name, msg.author.discriminator)
+            if msg.author.bot:
+                pass
+            elif whole_name in msg_data["users"]:
+                msg_data["users"][whole_name]["msgcount"] += 1
+                msg_data["total_count"] += 1
+            else:
+                msg_data["users"][whole_name] = {}
+                msg_data["users"][whole_name]["msgcount"] = 1
+                msg_data["total_count"] += 1
+        return msg_data
+
+    @staticmethod
+    def calculate_top(msg_data: dict) -> Tuple[list, int]:
+        """Calculate the top 20 from the message data package"""
+        for usr in msg_data["users"]:
+            pd = float(msg_data["users"][usr]["msgcount"]) / float(msg_data["total_count"])
+            msg_data["users"][usr]["percent"] = pd * 100
+        top_twenty = heapq.nlargest(
+            20,
+            [
+                (x, msg_data["users"][x][y])
+                for x in msg_data["users"]
+                for y in msg_data["users"][x]
+                if (y == "percent" and msg_data["users"][x][y] > 0)
+            ],
+            key=lambda x: x[1],
+        )
+        others = 100 - sum(x[1] for x in top_twenty)
+        return top_twenty, others
+
+    @staticmethod
+    async def create_chart(top, others, channel_or_guild: Union[discord.Guild, discord.TextChannel]):
        plt.clf()
        sizes = [x[1] for x in top]
-        labels = ["{} {:g}%".format(x[0], x[1]) for x in top]
+        labels = ["{} {:g}%".format(x[0], round(x[1], 1)) for x in top]
        if len(top) >= 20:
            sizes = sizes + [others]
-            labels = labels + ["Others {:g}%".format(others)]
-        if len(channel.name) >= 19:
-            channel_name = "{}...".format(channel.name[:19])
+            labels = labels + ["Others {:g}%".format(round(others, 1))]
+        if len(channel_or_guild.name) >= 19:
+            if isinstance(channel_or_guild, discord.Guild):
+                channel_or_guild_name = "{}...".format(channel_or_guild.name[:19])
+            else:
+                channel_or_guild_name = "#{}...".format(channel_or_guild.name[:19])
        else:
-            channel_name = channel.name
-        title = plt.title("Stats in #{}".format(channel_name), color="white")
+            channel_or_guild_name = channel_or_guild.name
+        title = plt.title("Stats in {}".format(channel_or_guild_name), color="white")
        title.set_va("top")
        title.set_ha("center")
        plt.gca().axis("equal")
@@ -90,99 +134,175 @@ class Chatchart(commands.Cog):
        image_object.seek(0)
        return image_object

+    async def fetch_channel_history(
+        self,
+        channel: discord.TextChannel,
+        animation_message: discord.Message,
+        messages: int
+    ) -> List[discord.Message]:
+        """Fetch the history of a channel while displaying an status message with it"""
+        animation_message_deleted = False
+        history = []
+        history_counter = 0
+        async for msg in channel.history(limit=messages):
+            history.append(msg)
+            history_counter += 1
+            await asyncio.sleep(0.005)
+            if history_counter % 250 == 0:
+                new_embed = discord.Embed(
+                    title=f"Fetching messages from #{channel.name}",
+                    description=f"This might take a while...\n{history_counter}/{messages} messages gathered",
+                    colour=await self.bot.get_embed_colour(location=channel),
+                )
+                if channel.permissions_for(channel.guild.me).send_messages:
+                    await channel.trigger_typing()
+                if animation_message_deleted is False:
+                    try:
+                        await animation_message.edit(embed=new_embed)
+                    except discord.NotFound:
+                        animation_message_deleted = True
+        return history
+
    @commands.guild_only()
    @commands.command()
-    @commands.cooldown(1, 10, commands.BucketType.channel)
-    @commands.max_concurrency(1, commands.BucketType.channel)
+    @commands.cooldown(1, 10, commands.BucketType.guild)
+    @commands.max_concurrency(1, commands.BucketType.guild)
    @commands.bot_has_permissions(attach_files=True)
-    async def chatchart(self, ctx, channel: Optional[discord.TextChannel] = None, messages=5000):
+    async def chatchart(self, ctx, channel: Optional[discord.TextChannel] = None, messages:int = 5000):
        """
        Generates a pie chart, representing the last 5000 messages in the specified channel.
        """
        if channel is None:
            channel = ctx.channel
-        deny = await self.config.guild(ctx.guild).channel_deny()
-        if channel.id in deny:
-            return await ctx.send(f"I am not allowed to create a chatchart of {channel.mention}.")
-        e = discord.Embed(
-            description="This might take a while...", colour=await self.bot.get_embed_colour(location=channel)
-        )
-        em = await ctx.send(embed=e)

-        history = []
-        history_counter = 0
-
-        if not channel.permissions_for(ctx.message.author).read_messages == True:
-            try:
-                await em.delete()
-            except discord.NotFound:
-                pass
+        # --- Early terminations
+        if channel.permissions_for(ctx.message.author).read_messages is False:
            return await ctx.send("You're not allowed to access that channel.")
+        if channel.permissions_for(ctx.guild.me).read_messages is False:
+            return await ctx.send("I cannot read the history of that channel.")
+        blacklisted_channels = await self.config.guild(ctx.guild).channel_deny()
+        if channel.id in blacklisted_channels:
+            return await ctx.send(f"I am not allowed to create a chatchart of {channel.mention}.")
+        if messages < 5:
+            return await ctx.send("Don't be silly.")
+
+        message_limit = await self.config.limit()
+        if (message_limit != 0) and (messages > message_limit):
+            messages = message_limit
+
+        embed = discord.Embed(
+            title=f"Fetching messages from #{channel.name}",
+            description="This might take a while...",
+            colour=await self.bot.get_embed_colour(location=channel)
+        )
+        loading_message = await ctx.send(embed=embed)
        try:
-            async for msg in channel.history(limit=messages):
-                history.append(msg)
-                history_counter += 1
-                await asyncio.sleep(0.005)
-                if history_counter % 250 == 0:
-                    new_embed = discord.Embed(
-                        description=f"This might take a while...\n{history_counter} messages gathered",
-                        colour=await self.bot.get_embed_colour(location=channel),
-                    )
-                    await em.edit(embed=new_embed)
+            history = await self.fetch_channel_history(channel, loading_message, messages)
        except discord.errors.Forbidden:
            try:
-                await em.delete()
+                await loading_message.delete()
            except discord.NotFound:
                pass
            return await ctx.send("No permissions to read that channel.")

-        msg_data = {"total count": 0, "users": {}}
-        for msg in history:
-            if len(msg.author.display_name) >= 20:
-                short_name = "{}...".format(msg.author.display_name[:20]).replace("$", "\\$")
-            else:
-                short_name = msg.author.display_name.replace("$", "\\$")
-            whole_name = "{}#{}".format(short_name, msg.author.discriminator)
-            if msg.author.bot:
-                pass
-            elif whole_name in msg_data["users"]:
-                msg_data["users"][whole_name]["msgcount"] += 1
-                msg_data["total count"] += 1
-            else:
-                msg_data["users"][whole_name] = {}
-                msg_data["users"][whole_name]["msgcount"] = 1
-                msg_data["total count"] += 1
-
-        if msg_data["users"] == {}:
+        msg_data = self.calculate_member_perc(history)
+        # If no members are found.
+        if len(msg_data["users"]) == 0:
            try:
-                await em.delete()
+                await loading_message.delete()
            except discord.NotFound:
                pass
            return await ctx.send(f"Only bots have sent messages in {channel.mention} or I can't read message history.")

-        for usr in msg_data["users"]:
-            pd = float(msg_data["users"][usr]["msgcount"]) / float(msg_data["total count"])
-            msg_data["users"][usr]["percent"] = round(pd * 100, 1)
-
-        top_ten = heapq.nlargest(
-            20,
-            [
-                (x, msg_data["users"][x][y])
-                for x in msg_data["users"]
-                for y in msg_data["users"][x]
-                if (y == "percent" and msg_data["users"][x][y] > 0)
-            ],
-            key=lambda x: x[1],
-        )
-        others = 100 - sum(x[1] for x in top_ten)
-        chart = await self.create_chart(top_ten, others, channel)
+        top_twenty, others = self.calculate_top(msg_data)
+        chart = await self.create_chart(top_twenty, others, channel)

        try:
-            await em.delete()
+            await loading_message.delete()
        except discord.NotFound:
            pass
        await ctx.send(file=discord.File(chart, "chart.png"))

+    @checks.mod_or_permissions(manage_guild=True)
+    @commands.guild_only()
+    @commands.command(aliases=["guildchart"])
+    @commands.cooldown(1, 30, commands.BucketType.guild)
+    @commands.max_concurrency(1, commands.BucketType.guild)
+    @commands.bot_has_permissions(attach_files=True)
+    async def serverchart(self, ctx: commands.Context, messages: int = 1000):
+        """
+        Generates a pie chart, representing the last 1000 messages from every allowed channel in the server.
+
+        As example:
+        For each channel that the bot is allowed to scan. It will take the last 1000 messages from each channel.
+        And proceed to build a chart out of that.
+        """
+        if messages < 5:
+            return await ctx.send("Don't be silly.")
+        channel_list = []
+        blacklisted_channels = await self.config.guild(ctx.guild).channel_deny()
+        for channel in ctx.guild.text_channels:
+            channel: discord.TextChannel
+            if channel.id in blacklisted_channels:
+                continue
+            if channel.permissions_for(ctx.message.author).read_messages is False:
+                continue
+            if channel.permissions_for(ctx.guild.me).read_messages is False:
+                continue
+            channel_list.append(channel)
+
+        if len(channel_list) == 0:
+            return await ctx.send("There are no channels to read... This should theoretically never happen.")
+
+        embed = discord.Embed(
+            description="Fetching messages from the entire server this **will** take a while.",
+            colour=await self.bot.get_embed_colour(location=ctx.channel),
+        )
+        global_fetch_message = await ctx.send(embed=embed)
+        global_history = []
+
+        for channel in channel_list:
+            embed = discord.Embed(
+                title=f"Fetching messages from #{channel.name}",
+                description="This might take a while...",
+                colour=await self.bot.get_embed_colour(location=channel)
+            )
+            loading_message = await ctx.send(embed=embed)
+            try:
+                history = await self.fetch_channel_history(channel, loading_message, messages)
+                global_history += history
+                await loading_message.delete()
+            except discord.errors.Forbidden:
+                try:
+                    await loading_message.delete()
+                except discord.NotFound:
+                    continue
+            except discord.NotFound:
+                try:
+                    await loading_message.delete()
+                except discord.NotFound:
+                    continue 
+
+        msg_data = self.calculate_member_perc(global_history)
+        # If no members are found.
+        if len(msg_data["users"]) == 0:
+            try:
+                await global_fetch_message.delete()
+            except discord.NotFound:
+                pass
+            return await ctx.send(f"Only bots have sent messages in this server... Wauw...")
+
+        top_twenty, others = self.calculate_top(msg_data)
+        chart = await self.create_chart(top_twenty, others, ctx.guild)
+
+        try:
+            await global_fetch_message.delete()
+        except discord.NotFound:
+            pass
+        await ctx.send(file=discord.File(chart, "chart.png"))
+
+    @checks.mod_or_permissions(manage_channels=True)
+    @commands.guild_only()
    @commands.command()
    async def ccdeny(self, ctx, channel: discord.TextChannel):
        """Add a channel to deny chatchart use."""
@@ -192,6 +312,8 @@ class Chatchart(commands.Cog):
        await self.config.guild(ctx.guild).channel_deny.set(channel_list)
        await ctx.send(f"{channel.mention} was added to the deny list for chatchart.")

+    @checks.mod_or_permissions(manage_channels=True)
+    @commands.guild_only()
    @commands.command()
    async def ccdenylist(self, ctx):
        """List the channels that are denied."""
@@ -215,6 +337,8 @@ class Chatchart(commands.Cog):
                    msg = no_channels_msg
        await ctx.send(msg)

+    @checks.mod_or_permissions(manage_channels=True)
+    @commands.guild_only()
    @commands.command()
    async def ccallow(self, ctx, channel: discord.TextChannel):
        """Remove a channel from the deny list to allow chatchart use."""
@@ -225,3 +349,18 @@ class Chatchart(commands.Cog):
            return await ctx.send("Channel is not on the deny list.")
        await self.config.guild(ctx.guild).channel_deny.set(channel_list)
        await ctx.send(f"{channel.mention} will be allowed for chatchart use.")
+
+    @checks.is_owner()
+    @commands.command()
+    async def cclimit(self, ctx, limit_amount: int = None):
+        """
+        Limit the amount of messages someone can request.
+
+        Use `0` for no limit.
+        """
+        if limit_amount is None:
+            return await ctx.send_help()
+        if limit_amount < 0:
+            return await ctx.send("You need to use a number larger than 0.")
+        await self.config.limit.set(limit_amount)
+        await ctx.send(f"Chatchart is now limited to {limit_amount} messages.")
--- a/chatchart/info.json
+++ b/chatchart/info.json
@@ -1,19 +1,10 @@
 {
-	"author": [
-		"aikaterna",
-        "Redjumpman"
-	],
-	"description": "Generate a pie chart from the last 5000 messages in a channel to see who's been talking the most.",
+    "author": ["aikaterna", "Redjumpman"],
+    "description": "Generate a pie chart from the last 5000 messages in a channel to see who's been talking the most.",
    "install_msg": "Thanks for installing, have fun.",
-	"short": "Generate a pie chart from the last 5000 messages",
-	"tags": [
-		"data",
-        "chart",
-        "activity"
-	],
-	"requirements": [
-		"matplotlib"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
+    "short": "Generate a pie chart from the last 5000 messages",
+    "tags": ["messages", "chart", "count", "activity"],
+    "requirements": ["matplotlib"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}
--- a/dadjokes/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(DadJokes(bot))
+async def setup(bot):
+    await bot.add_cog(DadJokes(bot))
--- a/dadjokes/dadjokes.py
+++ b/dadjokes/dadjokes.py
@@ -15,7 +15,12 @@ class DadJokes(commands.Cog):
    @commands.command()
    async def dadjoke(self, ctx):
        """Gets a random dad joke."""
-        api = "https://icanhazdadjoke.com/"
-        async with aiohttp.request("GET", api, headers={"Accept": "text/plain"}) as r:
-            result = await r.text()
-            await ctx.send(f"`{result}`")
+        try:
+            async with aiohttp.request("GET", "https://icanhazdadjoke.com/", headers={"Accept": "text/plain"}) as r:
+                if r.status != 200:
+                    return await ctx.send("Oops! Cannot get a dad joke...")
+                result = await r.text(encoding="UTF-8")
+        except aiohttp.ClientConnectionError:
+            return await ctx.send("Oops! Cannot get a dad joke...")
+
+        await ctx.send(f"`{result}`")
--- a/dadjokes/info.json
+++ b/dadjokes/info.json
@@ -1,11 +1,9 @@
 {
-	"author": [
-		"UltimatePancake"
-	],
-	"description": "Gets a random dad joke from icanhazdadjoke.com",
+    "author": ["UltimatePancake"],
+    "description": "Gets a random dad joke from icanhazdadjoke.com",
    "install_msg": "Gets a random dad joke from icanhazdadjoke.com. Thanks for installing.",
-	"short": "Random dad jokes",
-	"tags": ["jokes", "dad", "dadjokes"],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
+    "short": "Random dad jokes",
+    "tags": ["jokes", "dad", "dadjokes"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
--- a/dictionary/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(Dictionary(bot))
+async def setup(bot):
+    await bot.add_cog(Dictionary(bot))
--- a/dictionary/dictionary.py
+++ b/dictionary/dictionary.py
@@ -1,5 +1,8 @@
 import aiohttp
+import discord
+import contextlib
 from bs4 import BeautifulSoup
+import json
 import logging
 import re
 from redbot.core import commands
@@ -10,11 +13,13 @@ log = logging.getLogger("red.aikaterna.dictionary")


 class Dictionary(commands.Cog):
-    """Word, yo
-    Parts of this cog are adapted from the PyDictionary library."""
+    """
+    Word, yo
+    Parts of this cog are adapted from the PyDictionary library.
+    """

    async def red_delete_data_for_user(self, **kwargs):
-        """ Nothing to delete """
+        """Nothing to delete"""
        return

    def __init__(self, bot):
@@ -24,41 +29,6 @@ class Dictionary(commands.Cog):
    def cog_unload(self):
        self.bot.loop.create_task(self.session.close())

-    async def _get_soup_object(self, url):
-        try:
-            async with self.session.request("GET", url) as response:
-                return BeautifulSoup(await response.text(), "html.parser")
-        except Exception:
-            log.error("Error fetching dictionary.py related webpage", exc_info=True)
-            return None
-
-    @commands.command()
-    async def antonym(self, ctx, *, word: str):
-        """Displays antonyms for a given word."""
-        search_term = word.split(" ", 1)[0]
-        result = await self._antonym(ctx, search_term)
-        if not result:
-            await ctx.send("This word is not in the dictionary.")
-            return 
-
-        result_text = "*, *".join(result)
-        msg = f"Antonyms for **{search_term}**: *{result_text}*"
-        for page in pagify(msg, delims=["\n"]):
-            await ctx.send(page)
-
-    async def _antonym(self, ctx, word):
-        data = await self._get_soup_object(f"http://www.thesaurus.com/browse/{word}")
-        if not data:
-            return await ctx.send("Error fetching data.")
-        section = data.find_all("ul", {"class": "css-1ytlws2 et6tpn80"})
-        try:
-            section[1]
-        except IndexError:
-            return
-        spans = section[1].findAll("li")
-        antonyms = [span.text for span in spans[:50]]
-        return antonyms
-
    @commands.command()
    async def define(self, ctx, *, word: str):
        """Displays definitions of a given word."""
@@ -67,7 +37,8 @@ class Dictionary(commands.Cog):
        result = await self._definition(ctx, search_term)
        str_buffer = ""
        if not result:
-            await search_msg.delete()
+            with contextlib.suppress(discord.NotFound):
+                await search_msg.delete()
            await ctx.send("This word is not in the dictionary.")
            return
        for key in result:
@@ -86,7 +57,8 @@ class Dictionary(commands.Cog):
                    else:
                        str_buffer += f"{str(counter)}. {val}\n"
                        counter += 1
-        await search_msg.delete()
+        with contextlib.suppress(discord.NotFound):
+            await search_msg.delete()
        for page in pagify(str_buffer, delims=["\n"]):
            await ctx.send(page)

@@ -112,29 +84,74 @@ class Dictionary(commands.Cog):
            out[name] = meanings
        return out

-    async def _synonym(self, ctx, word):
-        data = await self._get_soup_object(f"http://www.thesaurus.com/browse/{word}")
-        if not data:
-            return await ctx.send("Error fetching data.")
-        section = data.find_all("ul", {"class": "css-1ytlws2 et6tpn80"})
-        try:
-            section[1]
-        except IndexError:
+    @commands.command()
+    async def antonym(self, ctx, *, word: str):
+        """Displays antonyms for a given word."""
+        search_term = word.split(" ", 1)[0]
+        result = await self._antonym_or_synonym(ctx, "antonyms", search_term)
+        if not result:
+            await ctx.send("This word is not in the dictionary or nothing was found.")
            return
-        spans = section[0].findAll("li")
-        synonyms = [span.text for span in spans[:50]]
-        return synonyms
+
+        result_text = "*, *".join(result)
+        msg = f"Antonyms for **{search_term}**: *{result_text}*"
+        for page in pagify(msg, delims=["\n"]):
+            await ctx.send(page)

    @commands.command()
    async def synonym(self, ctx, *, word: str):
        """Displays synonyms for a given word."""
        search_term = word.split(" ", 1)[0]
-        result = await self._synonym(ctx, search_term)
+        result = await self._antonym_or_synonym(ctx, "synonyms", search_term)
        if not result:
-            await ctx.send("This word is not in the dictionary.")
+            await ctx.send("This word is not in the dictionary or nothing was found.")
            return

        result_text = "*, *".join(result)
        msg = f"Synonyms for **{search_term}**: *{result_text}*"
        for page in pagify(msg, delims=["\n"]):
            await ctx.send(page)
+
+    async def _antonym_or_synonym(self, ctx, lookup_type, word):
+        if lookup_type not in ["antonyms", "synonyms"]:
+            return None
+        data = await self._get_soup_object(f"http://www.thesaurus.com/browse/{word}")
+        if not data:
+            await ctx.send("Error getting information from the website.")
+            return
+
+        website_data = None
+        script = data.find_all("script")
+        for item in script:
+            if item.string:
+                if "window.INITIAL_STATE" in item.string:
+                    content = item.string
+                    content = content.lstrip("window.INITIAL_STATE =").rstrip(";")
+                    content = content.replace("undefined", '"None"').replace(": true", ': "True"').replace(": false", ': "False"')
+                    try:
+                        website_data = json.loads(content)
+                    except json.decoder.JSONDecodeError:
+                        return None
+                    except Exception as e:
+                        log.exception(e, exc_info=e)
+                        await ctx.send("Something broke. Check your console for more information.")
+                        return None
+
+        final = []
+        if website_data:
+            tuna_api_data = website_data["searchData"]["tunaApiData"]
+            if not tuna_api_data:
+                return None
+            syn_list = tuna_api_data["posTabs"][0][lookup_type]
+            for syn in syn_list:
+                final.append(syn["term"])
+
+        return final
+
+    async def _get_soup_object(self, url):
+        try:
+            async with self.session.request("GET", url) as response:
+                return BeautifulSoup(await response.text(), "html.parser")
+        except Exception:
+            log.error("Error fetching dictionary.py related webpage", exc_info=True)
+            return None
--- a/dictionary/info.json
+++ b/dictionary/info.json
@@ -1,16 +1,10 @@
 {
-	"author": [
-		"UltimatePancake", "aikaterna"
-	],
-	"description": "Gets definitions, antonyms, or synonyms for given words",
-	"install_msg": "After loading the cog with `[p]load dictionary`, use [p]help Dictionary to view commands.",
-	"short": "Gets definitions, antonyms, or synonyms for given words",
-	"tags": [
-		"dictionary"
-	],
-	"requirements": [
-		"beautifulsoup4"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
+    "author": ["UltimatePancake", "aikaterna"],
+    "description": "Gets definitions, antonyms, or synonyms for given words",
+    "install_msg": "After loading the cog with `[p]load dictionary`, use [p]help Dictionary to view commands.",
+    "short": "Gets definitions, antonyms, or synonyms for given words",
+    "tags": ["dictionary", "synonym", "antonym"],
+    "requirements": ["beautifulsoup4"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
--- a/discordexperiments/init.py
+++ b/discordexperiments/init.py
@@ -0,0 +1,7 @@
+from .discordexperiments import DiscordExperiments
+
+__red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
+
+
+async def setup(bot):
+    await bot.add_cog(DiscordExperiments(bot))
--- a/discordexperiments/discordexperiments.py
+++ b/discordexperiments/discordexperiments.py
@@ -0,0 +1,174 @@
+import discord
+from discord.http import Route
+from redbot.core import checks, commands
+
+
+class DiscordExperiments(commands.Cog):
+    """Create voice channel invites to access experimental applications on Discord."""
+
+    def __init__(self, bot):
+        self.bot = bot
+
+    async def red_delete_data_for_user(self, **kwargs):
+        """Nothing to delete"""
+        return
+
+    async def _create_invite(self, ctx, app_id: int, max_age: int, app_name: str):
+        voice = ctx.author.voice
+        if not voice:
+            return await ctx.send("You have to be in a voice channel to use this command.")
+        if not voice.channel.permissions_for(ctx.me).create_instant_invite == True:
+            return await ctx.send(
+                "I need the `Create Invite` permission for your channel before you can use this command."
+            )
+
+        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"]
+
+        await ctx.send(
+            embed=discord.Embed(
+                description=f"[Click here to join {app_name} in {voice.channel.name}!](https://discord.gg/{code})",
+                color=0x2F3136,
+            )
+        )
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def ytparty(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a YouTube Together voice channel invite.
+
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "YouTube Together"
+        await self._create_invite(ctx, 880218394199220334, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def betrayal(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Betrayal.io voice channel invite.
+
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Betrayal game"
+        await self._create_invite(ctx, 773336526917861400, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def fishington(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Fishington.io voice channel invite.
+
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Fishington game"
+        await self._create_invite(ctx, 814288819477020702, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def pokernight(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Poker Night voice channel invite.
+
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "Poker Night"
+        await self._create_invite(ctx, 755827207812677713, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def chess(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Chess in the Park voice channel invite.
+
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "Chess in the Park"
+        await self._create_invite(ctx, 832012774040141894, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def sketchheads(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Sketch Heads voice channel invite.
+
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Sketch Heads game"
+        await self._create_invite(ctx, 902271654783242291, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def letterleague(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Letter League voice channel invite.
+
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Letter League game"
+        await self._create_invite(ctx, 879863686565621790, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def wordsnacks(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Word Snacks voice channel invite.
+
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Word Snacks game"
+        await self._create_invite(ctx, 879863976006127627, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def spellcast(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a SpellCast voice channel invite.
+
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the SpellCast game"
+        await self._create_invite(ctx, 852509694341283871, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def checkers(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Checkers in the Park voice channel invite.
+
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "Checkers in the Park"
+        await self._create_invite(ctx, 832013003968348200, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def blazing8s(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        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"
+        await self._create_invite(ctx, 832025144389533716, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def puttparty(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        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"
+        await self._create_invite(ctx, 945737671223947305, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def landio(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        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"
+        await self._create_invite(ctx, 903769130790969345, invite_max_age_in_seconds, app_name)
--- a/discordexperiments/info.json
+++ b/discordexperiments/info.json
@@ -0,0 +1,8 @@
+{
+    "author": ["aikaterna"],
+    "install_msg": "⚠ **THIS COG IS NOT FOR GENERAL USE** ⚠\nThis cog creates voice invites for experimental applications that Discord is still working on.\nAnything can break at any time.\nI am not responsible for anything that happens to your Discord account or your bot while using this cog.\nUsers are required to use OAuth authentication to access some of these applications on joining the voice channels and interacting with it. This interaction/authentication is between Discord and the service(s) providing the experiments.\nI do not recommend installing this cog on a public bot.\nDO NOT LOAD THIS COG IF YOU DO NOT AGREE TO THE RISKS. NOT ALL RISKS HAVE BEEN EXPLAINED HERE.",
+    "short": "Create voice invites for experimental Discord applications.",
+    "description": "Create voice invites for experimental Discord applications.",
+    "tags": ["discord"],
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}
--- a/dungeon/init.py
+++ b/dungeon/init.py
@@ -1,9 +0,0 @@
-from .dungeon import Dungeon
-
-__red_end_user_data_statement__ = (
-    "This cog does not persistently store end user data. " "This cog does store discord IDs as needed for operation. "
-)
-
-
-def setup(bot):
-    bot.add_cog(Dungeon(bot))
--- a/dungeon/dungeon.py
+++ b/dungeon/dungeon.py
@@ -1,531 +0,0 @@
-import datetime
-from typing import Literal
-
-import discord
-import logging
-from redbot.core import Config, commands, checks, modlog
-from redbot.core.utils.chat_formatting import box, pagify
-
-
-log = logging.getLogger("red.aikaterna.dungeon")
-
-
-class Dungeon(commands.Cog):
-    """Auto-quarantine suspicious users."""
-
-    async def red_delete_data_for_user(
-        self, *, requester: Literal["discord", "owner", "user", "user_strict"], user_id: int,
-    ):
-        if requester == "discord":
-            # user is deleted, just comply
-
-            data = await self.config.all_guilds()
-            for guild_id, guild_data in data.items():
-                if user_id in guild_data.get("bypass", []):
-                    bypass = guild_data.get("bypass", [])
-                    bypass = set(bypass)
-                    bypass.discard(user_id)
-                    await self.config.guild_from_id(guild_id).bypass.set(list(bypass))
-
-    def __init__(self, bot):
-        self.bot = bot
-        self.config = Config.get_conf(self, 2700081001, force_registration=True)
-
-        default_guild = {
-            "announce_channel": None,
-            "auto_ban": False,
-            "auto_ban_message": None,
-            "auto_blacklist": False,
-            "bypass": [],
-            "dm_message": None,
-            "dm_toggle": False,
-            "dungeon_channel": None,
-            "dungeon_role": None,
-            "join_days": 7,
-            "mod_log": False,
-            "profile_toggle": False,
-            "toggle": False,
-            "user_role": None,
-            "user_role_toggle": False,
-        }
-
-        self.config.register_guild(**default_guild)
-
-    @checks.mod_or_permissions(administrator=True)
-    @commands.command()
-    async def banish(self, ctx, user: discord.Member):
-        """Strip a user of their roles, apply the dungeon role, and blacklist them.
-		If the blacklist toggle is off, the user will not be blacklisted from the bot."""
-        data = await self.config.guild(ctx.guild).all()
-        blacklist = data["auto_blacklist"]
-        dungeon_role_id = data["dungeon_role"]
-        dungeon_role_obj = discord.utils.get(ctx.guild.roles, id=dungeon_role_id)
-
-        if blacklist:
-            # if you are reading this to learn, DON'T do this, there will be a real way
-            # to interact with bot-owned data without touching config directly at some
-            # point in the future after Red 3.2
-            async with self.bot._config.blacklist() as blacklist_list:
-                if user.id not in blacklist_list:
-                    blacklist_list.append(user.id)
-
-        if not dungeon_role_obj:
-            return await ctx.send("No dungeon role set.")
-
-        #Managed roles CANNOT be removed by the bot.
-        remaining_roles = [r for r in user.roles if r.managed]
-        try:
-            await user.edit(roles=remaining_roles, reason=f"Removing all roles, {ctx.message.author} is banishing user")
-        except discord.Forbidden:
-            return await ctx.send(
-                "I need permission to manage roles or the role hierarchy might not allow me to do this. I need a role higher than the person you're trying to banish."
-            )
-
-        await user.add_roles(dungeon_role_obj, reason=f"Adding dungeon role, {ctx.message.author} is banishing user")
-
-        if blacklist:
-            blacklist_msg = ", blacklisted from the bot,"
-        else:
-            blacklist_msg = ""
-        msg = f"{user} has been sent to the dungeon{blacklist_msg} and has had all previous roles stripped."
-        await ctx.send(msg)
-
-    @commands.group(autohelp=True)
-    @commands.guild_only()
-    @checks.admin_or_permissions(manage_guild=True)
-    async def dungeon(self, ctx):
-        """Main dungeon commands."""
-        pass
-
-    @dungeon.command()
-    async def announce(self, ctx, channel: discord.TextChannel):
-        """Sets the announcement channel for users moved to the dungeon."""
-        await self.config.guild(ctx.guild).announce_channel.set(channel.id)
-        announce_channel_id = await self.config.guild(ctx.guild).announce_channel()
-        await ctx.send(f"User announcement channel set to: {self.bot.get_channel(announce_channel_id).mention}.")
-
-    @dungeon.command()
-    async def autoban(self, ctx):
-        """Toggle auto-banning users instead of sending them to the dungeon."""
-        auto_ban = await self.config.guild(ctx.guild).auto_ban()
-        await self.config.guild(ctx.guild).auto_ban.set(not auto_ban)
-        await ctx.send(f"Auto-ban instead of sending to the dungeon: {not auto_ban}.")
-
-    @dungeon.command()
-    async def banmessage(self, ctx, *, ban_message=None):
-        """Set the message to send on an autoban. If message is left blank, no message will be sent."""
-        auto_ban = await self.config.guild(ctx.guild).auto_ban()
-        if not ban_message:
-            await self.config.guild(ctx.guild).auto_ban_message.set(None)
-            return await ctx.send("Auto-ban message removed. No message will be sent on an auto-ban.")
-        await self.config.guild(ctx.guild).auto_ban_message.set(str(ban_message))
-        await self.config.guild(ctx.guild).auto_ban.set(True)
-        await ctx.send(f"Auto-ban has been turned on.\nMessage to send on ban:\n{ban_message}")
-
-    @dungeon.command()
-    async def blacklist(self, ctx):
-        """Toggle auto-blacklisting for the bot for users moved to the dungeon."""
-        auto_blacklist = await self.config.guild(ctx.guild).auto_blacklist()
-        await self.config.guild(ctx.guild).auto_blacklist.set(not auto_blacklist)
-        await ctx.send(f"Auto-blacklisting dungeon users from the bot: {not auto_blacklist}.")
-
-    @dungeon.command()
-    @commands.cooldown(1, 5, discord.ext.commands.BucketType.guild)
-    async def bypass(self, ctx, user_id: int):
-        """Add a user ID to the bypass list - user will be able to join without restrictions."""
-        if not 17 <= len(str(user_id)) >= 18:
-            return await ctx.send("This doesn't look like a Discord user id.")
-        bypass_ids = await self.config.guild(ctx.guild).bypass()
-        if user_id in bypass_ids:
-            return await ctx.send(f"**{user_id}** is already in the list of bypassed users.")
-        bypass_ids.append(user_id)
-        await self.config.guild(ctx.guild).bypass.set(bypass_ids)
-        bypassed_user = await self.bot.fetch_user(user_id)
-        await ctx.send(
-            f"**{bypassed_user}** ({user_id}) has been added to the bypass list. The next time they attempt to join this server, they will bypass any Dungeon restrictions."
-        )
-
-    @dungeon.command()
-    @commands.cooldown(1, 5, discord.ext.commands.BucketType.guild)
-    async def bypasslist(self, ctx):
-        """Show the current bypass list."""
-        bypass_ids = await self.config.guild(ctx.guild).bypass()
-        msg = "[Bypassed IDs]\n"
-        if not bypass_ids:
-            msg += "None."
-        for id in bypass_ids:
-            msg += f"{id}\n"
-        for page in pagify(msg, delims=["\n"], page_length=1000):
-            await ctx.send(box(msg, lang="ini"))
-
-    @dungeon.command()
-    async def channel(self, ctx, channel: discord.TextChannel):
-        """Sets the text channel to use for the dungeon."""
-        await self.config.guild(ctx.guild).dungeon_channel.set(channel.id)
-        dungeon_channel_id = await self.config.guild(ctx.guild).dungeon_channel()
-        await ctx.send(f"Dungeon channel set to: {self.bot.get_channel(dungeon_channel_id).name}.")
-
-    @dungeon.command()
-    async def dm(self, ctx, *, dm_message=None):
-        """Set the message to send on successful verification.
-        A blank message will turn off the DM setting."""
-        if not dm_message:
-            await self.config.guild(ctx.guild).dm_toggle.set(False)
-            await self.config.guild(ctx.guild).dm_message.set(None)
-            return await ctx.send("DM message on verification turned off.")
-        await self.config.guild(ctx.guild).dm_message.set(str(dm_message))
-        await self.config.guild(ctx.guild).dm_toggle.set(True)
-        await ctx.send(f"DM message on verification turned on.\nMessage to send:\n{dm_message}")
-
-    @dungeon.command()
-    async def joindays(self, ctx, days: int):
-        """Set how old an account needs to be a trusted user."""
-        await self.config.guild(ctx.guild).join_days.set(days)
-        await ctx.send(
-            f"Users must have accounts older than {days} day(s) to be awarded the member role instead of the dungeon role on join."
-        )
-
-    @dungeon.command()
-    async def modlog(self, ctx):
-        """Toggle using the Red mod-log for auto-bans.
-        The mod-log has to be configured to display bans for this to work."""
-        mod_log = await self.config.guild(ctx.guild).mod_log()
-        await self.config.guild(ctx.guild).mod_log.set(not mod_log)
-        await ctx.send(f"Mod-log entry on auto-ban: {not mod_log}.")
-
-    @dungeon.command()
-    async def role(self, ctx, role_name: discord.Role):
-        """Sets the role to use for the dungeon."""
-        await self.config.guild(ctx.guild).dungeon_role.set(role_name.id)
-        dungeon_role_id = await self.config.guild(ctx.guild).dungeon_role()
-        dungeon_role_obj = discord.utils.get(ctx.guild.roles, id=dungeon_role_id)
-        await ctx.send(f"Dungeon role set to: {dungeon_role_obj.name}.")
-
-    @dungeon.command()
-    async def toggle(self, ctx):
-        """Toggle the dungeon on or off."""
-        dungeon_enabled = await self.config.guild(ctx.guild).toggle()
-        await self.config.guild(ctx.guild).toggle.set(not dungeon_enabled)
-        await ctx.send(f"Dungeon enabled: {not dungeon_enabled}.")
-
-    @dungeon.command()
-    async def profiletoggle(self, ctx):
-        """Toggles flagging accounts that have a default profile pic.
-        Accounts that are over the join days threshold will still be flagged if they have a default profile pic."""
-        profile_toggle = await self.config.guild(ctx.guild).profile_toggle()
-        await self.config.guild(ctx.guild).profile_toggle.set(not profile_toggle)
-        await ctx.send(f"Default profile pic flagging: {not profile_toggle}.")
-
-    @dungeon.command()
-    async def userrole(self, ctx, *, role_name: discord.Role = None):
-        """Sets the role to give to new users that are not sent to the dungeon."""
-        if not role_name:
-            await self.config.guild(ctx.guild).user_role.set(None)
-            return await ctx.send("Member role cleared.")
-        await self.config.guild(ctx.guild).user_role.set(role_name.id)
-        user_role_id = await self.config.guild(ctx.guild).user_role()
-        user_role_obj = discord.utils.get(ctx.guild.roles, id=user_role_id)
-        await ctx.send(f"Member role set to: {user_role_obj.name}.")
-
-    @dungeon.command()
-    async def usertoggle(self, ctx):
-        """Toggle the user role on or off."""
-        user_role_toggle = await self.config.guild(ctx.guild).user_role_toggle()
-        await self.config.guild(ctx.guild).user_role_toggle.set(not user_role_toggle)
-        await ctx.send(f"New user dungeon role enabled: {not user_role_toggle}.")
-
-    @dungeon.command()
-    async def verify(self, ctx, user: discord.Member):
-        """Verify a user: remove the dungeon role and add initial user role."""
-        data = await self.config.guild(ctx.guild).all()
-        announce_channel = data["announce_channel"]
-        blacklist = data["auto_blacklist"]
-        dungeon_role_id = data["dungeon_role"]
-        dungeon_role_obj = discord.utils.get(ctx.guild.roles, id=dungeon_role_id)
-        user_role_id = data["user_role"]
-        user_role_obj = discord.utils.get(ctx.guild.roles, id=user_role_id)
-        dm_toggle = data["dm_toggle"]
-        dm_message = data["dm_message"]
-
-        if blacklist:
-            # if you are reading this to learn, DON'T do this, there will be a real way
-            # to interact with bot-owned data without touching config directly at some
-            # point in the future after Red 3.2
-            async with self.bot._config.blacklist() as blacklist_list:
-                if user.id in blacklist_list:
-                    blacklist_list.remove(user.id)
-
-        role_check = False
-        for role in user.roles:
-            if not dungeon_role_obj:
-                return await ctx.send("No dungeon role set.")
-            if role == dungeon_role_obj:
-                role_check = True
-                try:
-                    await user.remove_roles(
-                        dungeon_role_obj, reason=f"Removing dungeon role, verified by {ctx.message.author}.",
-                    )
-                    if not user_role_obj:
-                        return await ctx.send("Dungeon role removed, but no member role is set so I can't award one.")
-                    await user.add_roles(user_role_obj, reason="Adding member role.")
-                except discord.Forbidden:
-                    return await ctx.send(
-                        "I need permissions to manage roles or the role hierarchy might not allow me to do this."
-                    )
-
-        if not role_check:
-            return await ctx.send("User is not in the dungeon.")
-
-        if blacklist:
-            blacklist_msg = " and the bot blacklist"
-        else:
-            blacklist_msg = ""
-        msg = f"{user} has been removed from the dungeon{blacklist_msg} and now has the initial user role."
-        await ctx.send(msg)
-
-        if dm_toggle:
-            try:
-                await user.send(dm_message)
-            except discord.Forbidden:
-                await ctx.send(f"I couldn't DM {user} to let them know they've been verified, they've blocked me.")
-
-    @dungeon.command()
-    async def autosetup(self, ctx):
-        """Automatically set up the dungeon channel and role to apply to suspicious users.
-        You must deny the default role (@ everyone) from viewing or typing in other channels in your server manually.
-        """
-        try:
-            overwrites = {ctx.guild.default_role: discord.PermissionOverwrite(send_messages=False, read_messages=False)}
-
-            dungeon_role = await ctx.guild.create_role(name="Dungeon")
-
-            dungeon_category = await ctx.guild.create_category("Dungeon", overwrites=overwrites)
-            await dungeon_category.set_permissions(
-                dungeon_role, read_messages=True, send_messages=False, read_message_history=True
-            )
-
-            dungeon_channel = await ctx.guild.create_text_channel("Silenced", category=dungeon_category)
-            await dungeon_channel.set_permissions(
-                dungeon_role, read_messages=True, send_messages=False, read_message_history=True
-            )
-            await dungeon_channel.set_permissions(
-                ctx.guild.me, read_messages=True, send_messages=True, read_message_history=True
-            )
-            await dungeon_channel.send("Please wait while an admin verifies your account.")
-
-            await self.config.guild(ctx.guild).dungeon_channel.set(dungeon_channel.id)
-            await self.config.guild(ctx.guild).dungeon_role.set(dungeon_role.id)
-            await self.config.guild(ctx.guild).announce_channel.set(ctx.channel.id)
-            toggle = await self.config.guild(ctx.guild).toggle()
-            if not toggle:
-                await ctx.invoke(self.usertoggle)
-            await ctx.send(
-                f"Done.\nDungeon channel created: {dungeon_channel.mention}\nDungeon role created: {dungeon_role.name}\n\nPlease set these items manually:\n- The announce channel for reporting new users that are moved to the dungeon ({ctx.prefix}dungeon announce)\n- The role you wish to award regular members when they join the server ({ctx.prefix}dungeon userrole)\n- The toggle for enabling the regular user role awarding ({ctx.prefix}dungeon usertoggle)"
-            )
-
-        except discord.Forbidden:
-            await ctx.send("I need permissions to manage channels and manage roles.")
-
-    @dungeon.command()
-    async def settings(self, ctx):
-        """Show the current settings."""
-        data = await self.config.guild(ctx.guild).all()
-
-        try:
-            drole = discord.utils.get(ctx.guild.roles, id=data["dungeon_role"]).name
-        except AttributeError:
-            drole = None
-        try:
-            urole = discord.utils.get(ctx.guild.roles, id=data["user_role"]).name
-        except AttributeError:
-            urole = None
-        try:
-            achannel = self.bot.get_channel(data["announce_channel"]).name
-        except AttributeError:
-            achannel = None
-        try:
-            dchannel = self.bot.get_channel(data["dungeon_channel"]).name
-        except AttributeError:
-            dchannel = None
-        dungeon_enabled = data["toggle"]
-        user_role_enabled = data["user_role_toggle"]
-        join_days = data["join_days"]
-        auto_blacklist = data["auto_blacklist"]
-        profile_toggle = data["profile_toggle"]
-        dm_toggle = data["dm_toggle"]
-        auto_ban = data["auto_ban"]
-        ban_msg = data["auto_ban_message"]
-        mod_log = data["mod_log"]
-
-        if ban_msg:
-            ban_msg = "True"
-
-        msg = (
-            "```ini\n----Dungeon Settings----\n"
-            f"Dungeon Enabled:  [{dungeon_enabled}]\n"
-            f"Dungeon Role:     [{drole}]\n"
-            f"Dungeon Channel:  [{dchannel}]\n"
-            f"Announce Channel: [{achannel}]\n"
-            f"Autorole Enabled: [{user_role_enabled}]\n"
-            f"Autorole Role:    [{urole}]\n"
-            f"Auto-blacklist:   [{auto_blacklist}]\n"
-            f"Default PFP Flag: [{profile_toggle}]\n"
-            f"Day Threshold:    [{str(join_days)}]\n"
-            f"Msg on Verify:    [{dm_toggle}]\n"
-            f"Auto-ban:         [{auto_ban}]\n"
-            f"Ban Message:      [{ban_msg}]\n"
-            f"Mod-log on Ban:   [{mod_log}]\n```"
-        )
-
-        embed = discord.Embed(colour=ctx.guild.me.top_role.colour, description=msg)
-        return await ctx.send(embed=embed)
-
-    @commands.Cog.listener()
-    async def on_member_join(self, member):
-        default_avatar = False
-        toggle = await self.config.guild(member.guild).toggle()
-        if not toggle:
-            return
-        if member.avatar_url == member.default_avatar_url:
-            default_avatar = True
-        join_date = datetime.datetime.strptime(str(member.created_at), "%Y-%m-%d %H:%M:%S.%f")
-        now = datetime.datetime.now(datetime.timezone.utc).replace(tzinfo=None)
-        since_join = now - join_date
-        join_days = await self.config.guild(member.guild).join_days()
-        profile_toggle = await self.config.guild(member.guild).profile_toggle()
-        announce_channel = await self.config.guild(member.guild).announce_channel()
-        channel_object = self.bot.get_channel(announce_channel)
-        auto_ban = await self.config.guild(member.guild).auto_ban()
-        auto_ban_msg = await self.config.guild(member.guild).auto_ban_message()
-        mod_log = await self.config.guild(member.guild).mod_log()
-        bypassed_ids = await self.config.guild(member.guild).bypass()
-
-        if member.id in bypassed_ids:
-            bypassed_ids.remove(member.id)
-            await self.config.guild(member.guild).bypass.set(bypassed_ids)
-            user_role_id = await self.config.guild(member.guild).user_role()
-            user_role_obj = discord.utils.get(member.guild.roles, id=user_role_id)
-            try:
-                await member.add_roles(
-                    user_role_obj, reason="User has bypassed Dungeon checks. Assigning member role.",
-                )
-            except discord.Forbidden:
-                pass
-            except AttributeError:
-                pass
-            bypass_msg = f"**{member}** ({member.id}) was in the bypass list for **{member.guild.name}** ({member.guild.id}). They were allowed to join without Dungeon checks and I have assigned them the Member role specified in the settings, if any."
-            if announce_channel:
-                await channel_object.send(bypass_msg)
-            else:
-                log.debug(f"dungeon.py: {bypass_msg}")
-            return
-
-        if (since_join.days < join_days) or (profile_toggle and default_avatar):
-            banned = False
-            blacklist = await self.config.guild(member.guild).auto_blacklist()
-            dungeon_role_id = await self.config.guild(member.guild).dungeon_role()
-            dungeon_role_obj = discord.utils.get(member.guild.roles, id=dungeon_role_id)
-            perm_msg = f"dungeon.py: Unable to auto-ban user, permissions needed and no announce channel set. Guild: {member.guild.id}"
-
-            if auto_ban:
-                banned = True
-                if auto_ban_msg:
-                    try:
-                        await member.send(auto_ban_msg)
-                    except discord.Forbidden:
-                        if announce_channel:
-                            await channel_object.send(
-                                f"I couldn't DM {member} ({member.id}) to let them know they've been banned, they've blocked me."
-                            )
-                        else:
-                            log.debug(perm_msg)
-                            return
-                try:
-                    await member.guild.ban(member, reason="Dungeon auto-ban", delete_message_days=0)
-                except discord.Forbidden:
-                    if announce_channel:
-                        return await channel_object.send(
-                            f"I tried to auto-ban someone ({member}, {member.id}) but I don't have ban permissions."
-                        )
-                    else:
-                        log.debug(perm_msg)
-                        return
-
-                if not mod_log:
-                    if announce_channel:
-                        msg = f"Auto-banned new user: \n**{member}** ({member.id})\n{self._dynamic_time(int(since_join.total_seconds()))} old account"
-                        return await channel_object.send(msg)
-                    else:
-                        log.debug(perm_msg)
-                        return
-                else:
-                    try:
-                        await modlog.create_case(
-                            self.bot, member.guild, now, "ban", member, member.guild.me, until=None, channel=None,
-                        )
-                    except RuntimeError:
-                        log.error(
-                            f"dungeon.py error while autobanning user and attempting to create modlog entry in guild: {member.guild.id}",
-                            exc_info=True,
-                        )
-
-            if blacklist:
-                # if you are reading this to learn, DON'T do this, there will be a real way
-                # to interact with bot-owned data without touching config directly at some
-                # point in the future after Red 3.2
-                async with self.bot._config.blacklist() as blacklist_list:
-                    if member.id not in blacklist_list:
-                        blacklist_list.append(member.id)
-            if banned:
-                return
-            try:
-                if since_join.days < join_days:
-                    reason = "Adding dungeon role, new account."
-                else:
-                    reason = "Adding dungeon role, default profile pic."
-                await member.add_roles(dungeon_role_obj, reason=reason)
-            except discord.Forbidden:
-                if announce_channel:
-                    return await channel_object.send(
-                        "Someone suspicious joined but something went wrong. I need permissions to manage channels and manage roles."
-                    )
-                else:
-                    log.info(
-                        f"dungeon.py: I need permissions to manage channels and manage roles in {member.guild.name} ({member.guild.id})."
-                    )
-                    return
-
-            msg = f"Auto-banished new user: \n**{member}** ({member.id})\n{self._dynamic_time(int(since_join.total_seconds()))} old account"
-            if default_avatar:
-                msg += ", no profile picture set"
-            await channel_object.send(msg)
-        else:
-            user_role_toggle = await self.config.guild(member.guild).user_role_toggle()
-            if not user_role_toggle:
-                return
-            user_role_id = await self.config.guild(member.guild).user_role()
-            user_role_obj = discord.utils.get(member.guild.roles, id=user_role_id)
-            try:
-                await member.add_roles(user_role_obj, reason="Adding member role to new user.")
-            except discord.Forbidden:
-                pass
-            except AttributeError:
-                pass
-
-    @staticmethod
-    def _dynamic_time(time):
-        m, s = divmod(time, 60)
-        h, m = divmod(m, 60)
-        d, h = divmod(h, 24)
-
-        if d > 0:
-            msg = "{0}d {1}h"
-        elif d == 0 and h > 0:
-            msg = "{1}h {2}m"
-        elif d == 0 and h == 0 and m > 0:
-            msg = "{2}m {3}s"
-        elif d == 0 and h == 0 and m == 0 and s > 0:
-            msg = "{3}s"
-        else:
-            msg = ""
-        return msg.format(d, h, m, s)
--- a/dungeon/info.json
+++ b/dungeon/info.json
@@ -1,20 +0,0 @@
-{
-	"author": [
-		"aikaterna"
-	],
-	"description": "Provides additional raid protection for servers utilizing a welcome/rules join channel.",
-    "install_msg": "Please read the additional instructions at: <https://github.com/aikaterna/aikaterna-cogs/blob/v3/dungeon_readme.md>",
-    "min_python_version": [3, 6, 0],
-    "permissions" : [
-		"ban_members",
-		"manage_channels",
-		"manage_roles"
-	],
-	"short": "Specialized raid protection.",
-	"tags": [
-		"dungeon",
-        "autoban"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store end user data. This cog does store discord IDs as needed for operation. "
-}
--- a/dungeon_readme.md
+++ b/dungeon_readme.md
@@ -1,46 +0,0 @@
-
-The dungeon cog was written for a specific type of server setup and may or may not work for your needs. This cog stops text and voice channel raiders by restricting new accounts to a read-only channel on-join when set up appropriately.
-
-The ideal guild setup for this cog would be one set up with an autorole so that new users are given a role on-join that sends them to a “verify” or “agreement” or “welcome” channel - usually to agree to rules and receive a new Member role, removing the initial autorole and granting them access to the rest of the server. The everyone role is generally denied from viewing or speaking in any channels and channel access is generally granted through the Member role or other roles after the normal server verification process.
-
-
-What this cog can do if the above guild restrictions are in place:
-
- A new user joins the server.
- The cog determines whether the user is new (under a settable threshold of days)
- If the user is new, the dungeon role would be added to them instead of the autorole, restricting them to the dungeon channel where they can only see and not speak. 
- If autoban is on, they will be banned instead of sent to the dungeon.
- If the setting is on to do so, the bot will blacklist the user from using the bot.
- A message is sent to the announce channel with the dungeoned user’s name, id, account age, and whether they have a default profile pic.
- Admins can verify someone in the dungeon by using a command. This will remove the dungeon role, add the initial autorole, and then un-blacklist the user from using the bot.
-
-If a user is over the new user days threshold:
-
- A new user joins the server.
- They are given the autorole.
- They proceed as normal through the server’s verification/role awarding/welcome channels.
-
-How to set it up:
-
-Turn off your current autorole system, if you have one. This cog will only interact with roles used in this cog like the dungeon role and the user role (autorole).
-Remember to deny the Dungeon role from viewing any channel that’s viewable by @ everyone.
-
-Use [p]dungeon autosetup
-    This sets up the dungeon/silenced channel in it’s own category.
-
-Use [p]dungeon announce #channel
-    This sets up the channel to announce dungeoned users.
-
-Use [p]dungeon userrole rolename
-    This sets up the autorole to award if the new user is not a new account.
-
-Use [p]dungeon blacklist
-    This toggles the auto-blacklist on. Dungeoned users will be blacklisted from using the bot.
-
-If a user needs to be verified, use [p]dungeon verify id/username. This will remove the dungeon role from them and apply the initial autorole so they can proceed through the server’s verification or welcome process. If a custom message should be sent to the user when they are verified, use [p]dungeon dm message to set a message. The command with no message will turn the DM feature off.
-
-A user can be stripped of all their roles with [p]banish. This will apply the dungeon role to them and if the blacklist toggle is on, blacklist them from using the bot.
-
-Autobanning can be done instead of sending the user to the dungeon channel. It will use the days and profile picture parameters to choose who to auto-ban. Turn autoban on with [p]dungeon autoban and set a message to DM the user: [p]dungeon banmessage. If [p]dungeon modlog is used, it will create a mod log entry if the bot is set up to report bans with the built-in Mod cog instead of reporting to the announce channel.
-
-Current settings can be seen with [p]dungeon settings.
--- a/antiphoneclapper/init.py
+++ b/antiphoneclapper/init.py
@@ -1,7 +1,7 @@
-from .antiphoneclapper import AntiPhoneClapper
-
-__red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
-
-
-async def setup(bot):
-    bot.add_cog(AntiPhoneClapper(bot))
+from .embedpeek import EmbedPeek
+
+__red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
+
+
+async def setup(bot):
+    await bot.add_cog(EmbedPeek(bot))
--- a/embedpeek/embedpeek.py
+++ b/embedpeek/embedpeek.py
@@ -0,0 +1,89 @@
+import discord
+from redbot.core import commands
+from redbot.core.utils.chat_formatting import box, pagify
+
+
+class EmbedPeek(commands.Cog):
+    """Take a closer look at an embed."""
+
+    async def red_delete_data_for_user(self, **kwargs):
+        """Nothing to delete"""
+        return
+
+    def __init__(self, bot):
+        self.bot = bot
+        self._grave = "\N{GRAVE ACCENT}"
+
+    @commands.command()
+    async def embedpeek(self, ctx, message_link: str):
+        """
+        Take a closer look at an embed.
+
+        On a webhook message or other multi-embed messages, this will only display the first embed.
+        """
+        bad_link_msg = "That doesn't look like a message link, I can't reach that message, or that link does not have an embed."
+        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."
+
+        if not "discord.com/channels/" in message_link:
+            return await ctx.send(bad_link_msg)
+        ids = message_link.split("/")
+        if len(ids) != 7:
+            return await ctx.send(bad_link_msg)
+
+        guild = self.bot.get_guild(int(ids[4]))
+        channel = self.bot.get_channel(int(ids[5]))
+        try:
+            message = await channel.fetch_message(int(ids[6]))
+        except discord.errors.NotFound:
+            return await ctx.send(no_message_msg)
+
+        if ctx.author not in guild.members:
+            return await ctx.send(no_guild_msg)
+        if not channel.permissions_for(ctx.author).read_messages:
+            return await ctx.send(no_channel_msg)
+
+        components = [guild, channel, message]
+        valid_components = [x for x in components if x != None]
+        if len(valid_components) < 3:
+            return await ctx.send(bad_link_msg)
+
+        try:
+            embed = message.embeds[0]
+        except IndexError:
+            return await ctx.send(bad_link_msg)
+
+        info = embed.to_dict()
+        sorted_info = dict(sorted(info.items()))
+        msg = ""
+
+        for k, v in sorted_info.items():
+            if k == "type":
+                continue
+            msg += f"+ {k}\n"
+            if isinstance(v, str):
+                msg += f"{v.replace(self._grave, '~')}\n\n"
+            elif isinstance(v, list):
+                for i, field in enumerate(v):
+                    msg += f"--- field {i+1} ---\n"
+                    for m, n in field.items():
+                        msg += f"- {str(m).replace(self._grave, '~')}\n"
+                        msg += f"{str(n).replace(self._grave, '~')}\n"
+                    msg += "\n"
+            elif isinstance(v, dict):
+                msg += self._dict_cleaner(v)
+                msg += "\n"
+            else:
+                msg += f"{str(v)}\n\n"
+
+        for page in pagify(msg, delims=f"{'-' * 20}", page_length=1500):
+            await ctx.send(box(page, lang="diff"))
+
+    def _dict_cleaner(self, d: dict):
+        msg = ""
+        for k, v in d.items():
+            k = str(k).replace(self._grave, "~")
+            v = str(v).replace(self._grave, "~")
+            msg += f"- {k}\n{v}\n"
+        return msg
--- a/embedpeek/info.json
+++ b/embedpeek/info.json
@@ -0,0 +1,9 @@
+{
+    "author": ["aikaterna"],
+    "description": "Dev tool to display the content of an embed.",
+    "install_msg": "Thanks for installing.",
+    "short": "Dev tool to display the content of an embed.",
+    "tags": ["embed"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}
--- a/hunting/init.py
+++ b/hunting/init.py
@@ -11,4 +11,4 @@ __red_end_user_data_statement__ = (


 async def setup(bot):
-    bot.add_cog(Hunting(bot))
+    await bot.add_cog(Hunting(bot))
--- a/hunting/hunting.py
+++ b/hunting/hunting.py
@@ -1,18 +1,20 @@
-from typing import Literal
-
 import asyncio
-import discord
 import datetime
+from logging import warning
 import math
 import random
 import time
+from typing import Literal

-from redbot.core import checks, commands, Config
-from redbot.core.utils.chat_formatting import bold, box, humanize_list, humanize_number, pagify
-from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
+import discord
+from redbot.core import Config, checks, commands, bank
+from redbot.core.errors import BalanceTooHigh
+from redbot.core.utils.chat_formatting import (bold, box, humanize_list,
+                                               humanize_number, pagify)
+from redbot.core.utils.menus import DEFAULT_CONTROLS, menu
+from redbot.core.utils.predicates import MessagePredicate

-
-__version__ = "3.1.4"
+__version__ = "3.1.7"


 class Hunting(commands.Cog):
@@ -45,10 +47,15 @@ class Hunting(commands.Cog):
            "channels": [],
            "bang_time": False,
            "bang_words": True,
+            "reward_range": [],
+        }
+        default_global = {
+            "reward_range": [],  # For bots with global banks
        }
        default_user = {"score": {}, "total": 0}
        self.config.register_user(**default_user)
        self.config.register_guild(**default_guild)
+        self.config.register_guild(**default_global)

    @commands.guild_only()
    @commands.group()
@@ -62,7 +69,8 @@ class Hunting(commands.Cog):
                channel_names = []
                for channel_id in guild_data["channels"]:
                    channel_obj = self.bot.get_channel(channel_id)
-                    channel_names.append(channel_obj.name)
+                    if channel_obj:
+                        channel_names.append(channel_obj.name)

            hunting_mode = "Words" if guild_data["bang_words"] else "Reactions"
            reaction_time = "On" if guild_data["bang_time"] else "Off"
@@ -74,6 +82,17 @@ class Hunting(commands.Cog):
            msg += f"[Hunting mode]:               {hunting_mode}\n"
            msg += f"[Bang response time message]: {reaction_time}\n"

+            if await bank.is_global():
+                reward = await self.config.reward_range()
+                if reward:
+                    reward = f"{reward[0]} - {reward[1]}"
+                msg += f"[Hunting reward range]:       {reward if reward else 'None'}\n"
+            else:
+                reward = guild_data['reward_range']
+                if reward:
+                    reward = f"{reward[0]} - {reward[1]}"
+                msg += f"[Hunting reward range]:       {reward if reward else 'None'}\n"
+
            for page in pagify(msg, delims=["\n"]):
                await ctx.send(box(page, lang="ini"))

@@ -154,6 +173,36 @@ class Hunting(commands.Cog):
        toggle_text = "Use the reaction" if toggle else "Type 'bang'"
        await ctx.send(f"{toggle_text} to react to the bang message when it appears.\n")

+    @checks.mod_or_permissions(manage_guild=True)
+    @hunting.command()
+    async def reward(self, ctx, min_reward: int = None, max_reward: int = None):
+        """
+        Set a credit reward range for successfully shooting a bird
+
+        Leave the options blank to disable bang rewards
+        """
+        bank_is_global = await bank.is_global()
+        if ctx.author.id not in self.bot.owner_ids and bank_is_global:
+            return await ctx.send("Bank is global, only bot owner can set a reward range.")
+        if not min_reward or not max_reward:
+            if min_reward != 0 and not max_reward:  # Maybe they want users to sometimes not get rewarded
+                if bank_is_global:
+                    await self.config.reward_range.set([])
+                else:
+                    await self.config.guild(ctx.guild).reward_range.set([])
+                msg = "Reward range reset to default(None)."
+                return await ctx.send(msg)
+        if min_reward > max_reward:
+            return await ctx.send("Your minimum reward is greater than your max reward...")
+        reward_range = [min_reward, max_reward]
+        currency_name = await bank.get_currency_name(ctx.guild)
+        if bank_is_global:
+            await self.config.reward_range.set(reward_range)
+        else:
+            await self.config.guild(ctx.guild).reward_range.set(reward_range)
+        msg = f"Users can now get {min_reward} to {max_reward} {currency_name} for shooting a bird."
+        await ctx.send(msg)
+
    @checks.mod_or_permissions(manage_guild=True)
    @hunting.command()
    async def next(self, ctx):
@@ -226,12 +275,36 @@ class Hunting(commands.Cog):

        await ctx.send(bold(message))

+    @checks.is_owner()
+    @hunting.command()
+    async def clearleaderboard(self, ctx):
+        """
+        Clear all the scores from the leaderboard.
+        """
+        warning_string = (
+            "Are you sure you want to clear all the scores from the leaderboard?\n"
+            "This is a global wipe and **cannot** be undone!\n"
+            "Type \"Yes\" to confirm, or \"No\" to cancel."
+        )
+
+        await ctx.send(warning_string)
+        pred = MessagePredicate.yes_or_no(ctx)
+        try:
+            await self.bot.wait_for("message", check=pred, timeout=15)
+            if pred.result is True:
+                await self.config.clear_all_users()
+                return await ctx.send("Done!")
+            else:
+                return await ctx.send("Alright, not clearing the leaderboard.")
+        except asyncio.TimeoutError:
+            return await ctx.send("Response timed out.")
+
    @checks.mod_or_permissions(manage_guild=True)
    @hunting.command()
    async def timing(self, ctx, interval_min: int, interval_max: int, bang_timeout: int):
        """
        Change the hunting timing.
-        
+
        `interval_min` = Minimum time in seconds for a new bird. (120s min)
        `interval_max` = Maximum time in seconds for a new bird. (240s min)
        `bang_timeout` = Time in seconds for users to shoot a bird before it flies away. (10s min)
@@ -350,13 +423,34 @@ class Hunting(commands.Cog):

        if random.randrange(0, 17) > 1:
            await self._add_score(guild, author, animal)
-            msg = f"{author.display_name} shot a {animal}{bangtime}!"
+            reward = await self.maybe_send_reward(guild, author)
+            if reward:
+                cur_name = await bank.get_currency_name(guild)
+                msg = f"{author.display_name} shot a {animal}{bangtime} and earned {reward} {cur_name}!"
+            else:
+                msg = f"{author.display_name} shot a {animal}{bangtime}!"
        else:
            msg = f"{author.display_name} missed the shot and the {animal} got away!"

        self.in_game.remove(channel.id)
        await channel.send(bold(msg))

+    async def maybe_send_reward(self, guild, author) -> int:
+        max_bal = await bank.get_max_balance(guild)
+        user_bal = await bank.get_balance(author)
+        if await bank.is_global():
+            range_to_give = await self.config.reward_range()
+        else:
+            range_to_give = await self.config.guild(guild).reward_range()
+        to_give = random.choice(range(range_to_give[0], range_to_give[1] + 1))
+        if to_give + user_bal > max_bal:
+            to_give = max_bal - user_bal
+        try:
+            await bank.deposit_credits(author, to_give)
+        except BalanceTooHigh as e:  # This shouldn't throw since we already compare to max bal
+            await bank.set_balance(author, e.max_balance)
+        return to_give
+
    @commands.Cog.listener()
    async def on_message(self, message):
        if not message.guild:
--- a/hunting/info.json
+++ b/hunting/info.json
@@ -1,9 +1,9 @@
 {
-	"author": ["aikaterna", "Paddo"],
-	"description": "Hunting, it hunts birds and things that fly.",
-	"install_msg": "Check out [p]hunting to get started.",
-	"short": "A bird hunting game.",
-	"tags": ["hunting", "hunt", "game"],
-	"type": "COG",
-	"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 store user stats for the cog such as their score. Users may remove their own content without making a data removal request. This cog does not support data requests, but will respect deletion requests."
-}
+    "author": ["aikaterna", "Paddo"],
+    "description": "Hunting, it hunts birds and things that fly.",
+    "install_msg": "Check out [p]hunting to get started.",
+    "short": "A bird hunting game.",
+    "tags": ["hunting", "hunt", "game"],
+    "type": "COG",
+    "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 store user stats for the cog such as their score. Users may remove their own content without making a data removal request. This cog does not support data requests, but will respect deletion requests."
+}
--- a/icyparser/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(IcyParser(bot))
+async def setup(bot):
+    await bot.add_cog(IcyParser(bot))
--- a/icyparser/info.json
+++ b/icyparser/info.json
@@ -1,15 +1,9 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Audio addon cog for dislaying icecast/shoutcast info.",
+    "author": ["aikaterna"],
+    "description": "Audio addon cog for dislaying icecast/shoutcast info.",
    "install_msg": "Thanks for installing, have fun.",
-	"short": "Audio addon cog for dislaying icecast/shoutcast info",
-	"tags": [
-		"audio",
-		"icecast",
-		"shoutcast"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
+    "short": "Audio addon cog for dislaying icecast/shoutcast info",
+    "tags": ["audio", "icecast", "shoutcast"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}
--- a/inspirobot/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(Inspirobot(bot))
+async def setup(bot):
+    await bot.add_cog(Inspirobot(bot))
--- a/inspirobot/info.json
+++ b/inspirobot/info.json
@@ -1,17 +1,10 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Fetch a random 'inspiring' message from http://inspirobot.me",
+    "author": ["aikaterna"],
+    "description": "Fetch a random 'inspiring' message from http://inspirobot.me",
    "install_msg": "Thanks for installing, have fun.",
-    "permissions" : [
-		"embed_links"
-	],
-	"short": "Fetch 'inspiring' messages.",
-	"tags": [
-		"inspire",
-        "inspirobot"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
+    "permissions" : ["embed_links"],
+    "short": "Fetch 'inspiring' messages.",
+    "tags": ["inspire", "inspirobot"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}
--- a/invites/init.py
+++ b/invites/init.py
@@ -1,5 +1,7 @@
 from .invites import Invites

+__red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."

-def setup(bot):
-    bot.add_cog(Invites(bot))
+
+async def setup(bot):
+    await bot.add_cog(Invites(bot))
--- a/invites/info.json
+++ b/invites/info.json
@@ -1,11 +1,10 @@
 {
-	"author": ["aikaterna"],
-	"description": "Invite count display and leaderboard.",
+    "author": ["aikaterna"],
+    "description": "Invite count display and leaderboard.",
    "install_msg": "Thanks for installing. Use `[p]invites` to get started.",
-	"short": "Invite count display and leaderboard.",
-	"tags": ["invites"],
-	"min_bot_version": "3.3.10",
-	"permissions": ["administrator", "embed_links"],
-	"type": "COG"
+    "short": "Invite count display and leaderboard.",
+    "tags": ["invites"],
+    "permissions": ["administrator", "embed_links"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
-
--- a/invites/invites.py
+++ b/invites/invites.py
@@ -7,13 +7,16 @@ from redbot.core import commands, checks, Config
 from redbot.core.utils import chat_formatting as cf
 from redbot.vendored.discord.ext import menus

+
 OLD_CODE_RE = re.compile("^[0-9a-zA-Z]{16}$")
 CODE_RE = re.compile("^[0-9a-zA-Z]{6,7}$")
+NEW10_CODE_RE = re.compile("^[0-9a-zA-Z]{10}$")
+NEW8_CODE_RE = re.compile("^[0-9a-zA-Z]{8}$")

 FAILURE_MSG = "That invite doesn't seem to be valid."
 PERM_MSG = "I need the Administrator permission on this guild to view invite information."

-__version__ = "0.0.2"
+__version__ = "0.0.7"


 class Invites(commands.Cog):
@@ -25,6 +28,10 @@ class Invites(commands.Cog):

        self.config.register_guild(**default_guild)

+    async def red_delete_data_for_user(self, **kwargs):
+        """Nothing to delete"""
+        return
+
    @commands.guild_only()
    @commands.group()
    async def invites(self, ctx: commands.Context):
@@ -35,21 +42,22 @@ 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.me.permissions_in(ctx.channel).administrator:
+        if not ctx.channel.permissions_for(ctx.guild.me).administrator:
            return await self._send_embed(ctx, PERM_MSG)

        if not invite_code_or_url:
-            pages = MenuPages(await ctx.guild.invites())
-            await self._menu(ctx, pages)
+            pages = MenuInvitePages(await ctx.guild.invites())
        else:
            invite_code = await self._find_invite_code(invite_code_or_url)
            if not invite_code:
                return await self._send_embed(ctx, FAILURE_MSG)
+            pages = MenuInvitePages([x for x in await ctx.guild.invites() if x.code == invite_code])
+        await self._menu(ctx, pages)

    @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.me.permissions_in(ctx.channel).administrator:
+        if not ctx.channel.permissions_for(ctx.guild.me).administrator:
            return await self._send_embed(ctx, PERM_MSG)

        if not list_all_invites:
@@ -64,15 +72,19 @@ class Invites(commands.Cog):
                inv_object = await self._get_invite_from_code(ctx, invite_code_or_object)
            else:
                inv_object = invite_code_or_object
+            if not inv_object:
+                # Someone deleted a pinned invite or it expired
+                pinned_invites = await self.config.guild(ctx.guild).pinned_invites()
+                pinned_invites.remove(invite_code_or_object)
+                await self.config.guild(ctx.guild).pinned_invites.set(pinned_invites)
+                continue
            max_uses = await self.get_invite_max_uses(ctx, inv_object)
            inv_details = f"{i+1}. {inv_object.url} [ {inv_object.uses} uses / {max_uses} max ]\n"
            invite_info += inv_details
-        embed = discord.Embed(title=f"Invite Usage for {ctx.guild.name}", description=invite_info)
-        if not list_all_invites:
-            embed.set_footer(text="Only displaying pinned invites.")
-        else:
-            embed.set_footer(text="Displaying all invites.")
-        await ctx.send(embed=embed)
+
+        pagified_stings = [x for x in cf.pagify(invite_info, delims=["\n"], shorten_by=16)]
+        pages = MenuLeaderboardPages(ctx, pagified_stings, show_all=list_all_invites)
+        await self._menu(ctx, pages)

    @invites.command(aliases=["listpinned"])
    async def listpin(self, ctx: commands.Context):
@@ -84,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.me.permissions_in(ctx.channel).administrator:
+        if not ctx.channel.permissions_for(ctx.guild.me).administrator:
            return await self._send_embed(ctx, PERM_MSG)

        invite_code = await self._find_invite_code(invite_code_or_url)
@@ -118,7 +130,7 @@ class Invites(commands.Cog):
    @invites.command(hidden=True)
    async def version(self, ctx):
        """Invites version."""
-        await self._send_embed(ctx, self.__version__)
+        await self._send_embed(ctx, __version__)

    @staticmethod
    async def _check_invite_code(ctx: commands.Context, invite_code: str):
@@ -132,7 +144,12 @@ class Invites(commands.Cog):

    @staticmethod
    async def _find_invite_code(invite_code_or_url: str):
-        invite_match = re.fullmatch(OLD_CODE_RE, invite_code_or_url) or re.fullmatch(CODE_RE, invite_code_or_url)
+        invite_match = (
+            re.fullmatch(OLD_CODE_RE, invite_code_or_url)
+            or re.fullmatch(CODE_RE, invite_code_or_url)
+            or re.fullmatch(NEW10_CODE_RE, invite_code_or_url)
+            or re.fullmatch(NEW8_CODE_RE, invite_code_or_url)
+        )
        if invite_match:
            return invite_code_or_url
        else:
@@ -184,7 +201,7 @@ class Invites(commands.Cog):
        await ctx.send(embed=embed)


-class MenuPages(menus.ListPageSource):
+class MenuInvitePages(menus.ListPageSource):
    def __init__(self, methods: List[discord.Invite]):
        super().__init__(methods, per_page=1)

@@ -228,6 +245,21 @@ class MenuPages(menus.ListPageSource):
        return msg.format(d, h, m, s)


+class MenuLeaderboardPages(menus.ListPageSource):
+    def __init__(self, ctx: commands.Context, entries: List[str], show_all: bool):
+        super().__init__(entries, per_page=1)
+        self.show_all = show_all
+        self.ctx = ctx
+
+    async def format_page(self, menu: MenuActions, page: str) -> discord.Embed:
+        embed = discord.Embed(title=f"Invite Usage for {self.ctx.guild.name}", description=page)
+        if self.show_all is False:
+            embed.set_footer(text="Only displaying pinned invites.")
+        else:
+            embed.set_footer(text="Displaying all invites.")
+        return embed
+
+
 class MenuActions(menus.MenuPages, inherit_buttons=False):
    def reaction_check(self, payload):
        """The function that is used to check whether the payload should be processed.
--- a/latex/init.py
+++ b/latex/init.py
@@ -1,4 +1,7 @@
 from .latex import Latex

-def setup(bot):
-  bot.add_cog(Latex(bot))
+__red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
+
+
+async def setup(bot):
+    await bot.add_cog(Latex(bot))
--- a/latex/info.json
+++ b/latex/info.json
@@ -7,4 +7,4 @@
    "requirements": ["pillow"],
    "type": "COG",
    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
+}
--- a/luigipoker/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(LuigiPoker(bot))
+async def setup(bot):
+    await bot.add_cog(LuigiPoker(bot))
--- a/luigipoker/info.json
+++ b/luigipoker/info.json
@@ -1,9 +1,9 @@
 {
-	"author": ["aikaterna", "themario30"],
-	"description": "Play the Luigi Poker minigame from New Super Mario Brothers.",
-	"install_msg": "Thanks for installing.",
-	"short": "A Luigi poker minigame.",
-	"tags": ["poker", "game"],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
+    "author": ["aikaterna", "themario30"],
+    "description": "Play the Luigi Poker minigame from New Super Mario Brothers.",
+    "install_msg": "Thanks for installing.",
+    "short": "A Luigi poker minigame.",
+    "tags": ["poker", "game"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
--- a/massunban/init.py
+++ b/massunban/init.py
@@ -1,7 +1,7 @@
-from .region import Region
+from .massunban import MassUnban

 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."


-def setup(bot):
-    bot.add_cog(Region())
+async def setup(bot):
+    await bot.add_cog(MassUnban(bot))
--- a/massunban/info.json
+++ b/massunban/info.json
@@ -0,0 +1,7 @@
+{
+    "author": ["aikaterna"],
+    "install_msg": "Thanks for installing. Please read the help for the `massunban` command to get started, once you have loaded the cog.",
+    "short": "Mass unban users.",
+    "description": "Mass unban users by the ban reason used.",
+    "tags": ["unban"]
+}
--- a/massunban/massunban.py
+++ b/massunban/massunban.py
@@ -0,0 +1,78 @@
+import asyncio
+import discord
+from redbot.core import checks, commands
+from redbot.core.utils.predicates import MessagePredicate
+
+
+class MassUnban(commands.Cog):
+    """Unban all users, or users with a specific ban reason."""
+
+    async def red_delete_data_for_user(self, **kwargs):
+        """Nothing to delete."""
+        return
+
+    def __init__(self, bot):
+        self.bot = bot
+
+    @commands.guild_only()
+    @commands.command()
+    @checks.admin_or_permissions(manage_guild=True)
+    async def massunban(self, ctx, *, ban_reason = None):
+        """
+        Mass unban everyone, or specific people.
+        
+        `ban_reason` is what the bot looks for in the original ban reason to qualify a user for an unban. It is case-insensitive.
+        
+        When Red is used to ban a user, the ban reason looks like:
+        `action requested by aikaterna#1393 (id 154497072148643840). reason: bad person`
+        Using `[p]massunban bad person` will unban this user as "bad person" is contained in the original ban reason.
+        Using `[p]massunban aikaterna` will unban every user banned by aikaterna, if Red was used to ban them in the first place.
+        For users banned using the right-click ban option in Discord, the ban reason is only what the mod puts when it asks for a reason, so using the mod name to unban won't work.
+        
+        Every unban will show up in your modlog if mod logging is on for unbans. Check `[p]modlogset cases` to verify if mod log creation on unbans is on.
+        This can mean that your bot will be ratelimited on sending messages if you unban lots of users as it will create a modlog entry for each unban.
+        """
+        try:
+            banlist = await ctx.guild.bans()
+        except discord.errors.Forbidden:
+            msg = "I need the `Ban Members` permission to fetch the ban list for the guild."
+            await ctx.send(msg)
+            return
+
+        bancount = len(banlist)
+        if bancount == 0:
+            await ctx.send("No users are banned from this server.")
+            return
+
+        unban_count = 0
+        if not ban_reason:
+            warning_string = (
+                "Are you sure you want to unban every banned person on this server?\n"
+                f"**Please read** `{ctx.prefix}help massunban` **as this action can cause a LOT of modlog messages!**\n"
+                "Type `Yes` to confirm, or `No` to cancel."
+            )
+            await ctx.send(warning_string)
+            pred = MessagePredicate.yes_or_no(ctx)
+            try:
+                await self.bot.wait_for("message", check=pred, timeout=15)
+                if pred.result is True:
+                    async with ctx.typing():
+                        for ban_entry in banlist:
+                            await ctx.guild.unban(ban_entry.user, reason=f"Mass Unban requested by {str(ctx.author)} ({ctx.author.id})")
+                            await asyncio.sleep(0.5)
+                            unban_count += 1
+                else:
+                    return await ctx.send("Alright, I'm not unbanning everyone.")
+            except asyncio.TimeoutError:
+                return await ctx.send("Response timed out. Please run this command again if you wish to try again.")
+        else:
+            async with ctx.typing():
+                for ban_entry in banlist:
+                    if not ban_entry.reason:
+                        continue
+                    if ban_reason.lower() in ban_entry.reason.lower():
+                        await ctx.guild.unban(ban_entry.user, reason=f"Mass Unban requested by {str(ctx.author)} ({ctx.author.id})")
+                        await asyncio.sleep(0.5)
+                        unban_count += 1
+
+        await ctx.send(f"Done. Unbanned {unban_count} users.")
--- a/noflippedtables/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(NoFlippedTables(bot))
+async def setup(bot):
+    await bot.add_cog(NoFlippedTables(bot))
--- a/noflippedtables/info.json
+++ b/noflippedtables/info.json
@@ -1,10 +1,8 @@
 {
-    "name" : "NoFlippedTables",
    "author" : ["irdumb", "aikaterna"],
    "short" : "Unflip some tables.",
    "description" : "Unflip all the flipped tables.",
    "install_msg" : "Usage: [p]help tableset",
    "tags" : ["noflippedtables", "no flip", "tables"],
-    "disabled" : false,
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}
--- a/nolinks/info.json
+++ b/nolinks/info.json
@@ -1,18 +0,0 @@
-{
-	"author": [
-		"aikaterna"
-	],
-	"description": "Removes all links in specified channels, with the ability to whitelist roles.",
-    "install_msg": "Thanks for installing. Use `[p]nolinks` to get started.",
-    "min_python_version": [3, 6, 0],
-    "permissions" : [
-		"manage_messages"
-	],
-	"short": "No links allowed.",
-	"tags": [
-		"links",
-        "automod"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
--- a/nolinks/nolinks.py
+++ b/nolinks/nolinks.py
@@ -1,151 +0,0 @@
-import discord
-import re
-from redbot.core import Config, commands, checks
-
-LINKS = re.compile(
-    "(([\w]+:)?//)?(([\d\w]|%[a-fA-f\d]{2,2})+(:([\d\w]|%[a-fA-f\d]{2,2})+)?@)?([\d\w][-\d\w]{0,253}[\d\w]\.)+[\w]{2,63}(:[\d]+)?(/([-+_~.\d\w]|%[a-fA-f\d]{2,2})*)*(\?(&?([-+_~.\d\w]|%[a-fA-f\d]{2,2})=?)*)?(#([-+_~.\d\w]|%[a-fA-f\d]{2,2})*)?"
-)
-
-
-class NoLinks(commands.Cog):
-    """A heavy-handed hammer for anything that looks like a link."""
-
-    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, 2740131001, force_registration=True)
-
-        default_guild = {"report_channel": None, "role": [], "watching": []}
-
-        self.config.register_guild(**default_guild)
-
-    @commands.group()
-    @checks.mod_or_permissions(administrator=True)
-    @commands.guild_only()
-    async def nolinks(self, ctx):
-        """Configuration options."""
-        pass
-
-    @nolinks.command()
-    async def channel(self, ctx, channel: discord.TextChannel = None):
-        """Set the message transfer channel. Leave the channel blank to turn it off."""
-        if not channel:
-            await self.config.guild(ctx.guild).report_channel.clear()
-            return await ctx.send("Message transfer channel turned off.")
-        await self.config.guild(ctx.guild).report_channel.set(channel.id)
-        await ctx.send(f"Message transfer channel set to: {channel.mention}.")
-
-    @nolinks.command()
-    async def rolelist(self, ctx):
-        """List whitelisted roles."""
-        role_list = await self.config.guild(ctx.guild).role()
-        role_msg = "Whitelisted Roles:\n"
-        for role in role_list:
-            role_obj = discord.utils.get(ctx.guild.roles, id=role)
-            role_msg += f"{role_obj.name}\n"
-        await ctx.send(role_msg)
-
-    @nolinks.command()
-    async def removerole(self, ctx, *, role_name: discord.Role):
-        """Remove a whitelisted role."""
-        role_list = await self.config.guild(ctx.guild).role()
-        if role_name.id in role_list:
-            role_list.remove(role_name.id)
-        else:
-            return await ctx.send("Role not in whitelist.")
-        await self.config.guild(ctx.guild).role.set(role_list)
-        role_obj = discord.utils.get(ctx.guild.roles, id=role_name.id)
-        await ctx.send(f"{role_obj.name} removed from the link whitelist.")
-
-    @nolinks.command()
-    async def role(self, ctx, *, role_name: discord.Role):
-        """Add a whitelisted role."""
-        role_list = await self.config.guild(ctx.guild).role()
-        if role_name.id not in role_list:
-            role_list.append(role_name.id)
-        await self.config.guild(ctx.guild).role.set(role_list)
-        role_obj = discord.utils.get(ctx.guild.roles, id=role_name.id)
-        await ctx.send(f"{role_obj.name} appended to the role whitelist.")
-
-    @nolinks.command()
-    async def watch(self, ctx, channel: discord.TextChannel):
-        """Add a channel to watch. Links will be removed in these channels."""
-        channel_list = await self.config.guild(ctx.guild).watching()
-        if channel.id not in channel_list:
-            channel_list.append(channel.id)
-        await self.config.guild(ctx.guild).watching.set(channel_list)
-        await ctx.send(f"{self.bot.get_channel(channel.id).mention} will have links removed.")
-
-    @nolinks.command()
-    async def watchlist(self, ctx):
-        """List the channels being watched."""
-        channel_list = await self.config.guild(ctx.guild).watching()
-        msg = "Links will be removed in:\n"
-        if not channel_list:
-            msg += "No channels."
-        else:
-            remove_list = []
-            for channel in channel_list:
-                channel_obj = self.bot.get_channel(channel)
-                if not channel_obj:
-                    remove_list.append(channel)
-                else:
-                    msg += f"{channel_obj.mention}\n"
-            if remove_list:
-                new_list = [x for x in channel_list if x not in remove_list]
-                await self.config.guild(ctx.guild).watching.set(new_list)
-                if len(remove_list) == len(channel_list):
-                    msg += "No channels."
-        await ctx.send(msg)
-
-    @nolinks.command()
-    async def unwatch(self, ctx, channel: discord.TextChannel):
-        """Remove a channel from the watch list."""
-        channel_list = await self.config.guild(ctx.guild).watching()
-        if channel.id in channel_list:
-            channel_list.remove(channel.id)
-        else:
-            return await ctx.send("Channel is not being watched.")
-        await self.config.guild(ctx.guild).watching.set(channel_list)
-        await ctx.send(f"{self.bot.get_channel(channel.id).mention} will not have links removed.")
-
-    @commands.Cog.listener()
-    async def on_message(self, message):
-        if isinstance(message.channel, discord.abc.PrivateChannel):
-            return
-        if message.author.bot:
-            return
-        data = await self.config.guild(message.guild).all()
-        watch_channel_list = data["watching"]
-        if not watch_channel_list:
-            return
-        if message.channel.id not in watch_channel_list:
-            return
-        allowed_roles = []
-        for role in data["role"]:
-            whitelist_role = discord.utils.get(message.author.roles, id=role)
-            if whitelist_role:
-                allowed_roles.append(whitelist_role)
-        message_channel = self.bot.get_channel(data["report_channel"])
-        if not allowed_roles:
-            try:
-                sentence = message.content.split()
-                for word in sentence:
-                    if self._match_url(word):
-                        msg = "**Message Removed in** {} ({})\n".format(message.channel.mention, message.channel.id)
-                        msg += "**Message sent by**: {} ({})\n".format(message.author.name, message.author.id)
-                        msg += "**Message content**:\n{}".format(message.content)
-                        if message_channel:
-                            await message_channel.send(msg)
-                        await message.delete()
-            except Exception as e:
-                if message_channel:
-                    await message_channel.send(e)
-                pass
-
-    @staticmethod
-    def _match_url(url):
-        return LINKS.match(url)
--- a/otherbot/init.py
+++ b/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):
-    cog = Otherbot(bot)
-    await cog.generate_cache()
-    bot.add_cog(cog)
+    n = Otherbot(bot)
+    await n.generate_cache()
+    await bot.add_cog(n)
--- a/otherbot/info.json
+++ b/otherbot/info.json
@@ -1,16 +1,10 @@
 {
-	"author": [
-		"aikaterna", "Predä 。#1001"
-	],
-	"description": "Alerts a role when bot(s) go offline.",
+    "author": ["aikaterna", "Predä"],
+    "description": "Alerts a role when bot(s) go offline.",
    "install_msg": "Thanks for installing, have fun.",
-    "permissions" : [
-		"manage_roles"
-	],
-	"short": "Alerts a role when bot(s) go offline.",
-	"tags": [
-		"bots"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store end user data. This cog does store discord IDs as needed for operation. "
+    "permissions" : ["manage_roles"],
+    "short": "Alerts a role when bot(s) go offline.",
+    "tags": ["bot", "offline", "uptime"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store end user data. This cog does store discord IDs as needed for operation. "
 }
--- a/otherbot/otherbot.py
+++ b/otherbot/otherbot.py
@@ -4,7 +4,6 @@ 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}"
@@ -12,7 +11,7 @@ DEFAULT_ONLINE_EMOJI = "\N{WHITE HEAVY CHECK MARK}"

 class Otherbot(commands.Cog):
    __author__ = ["aikaterna", "Predä 。#1001"]
-    __version__ = "0.10"
+    __version__ = "0.11"

    async def red_delete_data_for_user(
        self, *, requester: Literal["discord", "owner", "user", "user_strict"], user_id: int,
@@ -126,7 +125,8 @@ class Otherbot(commands.Cog):
                    else:
                        msg += f"**{name}**: {guild_data[attr]}\n"
                em.description = msg
-                em.set_thumbnail(url=guild.icon_url)
+                if guild.icon:
+                    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_member_update(self, before: discord.Member, after: discord.Member):
+    async def on_presence_update(self, before: discord.Member, after: discord.Member):
        if after.guild is None or not after.bot:
            return

@@ -368,19 +368,16 @@ class Otherbot(commands.Cog):
                    em = discord.Embed(
                        color=0x8B0000,
                        description=f"{after.mention} is offline. {data['offline_emoji']}",
-                        timestamp=datetime.utcnow(),
+                        timestamp=discord.utils.utcnow(),
                    )
                    if not data["ping"]:
                        await channel.send(embed=em)
                    else:
-                        if discord.version_info.minor < 4:
-                            await channel.send(f"<@&{data['ping']}>", embed=em)
-                        else:
-                            await channel.send(
-                                f"<@&{data['ping']}>",
-                                embed=em,
-                                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']}")
@@ -401,19 +398,16 @@ class Otherbot(commands.Cog):
                    em = discord.Embed(
                        color=0x008800,
                        description=f"{after.mention} is back online. {data['online_emoji']}",
-                        timestamp=datetime.utcnow(),
+                        timestamp=discord.utils.utcnow(),
                    )
                    if not data["ping"]:
                        await channel.send(embed=em)
                    else:
-                        if discord.version_info.minor < 4:
-                            await channel.send(f"<@&{data['ping']}>", embed=em)
-                        else:
-                            await channel.send(
-                                f"<@&{data['ping']}>",
-                                embed=em,
-                                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(
--- a/partycrash/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(PartyCrash(bot))
+async def setup(bot):
+    await bot.add_cog(PartyCrash(bot))
--- a/partycrash/info.json
+++ b/partycrash/info.json
@@ -1,16 +1,10 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Posts invites to servers, if the bot is allowed to view them. Does not generate new invites.",
-    "install_msg": "Thanks for installing, have fun.",
-    "permissions" : [
-		"manage_guild"
-	],
-	"short": "Post server invites.",
-	"tags": [
-		"invite"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
+    "author": ["aikaterna", "Will (tekulvw)"],
+    "description": "Posts invites to servers, if the bot is allowed to view them. Does not generate new invites.",
+    "install_msg": "Note that having an invite available for a server does not automatically grant you permissions to join said server. Thanks for installing, have fun.",
+    "permissions" : ["manage_guild"],
+    "short": "Post server invites.",
+    "tags": ["invite"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
--- a/pingtime/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(Pingtime(bot))
+async def setup(bot):
+    await bot.add_cog(Pingtime(bot))
--- a/pingtime/info.json
+++ b/pingtime/info.json
@@ -1,14 +1,9 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "It's ping... with latency. Shows all shards.",
+    "author": ["aikaterna"],
+    "description": "It's ping... with latency. Shows all shards.",
    "install_msg": "Thanks for installing, have fun.",
-	"short": "Ping pong.",
-	"tags": [
-		"pingtime",
-        "latency"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
+    "short": "Ping pong.",
+    "tags": ["ping", "pingtime", "latency"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}
--- a/pressf/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(PressF(bot))
+async def setup(bot):
+    await bot.add_cog(PressF(bot))
--- a/pressf/info.json
+++ b/pressf/info.json
@@ -1,14 +1,9 @@
 {
-    "author": [
-        "aikaterna"
-    ],
+    "author": ["aikaterna"],
    "description": "Pay respects to a thing or user by pressing f.",
    "install_msg": "Thanks for installing, have fun.",
    "short": "Press f to pay respects.",
-    "tags": [
-        "pressf",
-        "respects"
-    ],
+    "tags": ["f", "pressf", "respects"],
    "type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
--- a/pressf/pressf.py
+++ b/pressf/pressf.py
@@ -23,7 +23,6 @@ class PressF(commands.Cog):
            return await ctx.send(
                "Oops! I'm still paying respects in this channel, you'll have to wait until I'm done."
            )
-        self.channels[str(ctx.channel.id)] = {}

        if user:
            answer = user.display_name
@@ -36,13 +35,12 @@ class PressF(commands.Cog):
            try:
                pressf = await ctx.bot.wait_for("message", timeout=120.0, check=check)
            except asyncio.TimeoutError:
-                del self.channels[str(ctx.channel.id)]
                return await ctx.send("You took too long to reply.")

            answer = pressf.content[:1900]

        message = await ctx.send(
-            f"Everyone, let's pay respects to **{filter_mass_mentions(answer)}**! Press the f reaction on the this message to pay respects."
+            f"Everyone, let's pay respects to **{filter_mass_mentions(answer)}**! Press the f reaction on this message to pay respects."
        )
        await message.add_reaction("\U0001f1eb")
        self.channels[str(ctx.channel.id)] = {"msg_id": message.id, "reacted": []}
--- a/pupper/init.py
+++ b/pupper/init.py
@@ -4,4 +4,4 @@ __red_end_user_data_statement__ = "This cog does not persistently store data or


 async def setup(bot):
-    bot.add_cog(Pupper(bot))
+    await bot.add_cog(Pupper(bot))
--- a/pupper/info.json
+++ b/pupper/info.json
@@ -1,13 +1,9 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Pupper is a configurable pet that can hand out credits.",
+    "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."
+    "short": "Pet the dog.",
+    "tags": ["pets"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
--- a/pupper/pupper.py
+++ b/pupper/pupper.py
@@ -47,7 +47,8 @@ class Pupper(commands.Cog):
                channel_names = []
                for channel_id in guild_data["channel"]:
                    channel_obj = self.bot.get_channel(channel_id)
-                    channel_names.append(channel_obj.name)
+                    if channel_obj:
+                        channel_names.append(channel_obj.name)

            space = "\N{EN SPACE}"
            toggle = "Active" if guild_data["toggle"] else "Inactive"
@@ -94,7 +95,7 @@ class Pupper(commands.Cog):

    @pets.command()
    async def cooldown(self, ctx, seconds: int = None):
-        """Set the pet appearance cooldown in seconds. 
+        """Set the pet appearance cooldown in seconds.

        300s/5 minute minimum. Default is 3600s/1 hour."""

@@ -241,6 +242,11 @@ class Pupper(commands.Cog):
                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": "👋"}
--- a/quiz/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(Quiz(bot))
+async def setup(bot):
+    await bot.add_cog(Quiz(bot))
--- a/quiz/info.json
+++ b/quiz/info.json
@@ -1,9 +1,9 @@
 {
-	"author": ["Keane", "aikaterna"],
-	"description": "Play a kahoot-like trivia game.",
-	"install_msg": "Thanks for installing.",
-	"short": "Play a kahoot-like trivia game.",
-	"tags": ["trivia", "quiz"],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
+    "author": ["Keane", "aikaterna"],
+    "description": "Play a kahoot-like trivia game.",
+    "install_msg": "Thanks for installing.",
+    "short": "Play a kahoot-like trivia game.",
+    "tags": ["trivia", "quiz"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}
--- a/quiz/quiz.py
+++ b/quiz/quiz.py
@@ -108,7 +108,10 @@ class Quiz(commands.Cog):
            if 9 <= int(category_name_or_id) >= 32:
                return await ctx.send(f"Invalid category number. Use `{ctx.prefix}quiz categories` to see a list.")
            category_id = category_name_or_id
-            category_name = await self.category_name_from_id(int(category_name_or_id))
+            try:
+                category_name = await self.category_name_from_id(int(category_name_or_id))
+            except RuntimeError:
+                return await ctx.send(f"Invalid category ID. Use `{ctx.prefix}quiz categories` to see a list.")
        else:
            # cat name specified
            try:
--- a/region/info.json
+++ b/region/info.json
@@ -1,10 +0,0 @@
-{
-    "name" : "region",
-    "author" : ["aikaterna"],
-    "short" : "Change the Discord server's region.",
-    "description" : "Change the Discord server's region with a command.",
-    "install_msg" : "Thanks for installing.",
-    "tags" : ["voice region", "region"],
-    "disabled" : false,
-    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
--- a/region/region.py
+++ b/region/region.py
@@ -1,51 +0,0 @@
-import discord
-from redbot.core import checks, commands
-from redbot.core.utils.chat_formatting import humanize_list
-
-
-class Region(commands.Cog):
-    """Change the guild voice region."""
-
-    async def red_delete_data_for_user(self, **kwargs):
-        """ Nothing to delete """
-        return
-
-    @checks.mod_or_permissions(administrator=True)
-    @commands.cooldown(1, 60, discord.ext.commands.BucketType.guild)
-    @commands.command()
-    async def region(self, ctx, *, region: str):
-        """Set the current guild's voice region."""
-        regions = [
-            "japan",
-            "singapore",
-            "eu-central",
-            "europe",
-            "india",
-            "us-central",
-            "london",
-            "eu-west",
-            "amsterdam",
-            "brazil",
-            "dubai",
-            "us-west",
-            "hongkong",
-            "us-south",
-            "southafrica",
-            "us-east",
-            "sydney",
-            "frankfurt",
-            "russia",
-        ]
-        region = region.replace(" ", "-")
-        if region not in regions:
-            ctx.command.reset_cooldown(ctx)
-            return await ctx.send(
-                f"`{region}` was not found in the list of Discord voice regions. Valid regions are: {humanize_list(regions)}."
-            )
-        try:
-            await ctx.guild.edit(region=region)
-        except discord.errors.Forbidden:
-            return await ctx.send("I don't have permissions to edit this guild's settings.")
-        except discord.errors.HTTPException:
-            return await ctx.send(f"Error: An invalid server region was passed: `{region}`")
-        await ctx.send(f"The voice server region for `{ctx.guild.name}` has been changed to `{region}`.")
--- a/retrosign/info.json
+++ b/retrosign/info.json
@@ -1,20 +0,0 @@
-{
-	"author": [
-		"aikaterna"
-	],
-	"description": "A port of Anismash's retrosign cog for v2: <https://github.com/Anismash/Ani-Cogs/tree/master/retrosign",
-    "install_msg": "Thanks for installing, have fun.",
-    "permissions" : [
-		"attach_files"
-	],
-	"requirements": [
-		"bs4"
-	],
-	"short": "Posts an image of text",
-	"tags": [
-		"retro",
-        "80s"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
--- a/retrosign/retrosign.py
+++ b/retrosign/retrosign.py
@@ -1,65 +0,0 @@
-# This is a rewrite port of a cog from Anismash:
-# https://github.com/Anismash/Ani-Cogs/blob/master/retrosign/retrosign.py
-
-import aiohttp
-from bs4 import BeautifulSoup as bs
-import discord
-from redbot.core import commands
-from io import BytesIO
-from random import choice
-import re
-import unicodedata
-
-
-class Retrosign(commands.Cog):
-    """Make an 80s retro sign. Originally by Anismash"""
-
-    async def red_delete_data_for_user(self, **kwargs):
-        """ Nothing to delete """
-        return
-
-    def __init__(self, bot):
-        self.bot = bot
-        self.session = aiohttp.ClientSession()
-
-    @commands.cooldown(1, 15, discord.ext.commands.BucketType.guild)
-    @commands.command(name="retrosign")
-    async def retrosign(self, ctx, *, content: str):
-        """Make a retrosign with 3 words seperated by ';' or with one word in the middle."""
-        texts = [t.strip() for t in content.split(";")]
-        if len(texts) == 1:
-            lenstr = len(texts[0])
-            if lenstr <= 15:
-                data = dict(bcg=choice([1, 2, 3, 4, 5]), txt=choice([1, 2, 3, 4]), text1="", text2=texts[0], text3="",)
-            else:
-                return await ctx.send("\N{CROSS MARK} Your line is too long (14 character limit)")
-        elif len(texts) == 3:
-            texts[0] = unicodedata.normalize("NFD", texts[0]).encode("ascii", "ignore")
-            texts[0] = texts[0].decode("UTF-8")
-            texts[0] = re.sub(r"[^A-Za-z0-9 ]", "", texts[0])
-            if len(texts[0]) >= 15:
-                return await ctx.send("\N{CROSS MARK} Your first line is too long (14 character limit)")
-            if len(texts[1]) >= 13:
-                return await ctx.send("\N{CROSS MARK} Your second line is too long (12 character limit)")
-            if len(texts[2]) >= 26:
-                return await ctx.send("\N{CROSS MARK} Your third line is too long (25 character limit)")
-            data = dict(
-                bcg=choice([1, 2, 3, 4, 5]), txt=choice([1, 2, 3, 4]), text1=texts[0], text2=texts[1], text3=texts[2],
-            )
-        else:
-            return await ctx.send("\N{CROSS MARK} please provide three words seperated by ';' or one word")
-
-        async with ctx.channel.typing():
-            async with self.session.post("https://photofunia.com/effects/retro-wave", data=data) as response:
-                if response.status == 200:
-                    soup = bs(await response.text(), "html.parser")
-                    download_url = soup.find("div", class_="downloads-container").ul.li.a["href"]
-                    async with self.session.request("GET", download_url) as image_response:
-                        if image_response.status == 200:
-                            image_data = await image_response.read()
-                            with BytesIO(image_data) as temp_image:
-                                image = discord.File(fp=temp_image, filename="image.png")
-                                await ctx.channel.send(file=image)
-
-    def cog_unload(self):
-        self.bot.loop.create_task(self.session.close())
--- a/rndstatus/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(RndStatus(bot))
+async def setup(bot):
+    await bot.add_cog(RndStatus(bot))
--- a/rndstatus/info.json
+++ b/rndstatus/info.json
@@ -1,14 +1,9 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Random statuses with an optional bot stats mode. Ported from Twentysix's v2 cog.",
-	"install_msg": "Thanks for installing, have fun.",
-	"min_bot_version": "3.3.6",
-	"short": "Random bot statuses",
-	"tags": [
-		"status"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
+    "author": ["aikaterna", "Twentysix"],
+    "description": "Random statuses with an optional bot stats mode. Ported from Twentysix's v2 cog.",
+    "install_msg": "Thanks for installing, have fun.",
+    "short": "Random bot statuses",
+    "tags": ["status"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
--- a/rndstatus/rndstatus.py
+++ b/rndstatus/rndstatus.py
@@ -101,15 +101,16 @@ class RndStatus(commands.Cog):
        0 = Playing
        1 = Streaming
        2 = Listening
-        3 = Watching"""
-        if 0 <= status_type <= 3:
-            rnd_type = {0: "playing", 1: "streaming", 2: "listening", 3: "watching"}
+        3 = Watching
+        5 = Competing"""
+        if 0 <= status_type <= 3 or 0 != 5:
+            rnd_type = {0: "playing", 1: "streaming", 2: "listening", 3: "watching", 5: "competing"}
            await self.config.type.set(status_type)
            await self.presence_updater()
            await ctx.send(f"Rndstatus activity type set to {rnd_type[status_type]}.")
        else:
            await ctx.send(
-                f"Status activity type must be between 0 and 3. "
+                f"Status activity type must be between 0 and 3 or 5. "
                f"See `{ctx.prefix}help rndstatus type` for more information."
            )

@@ -139,17 +140,19 @@ class RndStatus(commands.Cog):
        while True:
            try:
                await self.presence_updater()
-                await asyncio.sleep(int(delay))
-            except asyncio.CancelledError:
-                break
-            except Exception as e:
-                log.exception(e, exc_info=e)
+            except Exception:
+                log.exception("Something went wrong in maybe_update_presence task:")
+
+            await asyncio.sleep(int(delay))

    async def presence_updater(self):
        pattern = re.compile(rf"<@!?{self.bot.user.id}>")
        cog_settings = await self.config.all()
        guilds = self.bot.guilds
-        guild = next(g for g in guilds if not g.unavailable)
+        try:
+            guild = next(g for g in guilds if not g.unavailable)
+        except StopIteration:
+            return
        try:
            current_game = str(guild.me.activity.name)
        except AttributeError:
--- a/rss/init.py
+++ b/rss/init.py
@@ -2,8 +2,10 @@ from redbot.core import commands

 from .rss import RSS

+__red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."
+

 async def setup(bot: commands.Bot):
    n = RSS(bot)
-    bot.add_cog(n)
+    await bot.add_cog(n)
    n.initialize()
--- a/rss/color.py
+++ b/rss/color.py
@@ -1,9 +1,70 @@
+from math import sqrt
 import discord
 import re
-from scipy.spatial import KDTree
 import webcolors


+_DISCORD_COLOURS = {
+    discord.Color.teal().to_rgb(): 'teal',
+    discord.Color.dark_teal().to_rgb(): 'dark_teal',
+    discord.Color.green().to_rgb(): 'green',
+    discord.Color.dark_green().to_rgb(): 'dark_green',
+    discord.Color.blue().to_rgb(): 'blue',
+    discord.Color.dark_blue().to_rgb(): 'dark_blue',
+    discord.Color.purple().to_rgb(): 'purple',
+    discord.Color.dark_purple().to_rgb(): 'dark_purple',
+    discord.Color.magenta().to_rgb(): 'magenta',
+    discord.Color.dark_magenta().to_rgb(): 'dark_magenta',
+    discord.Color.gold().to_rgb(): 'gold',
+    discord.Color.dark_gold().to_rgb(): 'dark_gold',
+    discord.Color.orange().to_rgb(): 'orange',
+    discord.Color.dark_orange().to_rgb(): 'dark_orange',
+    discord.Color.red().to_rgb(): 'red',
+    discord.Color.dark_red().to_rgb(): 'dark_red',
+    discord.Color.lighter_grey().to_rgb(): 'lighter_grey',
+    discord.Color.light_grey().to_rgb(): 'light_grey',
+    discord.Color.dark_grey().to_rgb(): 'dark_grey',
+    discord.Color.darker_grey().to_rgb(): 'darker_grey',
+    discord.Color.blurple().to_rgb(): 'old_blurple',
+    discord.Color(0x4a90e2).to_rgb(): 'new_blurple',
+    discord.Color.greyple().to_rgb(): 'greyple',
+    discord.Color.dark_theme().to_rgb(): 'discord_dark_theme'
+}
+
+_RGB_NAME_MAP = {webcolors.hex_to_rgb(hexcode): name for hexcode, name in webcolors.css3_hex_to_names.items()}
+_RGB_NAME_MAP.update(_DISCORD_COLOURS)
+
+
+def _distance(point_a: tuple, point_b: tuple):
+    """
+    Euclidean distance between two points using rgb values as the metric space.
+    """
+    # rgb values
+    x1, y1, z1 = point_a
+    x2, y2, z2 = point_b
+
+    # distances
+    dx = x1 - x2
+    dy = y1 - y2
+    dz = z1 - z2
+
+    # final distance
+    return sqrt(dx**2 + dy**2 + dz**2)
+
+def _linear_nearest_neighbour(all_points: list, pivot: tuple):
+    """
+    Check distance against all points from the pivot and return the distance and nearest point.
+    """
+    best_dist = None
+    nearest = None
+    for point in all_points:
+        dist = _distance(point, pivot)
+        if best_dist is None or dist < best_dist:
+            best_dist = dist
+            nearest = point
+    return best_dist, nearest
+
+
 class Color:
    """Helper for color handling."""

@@ -43,17 +104,10 @@ class Color:
        hex_code = await self._hex_validator(hex_code)
        rgb_tuple = await self._hex_to_rgb(hex_code)

-        names = []
-        positions = []
+        positions = list(_RGB_NAME_MAP.keys())
+        dist, nearest = _linear_nearest_neighbour(positions, rgb_tuple)

-        for hex, name in webcolors.css3_hex_to_names.items():
-            names.append(name)
-            positions.append(webcolors.hex_to_rgb(hex))
-
-        spacedb = KDTree(positions)
-        dist, index = spacedb.query(rgb_tuple)
-
-        return names[index]
+        return _RGB_NAME_MAP[nearest]

    async def _hex_to_rgb(self, hex_code: str):
        """
--- a/rss/info.json
+++ b/rss/info.json
@@ -1,10 +1,10 @@
 {
    "author": ["aikaterna"],
    "install_msg": "Thanks for installing.",
-    "short": "Read RSS feeds",
-    "description": "Read RSS feeds",
+    "short": "Read RSS feeds.",
+    "description": "Read RSS feeds.",
    "tags": ["rss"],
    "permissions": ["embed_links"],
-    "requirements": ["bs4", "feedparser>=6.0.0", "scipy", "webcolors==1.3"],
-    "min_bot_version" : "3.4.0"
+    "requirements": ["bs4", "feedparser>=6.0.0", "webcolors==1.3"],
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
--- a/rss/rss.py
+++ b/rss/rss.py
--- a/seen/init.py
+++ b/seen/init.py
@@ -9,4 +9,4 @@ __red_end_user_data_statement__ = (
 async def setup(bot):
    cog = Seen(bot)
    await cog.initialize()
-    bot.add_cog(cog)
+    await bot.add_cog(cog)
--- a/seen/info.json
+++ b/seen/info.json
@@ -1,13 +1,8 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Check when the user was last active on a server. Originally made by Paddo.",
-	"short": "Check when the user was last active on a server.",
-	"tags": [
-		"seen", 
-		"activity"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store end user data. This cog does store discord IDs and last seen timestamp as needed for operation. "
-}
+    "author": ["aikaterna"],
+    "description": "Check when the user was last active on a server. Originally made by Paddo.",
+    "short": "Check when the user was last active on a server.",
+    "tags": ["seen", "activity"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store end user data. This cog does store discord IDs and last seen timestamp as needed for operation. "
+}
--- a/seen/seen.py
+++ b/seen/seen.py
@@ -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.avatar_url or author.default_avatar_url
+        avatar = author.display_avatar
        em.set_author(name="{} was seen {}".format(author.display_name, ts), icon_url=avatar)
        await ctx.send(embed=em)

--- a/snacktime/init.py
+++ b/snacktime/init.py
@@ -4,4 +4,4 @@ __red_end_user_data_statement__ = "This cog does not persistently store data or


 async def setup(bot):
-    bot.add_cog(Snacktime(bot))
+    await bot.add_cog(Snacktime(bot))
--- a/snacktime/info.json
+++ b/snacktime/info.json
@@ -1,10 +1,8 @@
 {
-    "name" : "Snacktime",
    "author" : ["irdumb", "aikaterna"],
    "short" : "ʕ •ᴥ•ʔ < It's snacktime, who wants snacks?",
    "description" : "snackburr will come around every-so-often if you've asked him to.\nI hear snackburr likes to come around more often when people are partyin.",
    "install_msg" : "A snack delivery bear has arrived ʕ•ᴥ• ʔ",
    "tags" : ["snack", "snacktime", "snackburr", "party", "party time"],
-    "disabled" : false,
    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
--- a/snacktime/snacktime.py
+++ b/snacktime/snacktime.py
@@ -1,6 +1,7 @@
 import asyncio
 import discord
 import logging
+import re
 from random import randint
 from random import choice as randchoice

@@ -46,6 +47,7 @@ class Snacktime(commands.Cog):
            "SNACK_DURATION_VARIANCE": 120,
            "MSGS_BEFORE_EVENT": 8,
            "SNACK_AMOUNT": 200,
+            "USE_CURRENCY": False
        }

        default_channel = {"repeatMissedSnacktimes": 0}
@@ -78,6 +80,14 @@ class Snacktime(commands.Cog):
        phrase = randchoice(SNACKBURR_PHRASES[phrase_type])
        return f"`{persona_phrase} {phrase}`"

+    # Is snackburr gonna like the currency or nah
+    @staticmethod
+    def is_custom(currency_name: str):
+        custom = re.search(r'<:\w*:\d*>', currency_name)
+        animated = re.search(r'<a:\w*:\d*>', currency_name)
+        if custom or animated:
+            return True
+
    @commands.cooldown(1, 1, commands.BucketType.channel)
    @commands.guild_only()
    @commands.command()
@@ -87,17 +97,27 @@ class Snacktime(commands.Cog):

        how bout you guys?
        """
+        use_red_currency = await self.config.guild(ctx.guild).USE_CURRENCY()
+        if use_red_currency:
+            currency_name = await bank.get_currency_name(ctx.guild)
+        else:
+            currency_name = "pb jars"
+        if self.is_custom(currency_name):
+            currency_name = f"`{currency_name}`"
        persona = await self.persona_choice(ctx=ctx, message=None)
        if amount < 0:
            return await ctx.send(f"`{persona} Woah slow down!`")
        if amount > await bank.get_balance(ctx.author):
-            return await ctx.send(f"`{persona} You don't got that much pb!.. don't look at me..`")
+            return await ctx.send(f"`{persona} You don't got that much {currency_name}!.. don't look at me..`")

        await bank.withdraw_credits(ctx.author, amount)

        first_phrase = randchoice(SNACKBURR_PHRASES["EAT_BEFORE"])
        second_phrase = randchoice(SNACKBURR_PHRASES["EAT_AFTER"])
-        await ctx.send(f"`{persona} {ctx.author.display_name} {first_phrase} {second_phrase} {amount} whole pb jars!`")
+
+        await ctx.send(
+            f"`{persona} {ctx.author.display_name} {first_phrase} {second_phrase} {amount} whole {currency_name}!`"
+        )

    @commands.guild_only()
    @commands.group()
@@ -106,13 +126,14 @@ class Snacktime(commands.Cog):
        """snack stuff"""
        if ctx.invoked_subcommand is None:
            guild_data = await self.config.guild(ctx.guild).all()
-            if not guild_data["DELIVER_CHANNELS"]:
-                channel_names = ["No channels set."]
-            else:
-                channel_names = []
+            channel_names = []
+            if guild_data["DELIVER_CHANNELS"]:
                for channel_id in guild_data["DELIVER_CHANNELS"]:
                    channel_obj = self.bot.get_channel(channel_id)
-                    channel_names.append(channel_obj.name)
+                    if channel_obj:
+                        channel_names.append(channel_obj.name)
+            if len(channel_names) == 0:
+                channel_names = ["No channels set."]

            if guild_data["FRIENDS"] is True:
                invite_friends = "Friends only"
@@ -121,12 +142,15 @@ class Snacktime(commands.Cog):
            else:
                invite_friends = "Everyone's invited!"

+            use_red_currency = await self.config.guild(ctx.guild).USE_CURRENCY()
+
            msg = f"[Delivering in]:           {humanize_list(channel_names)}\n"
            msg += f"[Event start delay]:       {guild_data['EVENT_START_DELAY']} seconds\n"
            msg += f"[Event start variance]:    {guild_data['EVENT_START_DELAY_VARIANCE']} seconds\n"
            msg += f"[Friends status]:          {invite_friends}\n"
            msg += f"[Messages before event]:   {guild_data['MSGS_BEFORE_EVENT']}\n"
-            msg += f"[Snack amount limit]:      {guild_data['SNACK_AMOUNT']} pb\n"
+            msg += f"[Snack amount limit]:      {guild_data['SNACK_AMOUNT']}\n"
+            msg += f"[Use custom currency]:     {use_red_currency}\n"
            msg += f"[Snack duration]:          {guild_data['SNACK_DURATION']} seconds\n"
            msg += f"[Snack duration variance]: {guild_data['SNACK_DURATION_VARIANCE']} seconds\n"

@@ -193,12 +217,33 @@ class Snacktime(commands.Cog):
    @snackset.command()
    async def amount(self, ctx, amt: int):
        """How much pb max snackburr should give out to each person per snacktime"""
-
        if amt <= 0:
            await ctx.send("amount must be greater than 0")
        else:
            await self.config.guild(ctx.guild).SNACK_AMOUNT.set(amt)
-            await ctx.send(f"snackburr will now give out {amt} pb max per person per snacktime.")
+            use_red_currency = await self.config.guild(ctx.guild).USE_CURRENCY()
+            if use_red_currency:
+                currency_name = await bank.get_currency_name(ctx.guild)
+            else:
+                currency_name = "pb jars"
+            if self.is_custom(currency_name):
+                currency_name = f"`{currency_name}`"
+            await ctx.send(f"snackburr will now give out {amt} {currency_name} max per person per snacktime.")
+
+    @snackset.command()
+    async def togglecurrency(self, ctx):
+        """Toggle whether to use server currency name instead of pb"""
+        toggled = await self.config.guild(ctx.guild).USE_CURRENCY()
+        if not toggled:
+            currency_name = await bank.get_currency_name(ctx.guild)
+            if self.is_custom(currency_name):
+                await ctx.send("snackburr doesnt like that currency name.. but will use it anyway :unamused:")
+            else:
+                await ctx.send("snackburr will now use the bots currency name... lame.....")
+            await self.config.guild(ctx.guild).USE_CURRENCY.set(True)
+        else:
+            await self.config.guild(ctx.guild).USE_CURRENCY.set(False)
+            await ctx.send("snackburr will now use pb again yay!")

    @snackset.command(name="friends")
    async def snackset_friends(self, ctx, choice: int):
@@ -432,6 +477,14 @@ class Snacktime(commands.Cog):
                        if self.alreadySnacked.get(scid, None) == None:
                            self.alreadySnacked[scid] = []
                        self.alreadySnacked[scid].append(message.author.id)
+
+                        # If user is blacklisted, don't give him/her anything.
+                        # We're still passing it to the list to avoid this calculation down the line,
+                        if await self.bot.allowed_by_whitelist_blacklist(
+                            who=message.author
+                        ) is False:
+                            return
+
                        await asyncio.sleep(randint(1, 6))
                        snack_amount = await self.config.guild(message.guild).SNACK_AMOUNT()
                        snackAmt = randint(1, snack_amount)
@@ -439,10 +492,22 @@ class Snacktime(commands.Cog):
                            if self.acceptInput.get(scid, False):
                                resp = await self.get_response(message, "GIVE")
                                resp = resp.format(message.author.name, snackAmt)
+                                use_red_currency = await self.config.guild(message.guild).USE_CURRENCY()
+                                if use_red_currency:
+                                    currency_name = await bank.get_currency_name(message.guild)
+                                    if self.is_custom(currency_name):
+                                        currency_name = f"`{currency_name}`"
+                                    resp = resp.replace("pb", currency_name)
                                await message.channel.send(resp)
                            else:
                                resp = await self.get_response(message, "LAST_SECOND")
                                resp = resp.format(message.author.name, snackAmt)
+                                use_red_currency = await self.config.guild(message.guild).USE_CURRENCY()
+                                if use_red_currency:
+                                    currency_name = await bank.get_currency_name(message.guild)
+                                    if self.is_custom(currency_name):
+                                        currency_name = f"`{currency_name}`"
+                                    resp = resp.replace("pb", currency_name)
                                await message.channel.send(resp)
                            try:
                                await bank.deposit_credits(message.author, snackAmt)
@@ -468,6 +533,11 @@ class Snacktime(commands.Cog):
                            userWants = True
                            break
                    if userWants:
+                        if await self.bot.allowed_by_whitelist_blacklist(
+                            who=message.author
+                        ) is False:
+                            return
+
                        await asyncio.sleep(randint(1, 6))
                        if self.acceptInput.get(scid, False):
                            resp = await self.get_response(message, "GREEDY")
--- a/timezone/init.py
+++ b/timezone/init.py
@@ -12,5 +12,5 @@ __red_end_user_data_statement__ = (
 )


-def setup(bot):
-    bot.add_cog(Timezone(bot))
+async def setup(bot):
+    await bot.add_cog(Timezone(bot))
--- a/timezone/info.json
+++ b/timezone/info.json
@@ -1,17 +1,9 @@
 {
-	"author": [
-		"aikaterna",
-        "fishyfing"
-	],
-	"description": "Check timezones, user times, or times in specific places. Originally made by Fishyfing.",
-	"short": "Check times for users and places.",
-	"tags": [
-		"time", 
-		"timezone"
-	],
-	"requirements": [
-		"pytz"
-	],
-	"type": "COG",
-	"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."
-}
+    "author": ["aikaterna", "fishyfing"],
+    "description": "Check timezones, user times, or times in specific places. Originally made by Fishyfing.",
+    "short": "Check times for users and places.",
+    "tags": ["time", "timezone"],
+    "requirements": ["pytz"],
+    "type": "COG",
+    "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."
+}
--- a/timezone/timezone.py
+++ b/timezone/timezone.py
@@ -1,25 +1,28 @@
 import discord
 import pytz
 from datetime import datetime
-from pytz import common_timezones
-from pytz import country_timezones
-from typing import Optional, Literal, Tuple, Union
-from redbot.core import Config, commands, checks
+from fuzzywuzzy import fuzz, process
+from typing import Optional, Literal
+from redbot.core import Config, commands
+from redbot.core.utils.chat_formatting import pagify
+from redbot.core.utils.menus import close_menu, menu, DEFAULT_CONTROLS
+
+
+__version__ = "2.1.1"


 class Timezone(commands.Cog):
    """Gets times across the world..."""
-
-    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):
        self.bot = bot
        self.config = Config.get_conf(self, 278049241001, force_registration=True)
        default_user = {"usertime": None}
        self.config.register_user(**default_user)
+        
+    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()

    async def get_usertime(self, user: discord.User):
        tz = None
@@ -29,120 +32,138 @@ class Timezone(commands.Cog):

        return usertime, tz

+    def fuzzy_timezone_search(self, tz: str):
+        fuzzy_results = process.extract(tz.replace(" ", "_"), pytz.common_timezones, limit=500, scorer=fuzz.partial_ratio)
+        matches = [x for x in fuzzy_results if x[1] > 98] 
+        return matches
+
+    async def format_results(self, ctx, tz):
+        if not tz:
+            await ctx.send(
+                "Error: Incorrect format or no matching timezones found.\n"
+                "Use: **Continent/City** with correct capitals or a partial timezone name to search. "
+                "e.g. `America/New_York` or `New York`\nSee the full list of supported timezones here:\n"
+                "<https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
+            )
+            return None
+        elif len(tz) == 1:
+            # command specific response, so don't do anything here
+            return tz
+        else:
+            msg = ""
+            for timezone in tz:
+                msg += f"{timezone[0]}\n"
+
+            embed_list = []
+            for page in pagify(msg, delims=["\n"], page_length=500):
+                e = discord.Embed(title=f"{len(tz)} results, please be more specific.", description=page)
+                e.set_footer(text="https://en.wikipedia.org/wiki/List_of_tz_database_time_zones")
+                embed_list.append(e)
+            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)
+            return None
+
    @commands.guild_only()
    @commands.group()
    async def time(self, ctx):
        """
-            Checks the time.
+        Checks the time.

-            For the list of supported timezones, see here:
-            https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
+        For the list of supported timezones, see here:
+        https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
        """
        pass

    @time.command()
-    async def tz(self, ctx, *, tz: Optional[str] = None):
+    async def tz(self, ctx, *, timezone_name: Optional[str] = None):
        """Gets the time in any timezone."""
-        try:
-            if tz is None:
-                time = datetime.now()
-                fmt = "**%H:%M** %d-%B-%Y"
-                await ctx.send(f"Current system time: {time.strftime(fmt)}")
-            else:
-                if "'" in tz:
-                    tz = tz.replace("'", "")
-                if len(tz) > 4 and "/" not in tz:
-                    await ctx.send(
-                        "Error: Incorrect format. Use:\n **Continent/City** with correct capitals. "
-                        "e.g. `America/New_York`\n See the full list of supported timezones here:\n "
-                        "<https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
-                    )
-                else:
-                    tz = tz.title() if "/" in tz else tz.upper()
-                    if tz not in common_timezones:
-                        raise Exception(tz)
-                    fmt = "**%H:%M** %d-%B-%Y **%Z (UTC %z)**"
-                    time = datetime.now(pytz.timezone(tz))
-                    await ctx.send(time.strftime(fmt))
-        except Exception as e:
-            await ctx.send(f"**Error:** {str(e)} is an unsupported timezone.")
+        if timezone_name is None:
+            time = datetime.now()
+            fmt = "**%H:%M** %d-%B-%Y"
+            await ctx.send(f"Current system time: {time.strftime(fmt)}")
+        else:
+            tz_results = self.fuzzy_timezone_search(timezone_name)
+            tz_resp = await self.format_results(ctx, tz_results)
+            if tz_resp:
+                time = datetime.now(pytz.timezone(tz_resp[0][0]))
+                fmt = "**%H:%M** %d-%B-%Y **%Z (UTC %z)**"
+                await ctx.send(time.strftime(fmt))

    @time.command()
-    async def iso(self, ctx, *, code=None):
+    async def iso(self, ctx, *, iso_code=None):
        """Looks up ISO3166 country codes and gives you a supported timezone."""
-        if code is None:
+        if iso_code is None:
            await ctx.send("That doesn't look like a country code!")
        else:
-            exist = True if code in country_timezones else False
+            exist = True if iso_code.upper() in pytz.country_timezones else False
            if exist is True:
-                tz = str(country_timezones(code))
+                tz = str(pytz.country_timezones(iso_code.upper()))
                msg = (
-                    f"Supported timezones for **{code}:**\n{tz[:-1][1:]}"
+                    f"Supported timezones for **{iso_code.upper()}:**\n{tz[:-1][1:]}"
                    f"\n**Use** `{ctx.prefix}time tz Continent/City` **to display the current time in that timezone.**"
                )
                await ctx.send(msg)
            else:
                await ctx.send(
-                    "That code isn't supported. For a full list, see here: "
-                    "<https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes>"
+                    "That code isn't supported.\nFor a full list, see here: "
+                    "<https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes>\n"
+                    "Use the two-character code under the `Alpha-2 code` column."
                )

    @time.command()
-    async def me(self, ctx, *, tz=None):
+    async def me(self, ctx, *, timezone_name=None):
        """
-            Sets your timezone.
-            Usage: [p]time me Continent/City
+        Sets your timezone.
+        Usage: [p]time me Continent/City
+        Using the command with no timezone will show your current timezone, if any.
        """
-        if tz is None:
-            usertime, tz = await self.get_usertime(ctx.author)
+        if timezone_name is None:
+            usertime, timezone_name = await self.get_usertime(ctx.author)
            if not usertime:
                await ctx.send(
                    f"You haven't set your timezone. Do `{ctx.prefix}time me Continent/City`: "
                    "see <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
                )
            else:
-                time = datetime.now(tz)
+                time = datetime.now(timezone_name)
                time = time.strftime("**%H:%M** %d-%B-%Y **%Z (UTC %z)**")
                msg = f"Your current timezone is **{usertime}.**\n" f"The current time is: {time}"
                await ctx.send(msg)
        else:
-            exist = True if tz.title() in common_timezones else False
-            if exist:
-                if "'" in tz:
-                    tz = tz.replace("'", "")
-                await self.config.user(ctx.author).usertime.set(tz.title())
-                await ctx.send(f"Successfully set your timezone to **{tz.title()}**.")
-            else:
-                await ctx.send(
-                    f"**Error:** Unrecognized timezone. Try `{ctx.prefix}time me Continent/City`: "
-                    "see <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
-                )
+            tz_results = self.fuzzy_timezone_search(timezone_name)
+            tz_resp = await self.format_results(ctx, tz_results)
+            if tz_resp:
+                await self.config.user(ctx.author).usertime.set(tz_resp[0][0])
+                await ctx.send(f"Successfully set your timezone to **{tz_resp[0][0]}**.")

    @time.command()
    @commands.is_owner()
-    async def set(self, ctx, user: discord.Member, *, tz=None):
-        """Allows the mods to edit timezones."""
+    async def set(self, ctx, user: discord.User, *, timezone_name=None):
+        """
+        Allows the bot owner to edit users' timezones.
+        Use a user id for the user if they are not present in your server.
+        """
        if not user:
            user = ctx.author
-        if tz is None:
-            await ctx.send("That timezone is invalid.")
-            return
+        if len(self.bot.users) == 1:
+            return await ctx.send("This cog requires Discord's Privileged Gateway Intents to function properly.")
+        if user not in self.bot.users:
+            return await ctx.send("I can't see that person anywhere.")
+        if timezone_name is None:
+            return await ctx.send_help()
        else:
-            exist = True if tz.title() in common_timezones else False
-            if exist:
-                if "'" in tz:
-                    tz = tz.replace("'", "")
-                await self.config.user(user).usertime.set(tz.title())
-                await ctx.send(f"Successfully set {user.name}'s timezone to **{tz.title()}**.")
-            else:
-                await ctx.send(
-                    f"**Error:** Unrecognized timezone. Try `{ctx.prefix}time set @user Continent/City`: "
-                    "see <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
-                )
+            tz_results = self.fuzzy_timezone_search(timezone_name)
+            tz_resp = await self.format_results(ctx, tz_results)
+            if tz_resp:
+                await self.config.user(user).usertime.set(tz_resp[0][0])
+                await ctx.send(f"Successfully set {user.name}'s timezone to **{tz_resp[0][0]}**.")

    @time.command()
    async def user(self, ctx, user: discord.Member = None):
-        """Shows the current time for user."""
+        """Shows the current time for the specified user."""
        if not user:
            await ctx.send("That isn't a user!")
        else:
@@ -178,12 +199,18 @@ class Timezone(commands.Cog):
        user_diff = user_now.utcoffset().total_seconds() / 60 / 60
        other_now = datetime.now(other_tz)
        other_diff = other_now.utcoffset().total_seconds() / 60 / 60
-        time_diff = int(abs(user_diff - other_diff))
+        time_diff = abs(user_diff - other_diff)
+        time_diff_text = f"{time_diff:g}"
        fmt = "**%H:%M %Z (UTC %z)**"
        other_time = other_now.strftime(fmt)
-        plural = "" if time_diff == 1 else "s"
-        time_amt = "the same time zone as you" if time_diff == 0 else f"{time_diff} hour{plural}"
+        plural = "" if time_diff_text == "1" else "s"
+        time_amt = "the same time zone as you" if time_diff_text == "0" else f"{time_diff_text} hour{plural}"
        position = "ahead of" if user_diff < other_diff else "behind"
-        position_text = "" if time_diff == 0 else f" {position} you"
+        position_text = "" if time_diff_text == "0" else f" {position} you"

        await ctx.send(f"{user.display_name}'s time is {other_time} which is {time_amt}{position_text}.")
+
+    @time.command()
+    async def version(self, ctx):
+        """Show the cog version."""
+        await ctx.send(f"Timezone version: {__version__}.")
--- a/tools/init.py
+++ b/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."


-def setup(bot):
-    bot.add_cog(Tools(bot))
+async def setup(bot):
+    await bot.add_cog(Tools(bot))
--- a/tools/converter.py
+++ b/tools/converter.py
@@ -1,57 +1,45 @@
-"""
-Because discord.py rewrite doesn't come with a general channel converter anymore
-Written by sitryk
-"""
 import discord
-import re
+from fuzzywuzzy import fuzz, process
+from typing import List
+from unidecode import unidecode

-from discord.ext.commands import converter, BadArgument
+from discord.ext.commands.converter import IDConverter, _get_from_guilds
+from discord.ext.commands.errors import BadArgument
+
+from redbot.core import commands


-class GuildChannelConverter(converter.IDConverter, converter.Converter):
+class FuzzyMember(IDConverter):
    """
-    Check order is:
+    Original class written by TrustyJaid#0001
+    https://github.com/TrustyJAID/Trusty-cogs/blob/c739903aa2c8111c58b3d5e695a1221cbe1f57d9/serverstats/converters.py

-    1. Text Channels
-    2. Voice Channels
-    3. Categories
+    This will accept partial names and perform a fuzzy search for
+    members within the guild and return a list of member objects.
+
+    Guidance code on how to do this from:
+    https://github.com/Rapptz/discord.py/blob/rewrite/discord/ext/commands/converter.py#L85
+    https://github.com/Cog-Creators/Red-DiscordBot/blob/V3/develop/redbot/cogs/mod/mod.py#L24
    """

-    async def convert(self, ctx, argument):
+    async def convert(self, ctx: commands.Context, argument: str) -> List[discord.Member]:
        bot = ctx.bot
-        match = self._get_id_match(argument) or re.match(r"<#([0-9]+)>$", argument)
-        result = None
        guild = ctx.guild
+        result = []

-        if match is None:
-            order = [
-                (discord.TextChannel, guild.text_channels),
-                (discord.VoiceChannel, guild.voice_channels),
-                (discord.CategoryChannel, guild.categories),
-            ]
+        members = {m: unidecode(m.name) for m in guild.members}
+        fuzzy_results = process.extract(argument, members, limit=1000, scorer=fuzz.partial_ratio)
+        matching_names = [m[2] for m in fuzzy_results if m[1] > 90]
+        for x in matching_names:
+            result.append(x)

-            # not a mention
-            for c_types in order:
-                if guild:
-                    result = discord.utils.get(c_types[1], name=argument)
-                    if result is not None:
-                        break
-                else:
+        nick_members = {m: unidecode(m.nick) for m in guild.members if m.nick and m not in matching_names}
+        fuzzy_results2 = process.extract(argument, nick_members, limit=50, scorer=fuzz.partial_ratio)
+        matching_nicks = [m[2] for m in fuzzy_results2 if m[1] > 90]
+        for x in matching_nicks:
+            result.append(x)

-                    def check(c):
-                        return isinstance(c, c_types[0]) and c.name == argument
-
-                    result = discord.utils.find(check, bot.get_all_channels())
-                    if result is not None:
-                        break
-        else:
-            channel_id = int(match.group(1))
-            if guild:
-                result = guild.get_channel(channel_id)
-            else:
-                result = converter._get_from_guilds(bot, "get_channel", channel_id)
-
-        if not isinstance(result, (discord.TextChannel, discord.VoiceChannel, discord.CategoryChannel)):
-            raise BadArgument('Channel "{}" not found.'.format(argument))
+        if not result or result == [None]:
+            raise BadArgument('Member "{}" not found'.format(argument))

        return result
--- a/tools/info.json
+++ b/tools/info.json
@@ -1,22 +1,11 @@
 {
-	"author": [
-		"aikaterna",
-        "sitryk"
-	],
-	"description": "Mod and admin tools.",
+    "author": ["aikaterna", "sitryk"],
+    "description": "Mod and admin tools.",
    "install_msg": "Thanks for installing. Use `[p]help` Tools to get started.",
-    "min_python_version": [3, 8, 0],
-    "permissions" : [
-		"ban_members",
-		"manage_channels"
-	],
-	"requirements": [
-		"tabulate"
-	],
-	"short": "Mod and admin tools.",
-	"tags": [
-		"tools"
-	],
-	"type": "COG",
-	"end_user_data_statement": "This cog does not persistently store data or metadata about users."
-}
+    "permissions" : ["ban_members", "manage_channels"],
+    "requirements": ["tabulate", "unidecode"],
+    "short": "Mod and admin tools.",
+    "tags": ["tools"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}
--- a/tools/tools.py
+++ b/tools/tools.py
--- a/trackdecoder/init.py
+++ b/trackdecoder/init.py
@@ -1,7 +1,7 @@
-from .retrosign import Retrosign
+from .trackdecoder import TrackDecoder

 __red_end_user_data_statement__ = "This cog does not persistently store data or metadata about users."


-def setup(bot):
-    bot.add_cog(Retrosign(bot))
+async def setup(bot):
+    await bot.add_cog(TrackDecoder(bot))
--- a/trackdecoder/info.json
+++ b/trackdecoder/info.json
@@ -0,0 +1,9 @@
+{
+    "author": ["aikaterna", "devoxin#0001"],
+    "description": "Utility cog for decoding b64 encoded Lavalink Track strings.",
+    "install_msg": "Thanks for installing.",
+    "short": "Utility cog for decoding b64 encoded Lavalink Track strings.",
+    "tags": ["lavalink"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}
--- a/trackdecoder/trackdecoder.py
+++ b/trackdecoder/trackdecoder.py
@@ -0,0 +1,110 @@
+from base64 import b64decode
+import json
+from io import BytesIO
+import struct
+from types import SimpleNamespace
+
+from redbot.core import checks, commands
+from redbot.core.utils.chat_formatting import box
+
+
+class TrackDecoder(commands.Cog):
+    """Decodes a b64 encoded audio track string."""
+
+    def __init__(self, bot):
+        self.bot = bot
+
+    async def red_delete_data_for_user(self, **kwargs):
+        """Nothing to delete"""
+        return
+
+    @checks.is_owner()
+    @commands.command()
+    @commands.guild_only()
+    async def trackdecode(self, ctx: commands.Context, *, track: str):
+        """
+        Decodes a b64 encoded audio track string.
+
+        This command is possible thanks to devoxin#0001's work.
+        `https://github.com/Devoxin/Lavalink.py`
+        """
+        decoded = self.decode_track(track)
+        if not decoded:
+            return await ctx.send(f"Not a valid track.")
+
+        msg = (
+            f"[Title]:      {decoded.title}\n"
+            f"[Author]:     {decoded.author}\n"
+            f"[URL]:        {decoded.uri}\n"
+            f"[Identifier]: {decoded.identifier}\n"
+            f"[Source]:     {decoded.source}\n"
+            f"[Length]:     {decoded.length}\n"
+            f"[Stream]:     {decoded.is_stream}\n"
+            f"[Position]:   {decoded.position}\n"
+        )
+
+        await ctx.send(box(msg, lang="ini"))
+
+    @staticmethod
+    def decode_track(track, decode_errors="ignore"):
+        """
+        Source is derived from:
+        https://github.com/Devoxin/Lavalink.py/blob/3688fe6aff265ff53928ec811279177a88aa9664/lavalink/utils.py
+        """
+        reader = DataReader(track)
+
+        try:
+            flags = (reader.read_int() & 0xC0000000) >> 30
+        except struct.error:
+            return None
+
+        (version,) = struct.unpack("B", reader.read_byte()) if flags & 1 != 0 else 1
+
+        track = SimpleNamespace(
+            title=reader.read_utf().decode(errors=decode_errors),
+            author=reader.read_utf().decode(),
+            length=reader.read_long(),
+            identifier=reader.read_utf().decode(),
+            is_stream=reader.read_boolean(),
+            uri=reader.read_utf().decode() if reader.read_boolean() else None,
+            source=reader.read_utf().decode(),
+            position=reader.read_long(),
+        )
+
+        return track
+
+
+class DataReader:
+    """
+    Source is from:
+    https://github.com/Devoxin/Lavalink.py/blob/3688fe6aff265ff53928ec811279177a88aa9664/lavalink/datarw.py
+    """
+
+    def __init__(self, ts):
+        self._buf = BytesIO(b64decode(ts))
+
+    def _read(self, n):
+        return self._buf.read(n)
+
+    def read_byte(self):
+        return self._read(1)
+
+    def read_boolean(self):
+        (result,) = struct.unpack("B", self.read_byte())
+        return result != 0
+
+    def read_unsigned_short(self):
+        (result,) = struct.unpack(">H", self._read(2))
+        return result
+
+    def read_int(self):
+        (result,) = struct.unpack(">i", self._read(4))
+        return result
+
+    def read_long(self):
+        (result,) = struct.unpack(">Q", self._read(8))
+        return result
+
+    def read_utf(self):
+        text_length = self.read_unsigned_short()
+        return self._read(text_length)
--- a/trickortreat/init.py
+++ b/trickortreat/init.py
@@ -10,5 +10,5 @@ __red_end_user_data_statement__ = (
 )


-def setup(bot):
-    bot.add_cog(TrickOrTreat(bot))
+async def setup(bot):
+    await bot.add_cog(TrickOrTreat(bot))
--- a/trickortreat/info.json
+++ b/trickortreat/info.json
@@ -1,16 +1,9 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Trick or treating for your server.",
+    "author": ["aikaterna"],
+    "description": "Trick or treating for your server.",
    "install_msg": "Thanks for installing. Use `[p]help TrickOrTreat` to get started, specifically by toggling it on in your server and then setting active trick or treating channels.",
-    "min_python_version": [3, 6, 0],
-	"short": "Trick or treat.",
-	"tags": [
-		"trick or treat",
-        "candy",
-        "pick"
-	],
-	"type": "COG",
-	"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 store user stats for the cog such as their score. Users may remove their own content without making a data removal request. This cog does not support data requests, but will respect deletion requests."
+    "short": "Trick or treat.",
+    "tags": ["trick or treat", "candy", "pick", "halloween"],
+    "type": "COG",
+    "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 store user stats for the cog such as their score. Users may remove their own content without making a data removal request. This cog does not support data requests, but will respect deletion requests."
 }
--- a/trickortreat/trickortreat.py
+++ b/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.3"
+__version__ = "0.1.6"


 class TrickOrTreat(commands.Cog):
@@ -70,9 +70,9 @@ class TrickOrTreat(commands.Cog):
        if not candy_type:
            candy_type = "candies"
        if number < 0:
-            return await ctx.send("That doesn't sound fun.")
+            return await ctx.reply("That doesn't sound fun.")
        if number == 0:
-            return await ctx.send("You pretend to eat a candy.")
+            return await ctx.reply("You pretend to eat a candy.")
        if candy_type in ["candies", "candy"]:
            candy_type = "candies"
        if candy_type in ["lollipops", "lollipop"]:
@@ -83,11 +83,11 @@ class TrickOrTreat(commands.Cog):
            candy_type = "chocolate"
        candy_list = ["candies", "chocolate", "lollipops", "stars"]
        if candy_type not in candy_list:
-            return await ctx.send("That's not a candy type! Use the inventory command to see what you have.")
+            return await ctx.reply("That's not a candy type! Use the inventory command to see what you have.")
        if userdata[candy_type] < number:
-            return await ctx.send(f"You don't have that many {candy_type}.")
+            return await ctx.reply(f"You don't have that many {candy_type}.")
        if userdata[candy_type] == 0:
-            return await ctx.send(f"You contemplate the idea of eating {candy_type}.")
+            return await ctx.reply(f"You contemplate the idea of eating {candy_type}.")

        eat_phrase = [
            "You leisurely enjoy",
@@ -105,7 +105,7 @@ class TrickOrTreat(commands.Cog):
        ]
        if candy_type in ["candies", "candy"]:
            if (userdata["sickness"] + number * 2) in range(70, 95):
-                await ctx.send("After all that candy, sugar doesn't sound so good.")
+                await ctx.reply("After all that candy, sugar doesn't sound so good.")
                yuck = random.randint(1, 10)
                if yuck == 10:
                    await self.config.user(ctx.author).sickness.set(userdata["sickness"] + 25)
@@ -127,7 +127,7 @@ class TrickOrTreat(commands.Cog):

                await self.config.user(ctx.author).eaten.set(userdata["eaten"] + (userdata["candies"] - lost_candy))

-                return await ctx.send(
+                return await ctx.reply(
                    f"You begin to think you don't need all this candy, maybe...\n*{lost_candy} candies are left behind*"
                )

@@ -136,7 +136,7 @@ class TrickOrTreat(commands.Cog):
                lost_candy = userdata["candies"] - random.randint(1, 5)
                if lost_candy <= 0:
                    await self.config.user(ctx.author).candies.set(0)
-                    message = await ctx.send("...")
+                    message = await ctx.reply("...")
                    await asyncio.sleep(2)
                    await message.edit(content="..........")
                    await asyncio.sleep(2)
@@ -146,7 +146,7 @@ class TrickOrTreat(commands.Cog):
                await self.config.guild(ctx.guild).pick.set(pick + lost_candy)
                await self.config.user(ctx.author).candies.set(0)
                await self.config.user(ctx.author).eaten.set(userdata["eaten"] + (userdata["candies"] - lost_candy))
-                message = await ctx.send("...")
+                message = await ctx.reply("...")
                await asyncio.sleep(2)
                await message.edit(content="..........")
                await asyncio.sleep(2)
@@ -155,7 +155,7 @@ class TrickOrTreat(commands.Cog):
                )

            pluralcandy = "candy" if number == 1 else "candies"
-            await ctx.send(
+            await ctx.reply(
                f"{random.choice(eat_phrase)} {number} {pluralcandy}. (Total eaten: `{humanize_number(await self.config.user(ctx.author).eaten() + number)}` \N{CANDY})"
            )
            await self.config.user(ctx.author).sickness.set(userdata["sickness"] + (number * 2))
@@ -164,7 +164,7 @@ class TrickOrTreat(commands.Cog):

        if candy_type in ["chocolates", "chocolate"]:
            pluralchoc = "chocolate" if number == 1 else "chocolates"
-            await ctx.send(
+            await ctx.reply(
                f"{random.choice(eat_phrase)} {number} {pluralchoc}. You feel slightly better!\n*Sickness has gone down by {number * 10}*"
            )
            new_sickness = userdata["sickness"] - (number * 10)
@@ -176,7 +176,7 @@ class TrickOrTreat(commands.Cog):

        if candy_type in ["lollipops", "lollipop"]:
            pluralpop = "lollipop" if number == 1 else "lollipops"
-            await ctx.send(
+            await ctx.reply(
                f"{random.choice(eat_phrase)} {number} {pluralpop}. You feel slightly better!\n*Sickness has gone down by {number * 20}*"
            )
            new_sickness = userdata["sickness"] - (number * 20)
@@ -188,7 +188,7 @@ class TrickOrTreat(commands.Cog):

        if candy_type in ["stars", "star"]:
            pluralstar = "star" if number == 1 else "stars"
-            await ctx.send(
+            await ctx.reply(
                f"{random.choice(eat_phrase)} {number} {pluralstar}. You feel great!\n*Sickness has been reset*"
            )
            await self.config.user(ctx.author).sickness.set(0)
@@ -199,7 +199,7 @@ class TrickOrTreat(commands.Cog):
    @checks.mod_or_permissions(administrator=True)
    @commands.command()
    async def totbalance(self, ctx):
-        """Check how many candies are 'on the ground' in the guild."""
+        """[Admin] Check how many candies are 'on the ground' in the guild."""
        pick = await self.config.guild(ctx.guild).pick()
        await ctx.send(f"The guild is currently holding: {pick} \N{CANDY}")

@@ -210,16 +210,16 @@ class TrickOrTreat(commands.Cog):
        candy_now = await self.config.user(ctx.author).candies()
        credits_name = await bank.get_currency_name(ctx.guild)
        if pieces <= 0:
-            return await ctx.send("Not in this reality.")
+            return await ctx.reply("Not in this reality.")
        candy_price = int(round(await bank.get_balance(ctx.author)) * 0.04) * pieces
        if candy_price in range(0, 10):
            candy_price = pieces * 10
        try:
            await bank.withdraw_credits(ctx.author, candy_price)
        except ValueError:
-            return await ctx.send(f"Not enough {credits_name} ({candy_price} required).")
+            return await ctx.reply(f"Not enough {credits_name} ({candy_price} required).")
        await self.config.user(ctx.author).candies.set(candy_now + pieces)
-        await ctx.send(f"Bought {pieces} candies with {candy_price} {credits_name}.")
+        await ctx.reply(f"Bought {pieces} candies with {candy_price} {credits_name}.")

    @commands.guild_only()
    @commands.command()
@@ -228,7 +228,7 @@ class TrickOrTreat(commands.Cog):
        """Show the candy eating leaderboard."""
        userinfo = await self.config._all_from_scope(scope="USER")
        if not userinfo:
-            return await ctx.send("No one has any candy.")
+            return await ctx.reply("No one has any candy.")
        async with ctx.typing():
            sorted_acc = sorted(userinfo.items(), key=lambda x: x[1]["eaten"], reverse=True)
        # Leaderboard logic from https://github.com/Cog-Creators/Red-DiscordBot/blob/V3/develop/redbot/cogs/economy/economy.py#L445
@@ -275,7 +275,7 @@ class TrickOrTreat(commands.Cog):
        for page in pagify(temp_msg, delims=["\n"], page_length=1000):
            embed = discord.Embed(
                colour=0xF4731C,
-                description=box(f"\N{CANDY} Global leaderboard \N{CANDY}", lang="prolog") + (box(page, lang="md")),
+                description=box(f"\N{CANDY} Global Leaderboard \N{CANDY}", lang="prolog") + (box(page, lang="md")),
            )
            embed.set_footer(text=f"Page {humanize_number(pages)}/{humanize_number(math.ceil(len(temp_msg) / 1500))}")
            pages += 1
@@ -310,6 +310,18 @@ class TrickOrTreat(commands.Cog):
            em.description += f"\n\n**Sickness is over 100/100**\n*Better wait a while for more candy...*"
        await ctx.send(msg, embed=em)

+    @commands.guild_only()
+    @checks.is_owner()
+    @commands.command()
+    async def totclearall(self, ctx, are_you_sure=False):
+        """[Owner] Clear all saved game data."""
+        if not are_you_sure:
+            msg = "This will clear ALL saved data for this cog and reset it to the defaults.\n"
+            msg += f"If you are absolutely sure you want to do this, use `{ctx.prefix}totclearall yes`."
+            return await ctx.send(msg)
+        await self.config.clear_all()
+        await ctx.send("All data for this cog has been cleared.")
+
    @commands.guild_only()
    @checks.mod_or_permissions(administrator=True)
    @commands.command()
@@ -338,7 +350,7 @@ class TrickOrTreat(commands.Cog):
        found = round((chance / 100) * to_pick)
        await self.config.user(ctx.author).candies.set(candies + found)
        await self.config.guild(ctx.guild).pick.set(to_pick - found)
-        message = await ctx.send("You start searching the area for candy...")
+        message = await ctx.reply("You start searching the area for candy...")
        await asyncio.sleep(3)
        await message.edit(content=f"You found {found} \N{CANDY}!")

@@ -350,6 +362,8 @@ class TrickOrTreat(commands.Cog):
        guild_users = [m.id for m in ctx.guild.members if m is not m.bot and not m == ctx.author]
        candy_users = await self.config._all_from_scope(scope="USER")
        valid_user = list(set(guild_users) & set(candy_users))
+        if not valid_user:
+            return await ctx.reply("No one has any candy yet!")
        if not user:
            picked_user = self.bot.get_user(random.choice(valid_user))
        elif user == ctx.author or user == user.bot:
@@ -366,25 +380,25 @@ class TrickOrTreat(commands.Cog):
                new_picked_candy_now = await self.config.user(new_picked_user).candies()
                if chance in range(24, 25):
                    if new_picked_candy_now == 0:
-                        message = await ctx.send("You see an unsuspecting guildmate...")
+                        message = await ctx.reply("You see an unsuspecting guildmate...")
                        await asyncio.sleep(random.randint(3, 6))
                        return await message.edit(
                            content=f"There was nothing in {picked_user.name}#{picked_user.discriminator}'s pockets, so you picked {new_picked_user.name}#{new_picked_user.discriminator}'s pockets but they had no candy either!"
                        )
                else:
-                    message = await ctx.send("You see an unsuspecting guildmate...")
+                    message = await ctx.reply("You see an unsuspecting guildmate...")
                    await asyncio.sleep(random.randint(3, 6))
                    return await message.edit(
                        content=f"There was nothing in {picked_user.name}#{picked_user.discriminator}'s pockets, so you looked around again... you saw {new_picked_user.name}#{new_picked_user.discriminator} in the distance, but you didn't think you could catch up..."
                    )
            if chance in range(10, 20):
-                message = await ctx.send("You start sneaking around in the shadows...")
+                message = await ctx.reply("You start sneaking around in the shadows...")
                await asyncio.sleep(random.randint(3, 6))
                return await message.edit(
                    content=f"You snuck up on {picked_user.name}#{picked_user.discriminator} and tried picking their pockets but there was nothing there!"
                )
            else:
-                message = await ctx.send("You start looking around for a target...")
+                message = await ctx.reply("You start looking around for a target...")
                await asyncio.sleep(random.randint(3, 6))
                return await message.edit(content="You snuck around for a while but didn't find anything.")
        user_candy_now = await self.config.user(ctx.author).candies()
@@ -393,7 +407,7 @@ class TrickOrTreat(commands.Cog):
            multip = 0.7
        pieces = round(picked_candy_now * multip)
        if pieces <= 0:
-            message = await ctx.send("You stealthily move over to an unsuspecting person...")
+            message = await ctx.reply("You stealthily move over to an unsuspecting person...")
            await asyncio.sleep(4)
            return await message.edit(content="You found someone to pickpocket, but they had nothing but pocket lint.")
        chance = random.randint(1, 25)
@@ -403,13 +417,13 @@ class TrickOrTreat(commands.Cog):
            "You see someone with a full candy bag...",
        ]
        if chance <= 10:
-            message = await ctx.send("You creep closer to the target...")
+            message = await ctx.reply("You creep closer to the target...")
            await asyncio.sleep(random.randint(3, 5))
            return await message.edit(content="You snuck around for a while but didn't find anything.")
        if chance > 18:
            await self.config.user(picked_user).candies.set(picked_candy_now - pieces)
            await self.config.user(ctx.author).candies.set(user_candy_now + pieces)
-            message = await ctx.send(random.choice(sneak_phrases))
+            message = await ctx.reply(random.choice(sneak_phrases))
            await asyncio.sleep(4)
            await message.edit(content="There seems to be an unsuspecting victim in the corner...")
            await asyncio.sleep(4)
@@ -419,7 +433,7 @@ class TrickOrTreat(commands.Cog):
        if chance in range(11, 17):
            await self.config.user(picked_user).candies.set(picked_candy_now - round(pieces / 2))
            await self.config.user(ctx.author).candies.set(user_candy_now + round(pieces / 2))
-            message = await ctx.send(random.choice(sneak_phrases))
+            message = await ctx.reply(random.choice(sneak_phrases))
            await asyncio.sleep(4)
            await message.edit(content="There seems to be an unsuspecting victim in the corner...")
            await asyncio.sleep(4)
@@ -427,7 +441,7 @@ class TrickOrTreat(commands.Cog):
                content=f"You stole {round(pieces/2)} \N{CANDY} from {picked_user.name}#{picked_user.discriminator}!"
            )
        else:
-            message = await ctx.send(random.choice(sneak_phrases))
+            message = await ctx.reply(random.choice(sneak_phrases))
            await asyncio.sleep(4)
            noise_msg = [
                "You hear a sound behind you! When you turn back, your target is gone.",
@@ -549,7 +563,7 @@ class TrickOrTreat(commands.Cog):
                "The house you were approaching just turned the light off.",
                "The wind starts to pick up as you look for the next house...",
            ]
-            return await message.channel.send(random.choice(messages))
+            return await message.reply(random.choice(messages))
        await self.config.user(message.author).last_tot.set(str(now))
        candy = random.randint(1, 25)
        lollipop = random.randint(0, 100)
@@ -559,35 +573,47 @@ class TrickOrTreat(commands.Cog):
        await self.config.user(message.author).candies.set(userdata["candies"] + candy)

        if chocolate == 100:
-            await self.config.user(message.author).chocolate.set(userdata["chocolate"] + 4)
-            win_message += "\n**BONUS**: 5 \N{CHOCOLATE BAR}"
+            await self.config.user(message.author).chocolate.set(userdata["chocolate"] + 6)
+            win_message += "\n**BONUS**: 6 \N{CHOCOLATE BAR}"
        elif 99 >= chocolate >= 95:
-            await self.config.user(message.author).chocolate.set(userdata["chocolate"] + 3)
-            win_message += "\n**BONUS**: 4 \N{CHOCOLATE BAR}"
+            await self.config.user(message.author).chocolate.set(userdata["chocolate"] + 5)
+            win_message += "\n**BONUS**: 5 \N{CHOCOLATE BAR}"
        elif 94 >= chocolate >= 90:
+            await self.config.user(message.author).chocolate.set(userdata["chocolate"] + 4)
+            win_message += "\n**BONUS**: 4 \N{CHOCOLATE BAR}"
+        elif 89 >= chocolate >= 80:
+            await self.config.user(message.author).chocolate.set(userdata["chocolate"] + 3)
+            win_message += "\n**BONUS**: 3 \N{CHOCOLATE BAR}"
+        elif 79 >= chocolate >= 75:
            await self.config.user(message.author).chocolate.set(userdata["chocolate"] + 2)
            win_message += "\n**BONUS**: 2 \N{CHOCOLATE BAR}"
-        elif 89 >= chocolate >= 80:
+        elif 74 >= chocolate >= 70:
            await self.config.user(message.author).chocolate.set(userdata["chocolate"] + 1)
            win_message += "\n**BONUS**: 1 \N{CHOCOLATE BAR}"

        if lollipop == 100:
+            await self.config.user(message.author).lollipops.set(userdata["lollipops"] + 4)
+            win_message += "\n**BONUS**: 4 \N{LOLLIPOP}"
+        elif 99 >= lollipop >= 95:
            await self.config.user(message.author).lollipops.set(userdata["lollipops"] + 3)
            win_message += "\n**BONUS**: 3 \N{LOLLIPOP}"
-        elif 99 >= lollipop >= 95:
+        elif 94 >= lollipop >= 85:
            await self.config.user(message.author).lollipops.set(userdata["lollipops"] + 2)
            win_message += "\n**BONUS**: 2 \N{LOLLIPOP}"
-        elif 94 >= lollipop >= 80:
+        elif 84 >= lollipop >= 75:
            await self.config.user(message.author).lollipops.set(userdata["lollipops"] + 1)
            win_message += "\n**BONUS**: 1 \N{LOLLIPOP}"

        if star == 100:
+            await self.config.user(message.author).stars.set(userdata["stars"] + 4)
+            win_message += "\n**BONUS**: 4 \N{WHITE MEDIUM STAR}"
+        elif 99 >= star >= 97:
            await self.config.user(message.author).stars.set(userdata["stars"] + 3)
            win_message += "\n**BONUS**: 3 \N{WHITE MEDIUM STAR}"
-        elif 99 >= star >= 97:
+        elif 96 >= star >= 85:
            await self.config.user(message.author).stars.set(userdata["stars"] + 2)
            win_message += "\n**BONUS**: 2 \N{WHITE MEDIUM STAR}"
-        elif 96 >= star >= 80:
+        elif 84 >= star >= 75:
            await self.config.user(message.author).stars.set(userdata["stars"] + 1)
            win_message += "\n**BONUS**: 1 \N{WHITE MEDIUM STAR}"

@@ -601,7 +627,7 @@ class TrickOrTreat(commands.Cog):
            "*You knock on the door...*",
            "*There's a movement in the shadows by the side of the house...*",
        ]
-        bot_talking = await message.channel.send(random.choice(walking_messages))
+        bot_talking = await message.reply(random.choice(walking_messages))
        await asyncio.sleep(random.randint(5, 8))
        door_messages = [
            "*The door slowly opens...*",
--- a/ttt/LICENSE
+++ b/ttt/LICENSE
@@ -0,0 +1,201 @@
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "{}"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright {yyyy} {name of copyright owner}
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
aikaterna	3cf90d4214	Await bot.add_cog	2022-04-04 13:05:52 -07:00
aikaterna	3c99a970ac	[RSS] Fix for bot.embed_requested	2022-04-04 12:38:29 -07:00
aikaterna	621137628c	Merge in updates from v3 branch (#270 ) * [RSS] Fix for media_plaintext tag (#263) * [Wolfram] Allow very long answers * [DiscordExperiments] Add new activities and update names (#268) * [DiscordExperiments] Add missing activities * [DiscordExperiments] update Letter Tile name to Letter League * [DiscordExperiments] update Doodle Crew to Sketch Heads Doodle Crew is obsolete * fix(rss): message longer than 2000 in listtags (#265) * Add reward feature for shot birbs (#262) * Add reward feature for shot birbs Adds the option to set a reward range(min-max) of currency to be given out on a successfully shot birb. Properly handles whether bank is global or not as well * make it so they can specify 0 as the minimum users can specify 0 as the minimum reward range Co-authored-by: Karlo Prikratki <karlo@karloprikratki.com> Co-authored-by: Julien Mauroy <61093863+Predeactor@users.noreply.github.com> Co-authored-by: Alex <58824393+vertyco@users.noreply.github.com>	2022-04-04 12:20:34 -07:00
aikaterna	9209fa5778	Merge in updates from v3 branch (#269 ) * [RSS] Fix for media_plaintext tag (#263) * [Wolfram] Allow very long answers	2022-04-04 12:15:02 -07:00
aikaterna	841c6df3c7	[Wolfram] Allow very long answers	2022-03-24 16:15:42 -07:00
aikaterna	66250e7163	[RSS] Fix for media_plaintext tag (#264 )	2022-03-04 16:32:23 -08:00
aikaterna	842f3bc3fe	[Tools] Fix for whatis w/ thread id, extend stinfo	2022-02-20 16:54:55 -08:00
aikaterna	76c488944c	[Tools] Cleanup + add new features	2022-02-19 17:31:04 -08:00
aikaterna	57ae7a52cd	discord.py 2.0 fun Invites will not work because discord-ext-menus needs to be updated in Red	2022-02-18 18:03:37 -08:00
aikaterna	3d54796b69	Move unsupported cogs to a different repo	2022-02-18 17:57:22 -08:00
aikaterna	1792e683f3	[RSS] Various fixes * Handle feeds that don't have a link in the feed entry * Do not check title matching if a feed entry has a non-matching link and a greater entry time than last post time * Fix for $tags_list template key as it was setting it to the last tag found instead of the entire list, also check for duplicate tags during tag finding and do not add them	2022-02-12 18:06:17 -08:00
Alex	6493fa182e	fix line 247 "channels" key fixed, renamed to "channel" (#261 )	2022-02-06 16:58:11 -08:00
Alex	abff2dee06	snackburr can use bot credits name (#256 ) * snackburr can use bot credits name toggle command for using bank credits name. if credits name has a custom emoji snackburr wont let user toggle it untill they change their credits name. if user toggles it on and THEN changes credits name, snackburr will toggle it back off when he sees it cause snackburr dont play no games * Update snacktime.py * Update snacktime.py * Update snacktime.py * Update snacktime.py * nitpicky things Co-authored-by: aikaterna <20862007+aikaterna@users.noreply.github.com>	2022-01-23 11:48:45 -08:00
aikaterna	474619a858	[RSS] Don't clean config on dead channels	2022-01-23 11:38:45 -08:00
aikaterna	d0bf0ec89e	[RSS] Test out enclosure media plaintext tags	2022-01-07 16:42:37 -08:00
aikaterna	a361fec9b7	[RSS] Add catch for ServerDisconnectedError	2022-01-07 11:20:55 -08:00
aikaterna	15a93e6796	[RSS] Add rss listall for all feeds in a server	2022-01-05 14:47:05 -08:00
aikaterna	e59770c6e5	Update LICENSE	2021-12-31 15:19:41 -08:00
aikaterna	992a520019	[DiscordExperiments] Remove blocked applications Some activities return "Failed to Launch Activity / This server doesn't have access to the requested activity" now	2021-12-20 09:45:43 -08:00
aikaterna	b0399f95b6	[VoiceLogs] Adjust data statement	2021-11-29 08:28:23 -08:00
aikaterna	52517385ee	[VoiceLogs] Fix for user that left the server	2021-11-29 08:27:50 -08:00
aikaterna	fe21416e54	[VoiceLogs] Initial commit	2021-11-28 18:55:39 -08:00
aikaterna	8be890d329	[TTT] ReactionPredicate is not used	2021-11-25 19:56:21 -08:00
aikaterna	02b2b5f778	[DiscordExperiments] Add new games & dev versions	2021-11-23 11:01:57 -08:00
aikaterna	0b21be26f8	[Away] Add Trusty as an author because let's be real here, dude did a ton of work on it in the past	2021-11-13 12:47:28 -08:00
aikaterna	9e81723b8b	[DiscordExperiments] Add new game Thanks to LifelessMagoo	2021-11-12 18:42:13 -08:00
Alex	b4608e526c	handle deleted channels silently (#255 ) If a channel is deleted, when doggo comes to woof and that channel no longer exists it should delete the channel id from the config and pick a new one. and it will just ignore a deleted channel if pets command is used.	2021-10-27 14:11:34 -07:00
aikaterna	149c050fcc	[RSS] Play nicer with titleless feed entries pt 2	2021-10-27 10:16:09 -07:00
aikaterna	27b668347e	Update info.json	2021-10-25 10:16:29 -07:00
PredaaA	dfe27f0cba	[DadJokes] Handle aiohttp errors and non 200 status code (#253 )	2021-10-24 10:02:55 -07:00
aikaterna	afb8213c99	[DiscordExperiments] Add new game Thanks to LifelessMagoo	2021-10-19 15:08:12 -07:00
PredaaA	43902aefc9	Add missing data statements. (#251 )	2021-10-18 16:56:05 -07:00
aikaterna	d34732def7	[RSS] Support specific "image" tag format If "image" is a dict and has an "href" tag inside, map it to $image_plaintext	2021-10-16 14:07:31 -07:00
aikaterna	9147d128af	[RSS] Black format @ 120	2021-10-16 14:05:09 -07:00
aikaterna	ba60619244	[RSS] Play nicer with titleless feed entries	2021-10-14 19:48:11 -07:00
aikaterna	e224a0310d	[RSS] Escape ipv4-like regex a bit better	2021-10-14 19:47:38 -07:00
aikaterna	13ac49dfc5	[Invites] Remove dead pinned invites on lb	2021-10-13 10:42:56 -07:00
aikaterna	ed1179bf10	[RSS] Patch out any ip addresses in bozo response	2021-10-13 09:41:50 -07:00
aikaterna	e307d62343	[DiscordExperiments] Add another alternate ID	2021-10-11 16:33:09 -07:00
aikaterna	2d45b317e6	[DiscordExperiments] Add alternate application ID	2021-10-11 16:16:52 -07:00
Ben Armstrong	89411f2ef8	[Timezone] Output "same" when time zones match. (#250 ) * [timezone] Output "same" when time zones match. * Semantic changes * Make time_diff_text not rely on rstrip as `0.0` was returning an empty string * Don't compare `time_diff` (a float) to ints in `plural` and `position_text`, use time_diff_text's string content and compare to strings * Version number Co-authored-by: aikaterna <20862007+aikaterna@users.noreply.github.com>	2021-10-10 14:56:00 -07:00
aikaterna	84ed247331	Info.json cleanup	2021-10-10 14:22:45 -07:00
aikaterna	40b3bbc363	Info.json cleanup	2021-10-10 13:26:33 -07:00
aikaterna	6ae25b4dbb	[Dictionary] Be more specific on replacing Thanks Axas.	2021-10-06 12:53:21 -07:00
aikaterna	87871bd351	[Dictionary] Fix for non-words on syn & ant	2021-10-06 10:49:18 -07:00
aikaterna	b80dda4688	[ChatChart] Round "others" output	2021-10-04 08:03:32 -07:00
aikaterna	6871ec09ae	[MassUnban] Add typing indicator	2021-09-30 16:29:33 -07:00
aikaterna	3c89fcf463	[MassUnban] Skip empty ban reasons	2021-09-30 16:18:06 -07:00
aikaterna	b4e6550aa6	[MassUnban] Initial commit	2021-09-30 16:11:08 -07:00
aikaterna	82505acbf5	[DiscordExperiments] Add new games	2021-09-29 12:55:07 -07:00
aikaterna	9c495f59b1	[TrickOrTreat] Use replies	2021-09-28 11:13:05 -07:00
aikaterna	9a7976b814	[ChatChart] Remove test logging, fix for % totals	2021-09-27 12:09:37 -07:00
aikaterna	1feabd9103	[ChatChart] Even more test logging	2021-09-27 11:47:14 -07:00
aikaterna	cc1d8227d4	[ChatChart] Test logging for size < 0, part 2	2021-09-27 11:31:20 -07:00
aikaterna	1310c45190	[Chatchart] Test logging for size < 0	2021-09-27 11:20:58 -07:00
aikaterna	88718cdfe1	[TrickOrTreat] Minor docstring update	2021-09-27 09:50:07 -07:00
aikaterna	e8f6d72dfb	[TrickOrTreat] Fix for steal with no valid users	2021-09-27 09:47:24 -07:00
aikaterna	55f450fdac	[TrickOrTreat] Adjust game balance & data clearing	2021-09-27 09:42:06 -07:00
aleclol	81348f97a0	Suppress discord.NotFound (#247 )	2021-09-14 11:37:40 -07:00
aikaterna	50e39e5b59	[Tools] Add unidecode to reqs	2021-08-24 08:50:11 -07:00
James	7b0b4496bc	[RSS] Replace scipy KDTree with Euclidean distance (#245 ) * Replace scipy KDTree with Euclidean distance * fixed star expression and missing import * Version number Co-authored-by: aikaterna <20862007+aikaterna@users.noreply.github.com>	2021-08-13 14:50:54 -07:00
aikaterna	a00c133c2d	[Snacktime] Ignore deleted channels in settings	2021-07-22 16:48:07 -07:00
aikaterna	6d81d7a042	[Tools] Remove uid embed	2021-07-17 17:23:22 -07:00
aikaterna	1c524f7177	[Tools] Change uid page length	2021-07-17 17:15:01 -07:00
aikaterna	6a89f72add	[Tools] Remove old converter, add uid	2021-07-17 17:07:27 -07:00
aikaterna	569716728d	[Tools] Sort sharedservers	2021-07-16 12:36:38 -07:00
aikaterna	22c3621329	[Tools] Adjust sharedservers to use mutual_guilds	2021-07-16 12:07:45 -07:00
aikaterna	cb3b282f85	[DiscordExperiments] Initial commit	2021-07-13 19:28:29 -07:00
aikaterna	6244511c38	[TrackDecoder] Initial commit	2021-07-12 13:33:29 -07:00
aleclol	d778e81297	Update away.py (#240 )	2021-07-12 08:24:31 -07:00
aikaterna	b5c64bd4c8	Update README.md	2021-07-07 14:16:22 -07:00
aikaterna	4a56099ea0	Update README.md	2021-06-22 17:39:32 -07:00
aikaterna	0420e3052b	Remove retrosign This cog is in violation of Photofunia's TOS.	2021-06-22 17:39:10 -07:00
aikaterna	79582cc9eb	Update README.md	2021-06-22 17:31:04 -07:00
aikaterna	f5cd6f5f42	[Dungeon] Depreciated Hiding this cog so people can use Defender instead, because it's better and can do this with it's eye closed. Yes, one eye. You can find Defender at: https://github.com/Twentysix26/x26-Cogs	2021-06-22 17:28:14 -07:00
aikaterna	4fa66aca9a	[WarcraftLogs] No Burning Crusade for me	2021-06-04 17:58:05 -07:00
aleclol	e73817456f	Catch 404 on channel (#236 )	2021-06-04 17:53:36 -07:00
Vault108	3bc65b688e	Fix Encoding (#234 ) Output would randomly show â€™ instead of '	2021-06-03 09:28:07 -07:00
Vexed	07ee745b9e	[Timezone] Add fuzzy timezone searching (#231 ) * Add fuzzy timezone searching * remove unused imports * Cleaner code * Adjustments * Adjustments Co-authored-by: aikaterna <20862007+aikaterna@users.noreply.github.com>	2021-05-14 12:49:48 -07:00
aikaterna	9570a7bfe1	[Blurplefy] Escapes	2021-05-13 09:24:55 -07:00
aikaterna	fe5af24891	[Blurplefy] Update for next year	2021-05-13 09:17:29 -07:00
jack1142	e10b4c90a9	Update RSS's loop to not stop on an unexpected error (#229 )	2021-04-30 15:51:49 -07:00
aikaterna	db8b755b9b	[Hunting] Version bump	2021-04-29 18:29:56 -07:00
aikaterna	bc1a369507	[Hunting] Only list existing channels	2021-04-29 18:28:07 -07:00
Kreusada	479c7949ce	[Warcraftlogs] Add beautifultable to requirements (#227 )	2021-04-24 13:24:07 -07:00
PredaaA	d489b6428a	[RndStatus] Re-order sleep in maybe_update_presence task (#226 )	2021-04-20 17:43:55 -07:00
aikaterna	6d2045bd39	[Quiz] Catch bad category ID	2021-04-12 11:04:13 -07:00
aikaterna	9bce142556	[RndStatus] Handle zero guilds being available	2021-04-12 10:42:28 -07:00
Fixator10	216809fb56	[ChatChart] add check for send_messages for trigger_typing (#225 ) again	2021-04-12 09:11:45 -07:00
aikaterna	2c086e7dff	[Dictionary] Change up some things in the search Let's see how long this one works	2021-04-07 16:02:47 -07:00
aikaterna	4cd51a9775	[Dictionary] Not everything has an entry	2021-04-07 11:54:21 -07:00
aikaterna	f4c0dfb69d	[Dictionary] Fix for antonyms and synonym lookup	2021-04-07 11:48:42 -07:00
Kowlin	226e1ff43e	Catch channels that return None (#224 )	2021-04-06 10:45:22 -07:00
PredaaA	12b5fff4d8	[PressF] Remove uneeded save (#223 )	2021-04-06 10:33:40 -07:00
Kowlin	af4ca0db91	[Hunting] Add support for clearing global leaderboard (#221 ) * Add support for clearing global leaderboard * Microbump	2021-04-06 10:11:00 -07:00
Kowlin	5d44f55908	Refactor code to be more managable (#220 ) And add in serverchart	2021-04-02 17:32:46 -07:00
Kowlin	ae231e77bc	Convert leaderboard to menus (#219 )	2021-04-02 11:09:42 -07:00
Kowlin	6e2e654e16	Add support for blacklisted checks. (#218 )	2021-04-01 11:20:40 -07:00
aikaterna	1173e49e6a	[RSS] Make sure pubparsed is used when selected	2021-03-18 16:56:09 -07:00
aikaterna	cc8a55f062	[RSS] Fetch channel fix part 2	2021-03-15 09:50:44 -07:00
aikaterna	92a2bd5b73	[RSS] Fetch channel fix	2021-03-15 09:36:55 -07:00
aikaterna	608bcaebcd	[RSS] Explain embed image/thumbnail tags	2021-03-11 11:25:26 -08:00
aikaterna	3b72243f91	[RSS] Add time parsing override for specific feeds This is an owner only addition to provide a way to use published_parsed for post qualification instead of updated_parsed. YouTube RSS feeds are defaulted into this list.	2021-03-08 19:12:35 -08:00
aikaterna	2b3ab743ee	[RSS] User facing improvments * More descriptive error messages for users * Now will post updates of last post sent * Handles feeds that do not have entries * Better channel verification for removing dead feeds	2021-03-03 09:20:40 -08:00
aikaterna	c3f5dc0feb	[EmbedPeek] Add line return for dict content	2021-02-27 20:25:42 -08:00
aikaterna	24c154eedb	Update README.md	2021-02-27 20:20:32 -08:00
aikaterna	4a546188ff	[EmbedPeek] Initial commit	2021-02-27 20:17:02 -08:00
PredaaA	cbd6591acf	[Away] Set delete_after with a minimum of 5s (#212 ) * [Away] Set delete_after with a minimum of 5s * AAAAAAAAAAAAAAAAAAAAAAAAAAA more checks!	2021-02-24 09:31:50 -08:00
aikaterna	cf1a63ce8b	[WarcraftLogs] Actually get the latest encounter	2021-02-20 14:40:01 -08:00
aikaterna	ae36d3b48c	Revert "[Away] Set delete_after with a minimum of 5s (#210 )" (#211 ) This reverts commit `efe32dda52`.	2021-02-19 11:34:24 -08:00
PredaaA	efe32dda52	[Away] Set delete_after with a minimum of 5s (#210 ) * [Away] Set delete_after with a minimum of 5s * oops	2021-02-19 11:17:12 -08:00
aikaterna	ece45b3156	[Tools] 2nd fix for join time with no ms	2021-02-16 12:08:55 -08:00
aikaterna	8c5ca67044	[UrlFetch] Catch timeouts and allow base urls	2021-02-10 16:07:23 -08:00
aikaterna	d8722c5356	[CardsAgainstHumanity] Explain game joining	2021-02-10 14:22:11 -08:00
aikaterna	fafafa9859	[RSS] Catch timeout errors	2021-02-10 12:03:43 -08:00
aikaterna	b9194b1d44	[UrlFetch] Tiny cleanup No, this doesn't have functions copied from RSS, I don't know what you're talking about /s	2021-02-09 16:46:37 -08:00
aikaterna	04c3cd2e9f	[UrlFetch] No Config needed	2021-02-09 16:04:06 -08:00
aikaterna	663efc3f85	[UrlFetch] Initial commit	2021-02-09 15:58:42 -08:00
PredaaA	12ff014226	[Away] Reorder config calls at on_message event (#205 )	2021-02-07 18:03:06 -08:00
aikaterna	4044b0c83d	[RSS] Specific tag format adjustment	2021-01-29 12:57:41 -08:00
aikaterna	fbe505d3c6	[RSS] Fix for tags + catch channel feed names	2021-01-26 08:53:35 -08:00
usedfirewood	0c48900ce7	Fix to Antonyms and Synonyms (#198 ) * Update dictionary.py Test attempt to fix Synonyms * Update dictionary.py Another attempt at fixing Synonyms * Update dictionary.py Antonym fix * Update dictionary.py Antonym fix Co-authored-by: usedfirewood <usdfwrd@protonmail.com>	2021-01-24 11:34:04 -08:00
aikaterna	d408adddd8	[RSS] Small fixes for rss find	2021-01-24 11:32:00 -08:00
aikaterna	35d42ca1ba	[Invites] Fix long leaderboards	2021-01-22 11:40:20 -08:00
aikaterna	2cd7f03f1b	[WarcraftLogs] WCL 2.0	2021-01-20 15:01:43 -08:00
jack1142	d8c29b09b4	:( (#197 )	2021-01-08 09:41:58 -08:00
jack1142	76aaed32bc	[RSS] URL is required param so let's have it that way in the signature (#196 ) * [RSS] URL is required param so let's have it that way in the signature * version Co-authored-by: aikaterna <20862007+aikaterna@users.noreply.github.com>	2021-01-08 09:24:40 -08:00
aikaterna	acb8756ec1	[RSS] Add connection timeout catch for rss find	2020-12-25 09:59:23 -08:00
aikaterna	1ee9958594	[RSS] Add rss find	2020-12-24 17:21:55 -08:00
aikaterna	c7dc4c9336	[Tools] sinfo fix	2020-12-18 08:57:56 -08:00
aikaterna	0a0c007761	[Tools] No nick needed	2020-12-17 16:15:00 -08:00
Fixator10	84e24d7e9d	trigger typing only if bot has access to send messages (#192 )	2020-12-09 11:35:40 -08:00
aikaterna	fd32a9b370	[RSS] Account for None on post time	2020-12-04 15:17:58 -08:00
aikaterna	0134a704fd	[RSS] New posts must be newer than last saved time	2020-12-03 16:00:30 -08:00
aikaterna	ab6716dccb	Update LICENSE	2020-12-02 10:53:25 -08:00
aikaterna	0056fc1003	[TTT] Info.json formatting	2020-12-02 10:45:20 -08:00
aikaterna	2d0f561fbd	[TTT] Initial commit Adding Apache language to the License specifically for this cog only to cover my usage of porting the TTT cog.	2020-12-02 10:41:09 -08:00
aikaterna	eec578a94c	[Dictonary] Fix for synonym and antonym	2020-11-29 13:06:03 -08:00
aikaterna	de65fa0c97	[Chatchart] small semantic change	2020-11-29 12:12:54 -08:00
aikaterna	eadf99ea00	[Chatchart] Add message limit	2020-11-29 11:52:43 -08:00
Predeactor	c6a7026309	pressf for grammar (#189 )	2020-11-25 10:45:43 -08:00
aikaterna	164be700fa	[Tools] Catch a bad channel	2020-11-18 16:47:49 -08:00
aikaterna	77d5679659	[Tools] cinfo -> chinfo part 2	2020-11-16 10:15:00 -08:00
PhenoM4n4n	90c9c80aec	[rndstatus] competing (#186 ) * competing * space	2020-11-16 10:14:23 -08:00
aikaterna	89785c955d	Update chatchart.py	2020-11-12 12:55:24 -08:00
aikaterna	0e51574a20	[Tools] cinfo -> chinfo	2020-11-06 16:07:21 -08:00
aikaterna	7f4f756b95	[Invites] Fix for invites show and version	2020-11-05 19:20:03 -08:00
aikaterna	9cee901493	[RSS] Add feed character limit	2020-11-04 12:54:37 -08:00
aikaterna	b2549348d5	[Invites] There's 8-digit codes now too	2020-11-03 18:48:24 -08:00
James	a6ba729586	[Tools] fix month counting (#184 )	2020-10-31 06:55:53 -07:00
James	1bfca84541	[Tools] pagify access (#183 )	2020-10-30 16:03:03 -07:00
aikaterna	43f6d49f66	[Invites] Add 10 digit invite codes	2020-10-30 10:19:44 -07:00
James	149c05f711	remove command deletion on uinfo (#182 )	2020-10-30 01:33:12 -07:00
James	f8ea0d67f4	improved role list display for uinfo (#181 ) left padded role display for horizontal alignment	2020-10-29 18:28:31 -07:00
James	c29f45986f	improved dynamic time displays (#180 ) now displays years, months and weeks in formatted timedeltas	2020-10-29 17:29:14 -07:00
Trent Kable	0a43608bbb	[ChatChart]error handling on embed edit (#179 ) handles an exception that occurs when bot cannot edit the embed originally sent at invoke that shows the message counter.	2020-10-28 13:18:06 -07:00
aikaterna	b7f1ca716d	[Tools] Fix for join time with no ms	2020-10-26 12:43:34 -07:00
aikaterna	d538d6ad93	[NoLinks] Yeet spoilered things too	2020-10-23 10:12:23 -07:00
aikaterna	51911b4e28	[RSS] Text formatting change on settings	2020-10-23 08:14:39 -07:00
aikaterna	f7eb6e1f7c	[Dungeon] Fix for join time with no ms	2020-10-22 16:41:37 -07:00
aikaterna	405164137d	[RSS] Provisional tag qualification	2020-10-21 16:41:27 -07:00
dudeamax99	490af1ddaf	[ChatChart] Show total messages in message load screen. (#175 ) * [ChatChart] Show total messages in message load screen. Now shows "####/5000 messages gathered rather than "#### messages gathered" on load screen. * Now dynamically displays total rather than just 5000.	2020-10-21 12:07:15 -07:00