Fix for double posting issues

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


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

.gitignore

@@ -0,0 +1,129 @@
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+# PyInstaller
+#  Usually these files are written by a python script from a template
+#  before PyInstaller builds the exe, so as to inject date/other infos into it.
+*.manifest
+*.spec
+
+# Installer logs
+pip-log.txt
+pip-delete-this-directory.txt
+
+# Unit test / coverage reports
+htmlcov/
+.tox/
+.nox/
+.coverage
+.coverage.*
+.cache
+nosetests.xml
+coverage.xml
+*.cover
+.hypothesis/
+.pytest_cache/
+
+# Translations
+*.mo
+*.pot
+
+# Django stuff:
+*.log
+local_settings.py
+db.sqlite3
+
+# Flask stuff:
+instance/
+.webassets-cache
+
+# Scrapy stuff:
+.scrapy
+
+# Sphinx documentation
+docs/_build/
+
+# PyBuilder
+target/
+
+# Jupyter Notebook
+.ipynb_checkpoints
+
+# IPython
+profile_default/
+ipython_config.py
+
+# pipenv
+#   According to pypa/pipenv#598, it is recommended to include Pipfile.lock in version control.
+#   However, in case of collaboration, if having platform-specific dependencies or dependencies
+#   having no cross-platform support, pipenv may install dependencies that don't work, or not
+#   install all needed dependencies.
+#Pipfile.lock
+
+# celery beat schedule file
+celerybeat-schedule
+
+# SageMath parsed files
+*.sage.py
+
+# Environments
+.env
+.venv
+env/
+venv/
+ENV/
+env.bak/
+venv.bak/
+
+# Spyder project settings
+.spyderproject
+.spyproject
+
+# Rope project settings
+.ropeproject
+
+# mkdocs documentation
+/site
+
+# mypy
+.mypy_cache/
+.dmypy.json
+dmypy.json
+
+# Pyre type checker
+.pyre/
+
+# Sublime project files
+*.sublime-project
+*.sublime-workspace
+
+# PyCharm project files
+.idea/
+
+# VS Code project files
+.vscode/

LICENSE

@@ -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.

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.
 
@@ -29,11 +29,13 @@ inspirobot - Fetch "inspirational" messages from inspirobot.me with [p]inspireme
 
 invites - Display invites that are available on the server and the information those invites contain. The bot must have the administrator permission granted on the guild to be able to use this cog.
 
+latex - A simple cog originally by Stevy for v2 that displayes LaTeX expressions in an image.
+
 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.
 
@@ -43,28 +45,32 @@ pingtime - Show all shards' pingtimes.
 
 pressf - A port/rewrite of NekoTony's v2 pressf cog. Pay your respects by pressing F.
 
-pupper - A cog for Ryan5374. A pet that comes around on an on_message listener and waits for someone to pet it (react with a standard wave emoji), and rewards with credits. Many attributes are configurable.
-
 quiz - A kahoot-like trivia game. Originally by Keane for Red v2.
 
-region - A command to change the voice region of a server. Requires the guild admin or mod role or guild administrator.
+reminder - A continued fork of ZeLarpMaster's reminder cog. This cog is licensed under the GPL-3.0 License.
-
-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.
+
 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.
 
 youtube - A v3 port of Paddo's youtube search cog for v2.
 
-Support for these cogs is via opened issues on the appropriate repo or in the Red - Cog Support server at https://discord.gg/KcAbsvD, in the support-aikaterna-cogs channel.
+Support for these cogs is via opened issues on the appropriate repo or in the Red - Cog Support server at https://discord.gg/GET4DVk, in the support_aikaterna-cogs channel.

antiphoneclapper/__init__.py

@@ -1,5 +0,0 @@
-from .antiphoneclapper import AntiPhoneClapper
-
-
-async def setup(bot):
-    bot.add_cog(AntiPhoneClapper(bot))

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."""
-
-    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())

antiphoneclapper/info.json

@@ -1,15 +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"
-}

away/__init__.py

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

away/away.py

@@ -1,6 +1,6 @@
 import discord
 from redbot.core import Config, commands, checks
-from typing import Optional
+from typing import Optional, Literal
 import datetime
 import re
 
@@ -11,7 +11,7 @@ class Away(commands.Cog):
     """Le away cog"""
 
     default_global_settings = {"ign_servers": []}
-    default_guild_settings = {"TEXT_ONLY": False}
+    default_guild_settings = {"TEXT_ONLY": False, "BLACKLISTED_MEMBERS": []}
     default_user_settings = {
         "MESSAGE": False,
         "IDLE_MESSAGE": False,
@@ -19,15 +19,20 @@ class Away(commands.Cog):
         "OFFLINE_MESSAGE": False,
         "GAME_MESSAGE": {},
         "STREAMING_MESSAGE": False,
-        "LISTENING_MESSAGE": False,
+        "LISTENING_MESSAGE": False
     }
 
+    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._away = Config.get_conf(self, 8423491260, force_registration=True)
+        self.config = Config.get_conf(self, 8423491260, force_registration=True)
-        self._away.register_global(**self.default_global_settings)
+        self.config.register_global(**self.default_global_settings)
-        self._away.register_guild(**self.default_guild_settings)
+        self.config.register_guild(**self.default_guild_settings)
-        self._away.register_user(**self.default_user_settings)
+        self.config.register_user(**self.default_user_settings)
 
     def _draw_play(self, song):
         song_start_time = song.start
@@ -69,17 +74,14 @@ class Away(commands.Cog):
             em.set_author(name=f"{author.display_name} is currently idle", icon_url=avatar)
         elif state == "dnd":
             em = discord.Embed(description=message, color=color)
-            em.set_author(
+            em.set_author(name=f"{author.display_name} is currently do not disturb", icon_url=avatar)
-                name=f"{author.display_name} is currently do not disturb", icon_url=avatar
-            )
         elif state == "offline":
             em = discord.Embed(description=message, color=color)
             em.set_author(name=f"{author.display_name} is currently offline", icon_url=avatar)
         elif state == "gaming":
             em = discord.Embed(description=message, color=color)
             em.set_author(
-                name=f"{author.display_name} is currently playing {author.activity.name}",
+                name=f"{author.display_name} is currently playing {author.activity.name}", icon_url=avatar,
-                icon_url=avatar,
             )
             em.title = getattr(author.activity, "details", None)
             thumbnail = getattr(author.activity, "large_image_url", None)
@@ -89,8 +91,7 @@ class Away(commands.Cog):
             status = [c for c in author.activities if c.type == discord.ActivityType.playing]
             em = discord.Embed(description=message, color=color)
             em.set_author(
-                name=f"{author.display_name} is currently playing {status[0].name}",
+                name=f"{author.display_name} is currently playing {status[0].name}", icon_url=avatar,
-                icon_url=avatar,
             )
             em.title = getattr(status[0], "details", None)
             thumbnail = getattr(status[0], "large_image_url", None)
@@ -140,8 +141,7 @@ class Away(commands.Cog):
             em.description = message + "\n" + author.activity.url
             em.title = getattr(author.activity, "details", None)
             em.set_author(
-                name=f"{author.display_name} is currently streaming {author.activity.name}",
+                name=f"{author.display_name} is currently streaming {author.activity.name}", icon_url=avatar,
-                icon_url=avatar,
             )
         elif state == "streamingcustom":
             activity = [c for c in author.activities if c.type == discord.ActivityType.streaming]
@@ -150,8 +150,7 @@ class Away(commands.Cog):
             em.description = message + "\n" + activity[0].url
             em.title = getattr(author.activity, "details", None)
             em.set_author(
-                name=f"{author.display_name} is currently streaming {activity[0].name}",
+                name=f"{author.display_name} is currently streaming {activity[0].name}", icon_url=avatar,
-                icon_url=avatar,
             )
         else:
             em = discord.Embed(color=color)
@@ -191,9 +190,7 @@ class Away(commands.Cog):
             status = [c for c in author.activities if c.type == discord.ActivityType.playing]
             msg = f"{author.display_name} is currently playing {status[0].name}"
         elif state == "listening":
-            artist_title = f"{author.activity.title} by " + ", ".join(
+            artist_title = f"{author.activity.title} by " + ", ".join(a for a in author.activity.artists)
-                a for a in author.activity.artists
-            )
             currently_playing = self._draw_play(author.activity)
             msg = f"{author.display_name} is currently listening to {artist_title}\n{currently_playing}"
         elif state == "listeningcustom":
@@ -229,156 +226,173 @@ class Away(commands.Cog):
         return False
 
     @commands.Cog.listener()
-    async def on_message(self, message):
+    async def on_message(self, message: discord.Message):
-        tmp = {}
         guild = message.guild
-        list_of_guilds_ign = await self._away.ign_servers()
+        if not guild or not message.mentions or message.author.bot:
-        if not guild:
             return
         if not message.channel.permissions_for(guild.me).send_messages:
             return
-        if not message.mentions:
-            return
-        if message.author.bot:
-            return
 
+        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):
+            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()
+            user_data = await self.config.user(author).all()
-            text_only = await self._away.guild(guild).TEXT_ONLY()
             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)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
-                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)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             idle_msg = user_data["IDLE_MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            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)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
-                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)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             dnd_msg = user_data["DND_MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            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)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
-                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)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             offline_msg = user_data["OFFLINE_MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            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)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
-                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)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
-                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)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             if streaming_msg and type(author.activity) is discord.CustomActivity:
-                stream_status = [
+                stream_status = [c for c in author.activities if c.type == discord.ActivityType.streaming]
-                    c for c in author.activities if c.type == discord.ActivityType.streaming
-                ]
                 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)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
-                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)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             listening_msg = user_data["LISTENING_MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            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)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
-                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)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             if listening_msg and type(author.activity) is discord.CustomActivity:
-                listening_status = [
+                listening_status = [c for c in author.activities if c.type == discord.ActivityType.listening]
-                    c for c in author.activities if c.type == discord.ActivityType.listening
-                ]
                 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)
+                    await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
-                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)
+                    await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                 continue
             gaming_msgs = user_data["GAME_MESSAGE"]
+            # Convert possible `delete_after` of < 5s of before PR#212
+            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)
+                            await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                             break  # Let's not accidentally post more than one
-                        elif (embed_links and 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)
+                            await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                             break
             if gaming_msgs and type(author.activity) is discord.CustomActivity:
-                game_status = [
+                game_status = [c for c in author.activities if c.type == discord.ActivityType.playing]
-                    c for c in author.activities if c.type == discord.ActivityType.playing
-                ]
                 if not game_status:
                     continue
                 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)
+                            await message.channel.send(embed=em, delete_after=delete_after, reference=message, mention_author=False)
                             break  # Let's not accidentally post more than one
-                        elif (embed_links and 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)
+                            await message.channel.send(msg, delete_after=delete_after, reference=message, mention_author=False)
                             break
 
     @commands.command(name="away")
@@ -386,19 +400,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:
-                await self._away.user(author).MESSAGE.set((" ", delete_after))
+                await self.config.user(author).MESSAGE.set((" ", delete_after))
             else:
-                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)
 
@@ -407,19 +424,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)
 
@@ -428,19 +448,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)
 
@@ -449,19 +472,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)
 
@@ -470,19 +496,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)
 
@@ -491,71 +520,88 @@ 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 = (
+            msg = "The bot will now reply for you when you're mentioned while listening to Spotify."
-                "The bot will now reply for you when you're mentioned while listening to Spotify."
-            )
         await ctx.send(msg)
 
     @commands.command(name="gaming")
-    async def gaming_(
+    async def gaming_(self, ctx, game: str, delete_after: Optional[int] = None, *, message: str = None):
-        self, ctx, game: str, delete_after: Optional[int] = None, *, message: str = None
-    ):
         """
         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):
+    async def _ignore(self, ctx, member: discord.Member=None):
         """
-        Toggle away messages on the whole server.
+        Toggle away messages on the whole server or a specific guild member.
 
         Mods, Admins and Bot Owner are immune to this.
         """
         guild = ctx.message.guild
-        if guild.id in (await self._away.ign_servers()):
+        if member:
-            guilds = await self._away.ign_servers()
+            bl_mems = await self.config.guild(guild).BLACKLISTED_MEMBERS()
+            if member.id not in bl_mems:
+                bl_mems.append(member.id)
+                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.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.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):
         """
@@ -563,12 +609,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."
+            message = (
-        await self._away.guild(ctx.guild).TEXT_ONLY.set(not text_only)
+                "Away messages are now forced to be text only, regardless of the bot's permissions for embed links."
+            )
+        await self.config.guild(ctx.guild).TEXT_ONLY.set(not text_only)
         await ctx.send(message)
 
     @commands.command(name="awaysettings", aliases=["awayset"])
@@ -584,7 +632,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
@@ -619,9 +667,7 @@ class Away(commands.Cog):
 
         if ctx.channel.permissions_for(ctx.me).embed_links:
             em = discord.Embed(description=msg[:2048], color=author.color)
-            em.set_author(
+            em.set_author(name=f"{author.display_name}'s away settings", icon_url=author.avatar_url)
-                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)

away/info.json

@@ -1,12 +1,8 @@
 {
-	"author": [
+    "author": ["aikaterna", "Axas", "TrustyJAID"],
-		"aikaterna",
+    "description": "Set and unset a user as being away. Originally by Paddo.",
-        "Axas"
+    "short": "Away message toggle for users",
-	],
+    "tags": ["away", "afk"],
-	"description": "Set and unset a user as being away. Originally by Paddo.",
+    "type": "COG",
-	"short": "Away message toggle for users",
+    "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."
-	"tags": [
+}
-		"away"
-	],
-	"type": "COG"
-}

blurplefy/__init__.py

@@ -1,5 +1,7 @@
 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))

blurplefy/blurplefy.py

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

blurplefy/info.json

@@ -1,22 +1,11 @@
 {
-	"author": [
+    "author": ["aikaterna"],
-		"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.",
-	],
-	"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" : [
+    "permissions" : ["embed_links", "manage_roles"],
-		"embed_links",
+    "requirements": ["pillow", "python-resize-image"],
-		"manage_roles"
+    "short": "Blurplefy a user profile picture or image.",
-	],
+    "tags": ["blurple", "discord", "avatar"],
-	"requirements": [
+    "type": "COG",
-		"pillow",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-		"python-resize-image"
-	],
-	"short": "Blurplefy a user profile picture or image.",
-	"tags": [
-		"blurple",
-        "image",
-        "profile"
-	],
-	"type": "COG"
 }

cah/__init__.py

@@ -1,5 +1,7 @@
 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))

cah/cah.py

@@ -10,19 +10,21 @@ from redbot.core.data_manager import bundled_data_path
 
 
 class CardsAgainstHumanity(commands.Cog):
+    """Play Cards Against Humanity in DMs."""
+
+    async def red_delete_data_for_user(self, **kwargs):
+        """ Nothing to delete """
+        return
+
     def __init__(self, bot):
         self.bot = bot
         self.games = []
-        self.maxBots = (
+        self.maxBots = 5  # Max number of bots that can be added to a game - don't count toward max players
-            5  # Max number of bots that can be added to a game - don't count toward max players
-        )
         self.maxPlayers = 10  # Max players for ranjom joins
         self.maxDeadTime = 3600  # Allow an hour of dead time before killing a game
         self.checkTime = 300  # 5 minutes between dead time checks
         self.winAfter = 10  # 10 wins for the game
-        self.botWaitMin = (
+        self.botWaitMin = 5  # Minimum number of seconds before the bot makes a decision (default 5)
-            5  # Minimum number of seconds before the bot makes a decision (default 5)
-        )
         self.botWaitMax = 30  # Max number of seconds before a bot makes a decision (default 30)
         self.userTimeout = 500  # 5 minutes to timeout
         self.utCheck = 30  # Check timeout every 30 seconds
@@ -196,8 +198,7 @@ class CardsAgainstHumanity(commands.Cog):
                                 member["Task"] = None
                             continue
                         await self.sendToUser(
-                            member["User"],
+                            member["User"], f"Game id: *{game['ID']}* has been closed due to inactivity.",
-                            f"Game id: *{game['ID']}* has been closed due to inactivity.",
                         )
 
                     # Set running to false
@@ -211,9 +212,7 @@ class CardsAgainstHumanity(commands.Cog):
             return True
         else:
             # Not in PM
-            await message.channel.send(
+            await message.channel.send("Cards Against Humanity commands must be run in Direct Messages with the bot.")
-                "Cards Against Humanity commands must be run in Direct Messages with the bot."
-            )
             return False
 
     def randomID(self, length=8):
@@ -310,8 +309,7 @@ class CardsAgainstHumanity(commands.Cog):
                             if not newCreator["IsBot"]:
                                 newCreator["Creator"] = True
                                 await self.sendToUser(
-                                    newCreator["User"],
+                                    newCreator["User"], "The creator of this game left.  **YOU** are now the creator.",
-                                    "The creator of this game left.  **YOU** are now the creator.",
                                 )
                                 break
 
@@ -330,8 +328,7 @@ class CardsAgainstHumanity(commands.Cog):
                             member["Task"] = None
                     else:
                         await self.sendToUser(
-                            member["User"],
+                            member["User"], f"**You were removed from game id:** ***{game['ID']}.***",
-                            f"**You were removed from game id:** ***{game['ID']}.***",
                         )
                     # Removed, no need to finish the loop
                     break
@@ -456,9 +453,7 @@ class CardsAgainstHumanity(commands.Cog):
                     name=f"Not enough players to continue! ({len(game['Members'])}/{self.minMembers})"
                 )
                 prefix = await self.bot.get_valid_prefixes()
-                stat_embed.set_footer(
+                stat_embed.set_footer(text=f"Have other users join with: {prefix[0]}joincah {game['ID']}")
-                    text=f"Have other users join with: {prefix[0]}joincah {game['ID']}"
-                )
                 await self.sendToUser(member["User"], stat_embed, True)
                 continue
             if member["IsBot"] == True:
@@ -541,13 +536,9 @@ class CardsAgainstHumanity(commands.Cog):
             else:
                 stat_embed.set_author(name=f"{winnerName} won!")
             if len(winner["Cards"]) == 1:
-                msg = "The **Winning** card was:\n\n{}".format(
+                msg = "The **Winning** card was:\n\n{}".format("{}".format(" - ".join(winner["Cards"])))
-                    "{}".format(" - ".join(winner["Cards"]))
-                )
             else:
-                msg = "The **Winning** cards were:\n\n{}".format(
+                msg = "The **Winning** cards were:\n\n{}".format("{}".format(" - ".join(winner["Cards"])))
-                    "{}".format(" - ".join(winner["Cards"]))
-                )
             await self.sendToUser(member["User"], stat_embed, True)
             await self.sendToUser(member["User"], msg)
             await asyncio.sleep(0.1)
@@ -788,13 +779,9 @@ class CardsAgainstHumanity(commands.Cog):
         # Advances the game
         if len(game["Members"]) < self.minMembers:
             stat_embed = discord.Embed(color=discord.Color.red())
-            stat_embed.set_author(
+            stat_embed.set_author(name=f"Not enough players to continue! ({len(game['Members'])}/{self.minMembers})")
-                name=f"Not enough players to continue! ({len(game['Members'])}/{self.minMembers})"
-            )
             prefix = await self.bot.get_valid_prefixes()
-            stat_embed.set_footer(
+            stat_embed.set_footer(text=f"Have other users join with: {prefix[0]}joincah {game['ID']}")
-                text=f"Have other users join with: {prefix[0]}joincah {game['ID']}"
-            )
             for member in game["Members"]:
                 if member["IsBot"]:
                     continue
@@ -819,9 +806,7 @@ class CardsAgainstHumanity(commands.Cog):
                 if member["IsBot"]:
                     stat_embed.set_author(name=f"{self.botName} ({member['ID']}) is the WINNER!!")
                 else:
-                    stat_embed.set_author(
+                    stat_embed.set_author(name=f"{self.displayname(member['User'])} is the WINNER!!")
-                        name=f"{self.displayname(member['User'])} is the WINNER!!"
-                    )
                 stat_embed.set_footer(text="Congratulations!")
                 break
         if winner:
@@ -935,9 +920,7 @@ class CardsAgainstHumanity(commands.Cog):
                 user = member
                 index = userGame["Members"].index(member)
                 if index == userGame["Judge"]:
-                    await self.sendToUser(
+                    await self.sendToUser(ctx.author, "You're the judge.  You don't get to lay cards this round.")
-                        ctx.author, "You're the judge.  You don't get to lay cards this round."
-                    )
                     return
         for submit in userGame["Submitted"]:
             if submit["By"]["User"] == ctx.author:
@@ -954,9 +937,7 @@ class CardsAgainstHumanity(commands.Cog):
             stat_embed.set_author(
                 name=f"Not enough players to continue! ({len(userGame['Members'])}/{self.minMembers})"
             )
-            stat_embed.set_footer(
+            stat_embed.set_footer(text=f"Have other users join with: {prefix[0]}joincah {userGame['ID']}")
-                text=f"Have other users join with: {prefix[0]}joincah {userGame['ID']}"
-            )
             return await self.sendToUser(ctx.author, stat_embed, True)
 
         numberCards = userGame["BlackCard"]["Pick"]
@@ -992,9 +973,7 @@ class CardsAgainstHumanity(commands.Cog):
                     )
                     return await self.showHand(ctx, ctx.author)
                 if c < 1 or c > len(user["Hand"]):
-                    await self.sendToUser(
+                    await self.sendToUser(ctx.author, f"Card numbers must be between 1 and {len(user['Hand'])}.")
-                        ctx.author, f"Card numbers must be between 1 and {len(user['Hand'])}."
-                    )
                     return await self.showHand(ctx, ctx.author)
                 cards.append(user["Hand"][c - 1]["Text"])
             # Remove from user's hand
@@ -1009,14 +988,10 @@ class CardsAgainstHumanity(commands.Cog):
             try:
                 card = int(card)
             except Exception:
-                await self.sendToUser(
+                await self.sendToUser(ctx.author, f"You need to lay a valid card with `{prefix[0]}lay [card number]`")
-                    ctx.author, f"You need to lay a valid card with `{prefix[0]}lay [card number]`"
-                )
                 return await self.showHand(ctx, ctx.author)
             if card < 1 or card > len(user["Hand"]):
-                await self.sendToUser(
+                await self.sendToUser(ctx.author, f"Card numbers must be between 1 and {len(user['Hand'])}.")
-                    ctx.author, f"Card numbers must be between 1 and {len(user['Hand'])}."
-                )
                 return await self.showHand(ctx, ctx.author)
             # Valid card
             newSubmission = {"By": user, "Cards": [user["Hand"].pop(card - 1)["Text"]]}
@@ -1068,9 +1043,7 @@ class CardsAgainstHumanity(commands.Cog):
         except Exception:
             card = -1
         if card < 0 or card >= totalUsers:
-            return await self.sendToUser(
+            return await self.sendToUser(ctx.author, f"Your pick must be between 1 and {totalUsers}.")
-                ctx.author, f"Your pick must be between 1 and {totalUsers}."
-            )
         # Pick is good!
         await self.winningCard(ctx, userGame, card)
 
@@ -1099,9 +1072,7 @@ class CardsAgainstHumanity(commands.Cog):
             embed.set_author(name="**Setting up the game...**")
             await ctx.author.send(embed=embed)
         except discord.errors.Forbidden:
-            return await ctx.send(
+            return await ctx.send("You must allow Direct Messages from the bot for this game to work.")
-                "You must allow Direct Messages from the bot for this game to work."
-            )
 
         # Check if the user is already in game
         userGame = await self.userGame(ctx.author)
@@ -1148,7 +1119,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)
@@ -1178,9 +1151,7 @@ class CardsAgainstHumanity(commands.Cog):
             embed.set_author(name="**Setting up the game...**")
             await ctx.author.send(embed=embed)
         except discord.errors.Forbidden:
-            return await ctx.send(
+            return await ctx.send("You must allow Direct Messages from the bot for this game to work.")
-                "You must allow Direct Messages from the bot for this game to work."
-            )
 
         # Check if the user is already in game
         userGame = await self.userGame(ctx.author)
@@ -1253,9 +1224,7 @@ class CardsAgainstHumanity(commands.Cog):
         for member in game["Members"]:
             if member["IsBot"]:
                 continue
-            await self.sendToUser(
+            await self.sendToUser(member["User"], f"***{self.displayname(ctx.author)}*** **joined the game!**")
-                member["User"], f"***{self.displayname(ctx.author)}*** **joined the game!**"
-            )
 
         # We got a user!
         currentTime = int(time.time())
@@ -1328,9 +1297,7 @@ class CardsAgainstHumanity(commands.Cog):
         # We are the creator - let's check the number of bots
         if botCount >= self.maxBots:
             # Too many bots!
-            return await self.sendToUser(
+            return await self.sendToUser(ctx.author, f"You already have enough bots (max is {self.maxBots}).")
-                ctx.author, f"You already have enough bots (max is {self.maxBots})."
-            )
         # We can get another bot!
         botID = self.randomBotID(userGame)
         lobot = {
@@ -1350,9 +1317,7 @@ class CardsAgainstHumanity(commands.Cog):
         for member in userGame["Members"]:
             if member["IsBot"]:
                 continue
-            await self.sendToUser(
+            await self.sendToUser(member["User"], f"***{self.botName} ({botID})*** **joined the game!**")
-                member["User"], f"***{self.botName} ({botID})*** **joined the game!**"
-            )
         # await self.nextPlay(ctx, userGame)
 
         # Check if adding put us at minimum members
@@ -1391,9 +1356,7 @@ class CardsAgainstHumanity(commands.Cog):
             if member["User"] == ctx.author:
                 if not member["Creator"]:
                     # You didn't make this game
-                    return await self.sendToUser(
+                    return await self.sendToUser(ctx.author, "Only the player that created the game can add bots.")
-                        ctx.author, "Only the player that created the game can add bots."
-                    )
                 member["Time"] = int(time.time())
         if number == None:
             # No number specified - let's add the max number of bots
@@ -1407,9 +1370,7 @@ class CardsAgainstHumanity(commands.Cog):
         # We are the creator - let's check the number of bots
         if botCount >= self.maxBots:
             # Too many bots!
-            return await self.sendToUser(
+            return await self.sendToUser(ctx.author, f"You already have enough bots (max is {self.maxBots}).")
-                ctx.author, f"You already have enough bots (max is {self.maxBots})."
-            )
 
         if number > (self.maxBots - botCount):
             number = self.maxBots - botCount
@@ -1483,9 +1444,7 @@ class CardsAgainstHumanity(commands.Cog):
             if member["User"] == ctx.author:
                 if not member["Creator"]:
                     # You didn't make this game
-                    return await self.sendToUser(
+                    return await self.sendToUser(ctx.author, "Only the player that created the game can remove bots.")
-                        ctx.author, "Only the player that created the game can remove bots."
-                    )
                 member["Time"] = int(time.time())
         # We are the creator - let's check the number of bots
         if id == None:
@@ -1761,9 +1720,7 @@ class CardsAgainstHumanity(commands.Cog):
             if member["User"] == ctx.author:
                 if not member["Creator"]:
                     # You didn't make this game
-                    return await self.sendToUser(
+                    return await self.sendToUser(ctx.author, "Only the player that created the game can remove bots.")
-                        ctx.author, "Only the player that created the game can remove bots."
-                    )
         # We are the creator - let's check the number of bots
         if setting == None:
             # Output idle kick status

cah/info.json

@@ -1,18 +1,10 @@
 {
-	"author": [
+    "author": ["aikaterna"],
-		"aikaterna"
+    "description": "Cards Against Humanity, played in DMs.",
-	],
-	"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" : [
+    "permissions" : ["embed_links"],
-		"embed_links",
+    "short": "Cards Against Humanity.",
-		"manage_roles"
+    "tags": ["CAH", "cards", "game"],
-	],
+    "type": "COG",
-	"short": "Cards Against Humanity.",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-	"tags": [
-		"CAH",
-        "cards",
-        "games"
-	],
-	"type": "COG"
 }

chatchart/__init__.py

@@ -1,5 +1,7 @@
 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))

chatchart/chatchart.py

@@ -1,40 +1,97 @@
-#  Lines 72 through 90 are influenced heavily by cacobot's stats module:
+#  This cog is influenced heavily by cacobot's stats module:
 #  https://github.com/Orangestar12/cacobot/blob/master/cacobot/stats.py
 #  Big thanks to Redjumpman for changing the beta version from
 #  Imagemagick/cairosvg to matplotlib.
 #  Thanks to violetnyte for suggesting this cog.
+
+import asyncio
 import discord
 import heapq
-import os
 from io import BytesIO
-from typing import Optional
+from typing import List, Optional, Tuple, Union
-import matplotlib
 
+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
 
 
 class Chatchart(commands.Cog):
     """Show activity."""
 
+    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, 2766691001, force_registration=True)
 
-    def create_chart(self, top, others, channel):
+        default_guild = {"channel_deny": []}
+        default_global = {"limit": 0}
+
+        self.config.register_guild(**default_guild)
+        self.config.register_global(**default_global)
+
+    @staticmethod
+    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)]
+            labels = labels + ["Others {:g}%".format(round(others, 1))]
-        if len(channel.name) >= 19:
+        if len(channel_or_guild.name) >= 19:
-            channel_name = "{}...".format(channel.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
+            channel_or_guild_name = channel_or_guild.name
-        title = plt.title("Stats in #{}".format(channel_name), color="white")
+        title = plt.title("Stats in {}".format(channel_or_guild_name), color="white")
         title.set_va("top")
         title.set_ha("center")
         plt.gca().axis("equal")
@@ -77,67 +134,233 @@ 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.cooldown(1, 10, commands.BucketType.guild)
-    @commands.max_concurrency(1, commands.BucketType.channel)
+    @commands.max_concurrency(1, commands.BucketType.guild)
-    async def chatchart(self, ctx, channel: Optional[discord.TextChannel] = None, messages=5000):
+    @commands.bot_has_permissions(attach_files=True)
+    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.
         """
-        e = discord.Embed(description="Loading...", colour=0x00ccff)
-        e.set_thumbnail(url="https://i.imgur.com/vSp4xRk.gif")
-        em = await ctx.send(embed=e)
-
         if channel is None:
-            channel = ctx.message.channel
+            channel = ctx.channel
-        history = []
+
-        if not channel.permissions_for(ctx.message.author).read_messages == True:
+        # --- Early terminations
-            await em.delete()
+        if channel.permissions_for(ctx.message.author).read_messages is False:
             return await ctx.send("You're not allowed to access that channel.")
-        try:
+        if channel.permissions_for(ctx.guild.me).read_messages is False:
-            async for msg in channel.history(limit=messages):
+            return await ctx.send("I cannot read the history of that channel.")
-                history.append(msg)
+        blacklisted_channels = await self.config.guild(ctx.guild).channel_deny()
-        except discord.errors.Forbidden:
+        if channel.id in blacklisted_channels:
-            await em.delete()
+            return await ctx.send(f"I am not allowed to create a chatchart of {channel.mention}.")
-            return await ctx.send("No permissions to read that channel.")
+        if messages < 5:
-        msg_data = {"total count": 0, "users": {}}
+            return await ctx.send("Don't be silly.")
 
-        for msg in history:
+        message_limit = await self.config.limit()
-            if len(msg.author.display_name) >= 20:
+        if (message_limit != 0) and (messages > message_limit):
-                short_name = "{}...".format(msg.author.display_name[:20]).replace("$", "\\$")
+            messages = message_limit
-            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'] == {}:
+        embed = discord.Embed(
-            await em.delete()
+            title=f"Fetching messages from #{channel.name}",
-            return await ctx.message.channel.send(f'Only bots have sent messages in {channel.mention}')
+            description="This might take a while...",
-
+            colour=await self.bot.get_embed_colour(location=channel)
-        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"
-            ],
-            key=lambda x: x[1],
         )
-        others = 100 - sum(x[1] for x in top_ten)
+        loading_message = await ctx.send(embed=embed)
-        img = self.create_chart(top_ten, others, channel)
+        try:
-        await em.delete()
+            history = await self.fetch_channel_history(channel, loading_message, messages)
-        await ctx.message.channel.send(file=discord.File(img, "chart.png"))
+        except discord.errors.Forbidden:
+            try:
+                await loading_message.delete()
+            except discord.NotFound:
+                pass
+            return await ctx.send("No permissions to read that channel.")
+
+        msg_data = self.calculate_member_perc(history)
+        # If no members are found.
+        if len(msg_data["users"]) == 0:
+            try:
+                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.")
+
+        top_twenty, others = self.calculate_top(msg_data)
+        chart = await self.create_chart(top_twenty, others, channel)
+
+        try:
+            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."""
+        channel_list = await self.config.guild(ctx.guild).channel_deny()
+        if channel.id not in channel_list:
+            channel_list.append(channel.id)
+        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."""
+        no_channels_msg = "Chatchart is currently allowed everywhere in this server."
+        channel_list = await self.config.guild(ctx.guild).channel_deny()
+        if not channel_list:
+            msg = no_channels_msg
+        else:
+            msg = "Chatchart is not allowed in:\n"
+            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).channel_deny.set(new_list)
+                if len(remove_list) == len(channel_list):
+                    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."""
+        channel_list = await self.config.guild(ctx.guild).channel_deny()
+        if channel.id in channel_list:
+            channel_list.remove(channel.id)
+        else:
+            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.")

chatchart/info.json

@@ -1,18 +1,10 @@
 {
-	"author": [
+    "author": ["aikaterna", "Redjumpman"],
-		"aikaterna",
+    "description": "Generate a pie chart from the last 5000 messages in a channel to see who's been talking the most.",
-        "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",
+    "short": "Generate a pie chart from the last 5000 messages",
-	"tags": [
+    "tags": ["messages", "chart", "count", "activity"],
-		"data",
+    "requirements": ["matplotlib"],
-        "chart",
+    "type": "COG",
-        "activity"
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-	],
+}
-	"requirements": [
-		"matplotlib"
-	],
-	"type": "COG"
-}

dadjokes/__init__.py

@@ -1,5 +1,7 @@
 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))

dadjokes/dadjokes.py

@@ -1,16 +1,26 @@
 from redbot.core import commands
 import aiohttp
 
+
 class DadJokes(commands.Cog):
     """Random dad jokes from icanhazdadjoke.com"""
 
+    async def red_delete_data_for_user(self, **kwargs):
+        """ Nothing to delete """
+        return
+
     def __init__(self, bot):
         self.bot = bot
 
     @commands.command()
     async def dadjoke(self, ctx):
         """Gets a random dad joke."""
-        api = 'https://icanhazdadjoke.com/'
+        try:
-        async with aiohttp.request('GET', api, headers={'Accept': 'text/plain'}) as r:
+            async with aiohttp.request("GET", "https://icanhazdadjoke.com/", headers={"Accept": "text/plain"}) as r:
-            result = await r.text()
+                if r.status != 200:
-            await ctx.send(f"`{result}`")
+                    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}`")

dadjokes/info.json

@@ -1,10 +1,9 @@
 {
-	"author": [
+    "author": ["UltimatePancake"],
-		"UltimatePancake"
+    "description": "Gets a random dad joke from icanhazdadjoke.com",
-	],
-	"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",
+    "short": "Random dad jokes",
-	"tags": ["jokes", "dad", "dadjokes"],
+    "tags": ["jokes", "dad", "dadjokes"],
-	"type": "COG"
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }

dictionary/__init__.py

@@ -1,5 +1,7 @@
 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))

dictionary/dictionary.py

@@ -1,16 +1,26 @@
 import aiohttp
+import discord
+import contextlib
 from bs4 import BeautifulSoup
+import json
 import logging
 import re
 from redbot.core import commands
+from redbot.core.utils.chat_formatting import pagify
 
 
 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"""
+        return
 
     def __init__(self, bot):
         self.bot = bot
@@ -19,39 +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_msg = await ctx.send("Searching...")
-        search_term = word.split(" ", 1)[0]
-        result = await self._antonym(ctx, search_term)
-        if not result:
-            return await search_msg.edit(content="This word is not in the dictionary.")
-
-        result_text = "*, *".join(result)
-        await search_msg.edit(content=f"Antonyms for **{search_term}**: *{result_text}*")
-
-    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."""
@@ -60,7 +37,10 @@ class Dictionary(commands.Cog):
         result = await self._definition(ctx, search_term)
         str_buffer = ""
         if not result:
-            return await search_msg.edit(content="This word is not in the dictionary.")
+            with contextlib.suppress(discord.NotFound):
+                await search_msg.delete()
+            await ctx.send("This word is not in the dictionary.")
+            return
         for key in result:
             str_buffer += f"\n**{key}**: \n"
             counter = 1
@@ -77,7 +57,10 @@ class Dictionary(commands.Cog):
                     else:
                         str_buffer += f"{str(counter)}. {val}\n"
                         counter += 1
-        await search_msg.edit(content=str_buffer)
+        with contextlib.suppress(discord.NotFound):
+            await search_msg.delete()
+        for page in pagify(str_buffer, delims=["\n"]):
+            await ctx.send(page)
 
     async def _definition(self, ctx, word):
         data = await self._get_soup_object(f"http://wordnetweb.princeton.edu/perl/webwn?s={word}")
@@ -101,27 +84,74 @@ class Dictionary(commands.Cog):
             out[name] = meanings
         return out
 
-    async def _synonym(self, ctx, word):
+    @commands.command()
-        data = await self._get_soup_object(f"http://www.thesaurus.com/browse/{word}")
+    async def antonym(self, ctx, *, word: str):
-        if not data:
+        """Displays antonyms for a given word."""
-            return await ctx.send("Error fetching data.")
+        search_term = word.split(" ", 1)[0]
-        section = data.find_all("ul", {"class": "css-1ytlws2 et6tpn80"})
+        result = await self._antonym_or_synonym(ctx, "antonyms", search_term)
-        try:
+        if not result:
-            section[1]
+            await ctx.send("This word is not in the dictionary or nothing was found.")
-        except IndexError:
             return
-        spans = section[0].findAll("li")
+
-        synonyms = [span.text for span in spans[:50]]
+        result_text = "*, *".join(result)
-        return synonyms
+        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_msg = await ctx.send("Searching...")
         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:
-            return await search_msg.edit(content="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)
-        await search_msg.edit(content=f"Synonyms for **{search_term}**: *{result_text}*")
+        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

dictionary/info.json

@@ -1,15 +1,10 @@
 {
-	"author": [
+    "author": ["UltimatePancake", "aikaterna"],
-		"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.",
-	"description": "Gets definitions, antonyms, or synonyms for given words",
+    "short": "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.",
+    "tags": ["dictionary", "synonym", "antonym"],
-	"short": "Gets definitions, antonyms, or synonyms for given words",
+    "requirements": ["beautifulsoup4"],
-	"tags": [
+    "type": "COG",
-		"dictionary"
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-	],
-	"requirements": [
-		"beautifulsoup4"
-	],
-	"type": "COG"
 }

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."
+
+
+def setup(bot):
+    bot.add_cog(DiscordExperiments(bot))

discordexperiments/discordexperiments.py

@@ -0,0 +1,217 @@
+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}
+        reason = (
+            f"DiscordExperiments: {ctx.author} ({ctx.author.id}) created an invite for {app_name}."
+        )
+        code = (await self.bot.http.request(r, json=payload, reason=reason))["code"]
+
+        await ctx.send(
+            embed=discord.Embed(
+                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(hidden=True)
+    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(hidden=True)
+    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 = "the Blazing 8s game"
+        await self._create_invite(ctx, 832025144389533716, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @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 = "the Putt Party game"
+        await self._create_invite(ctx, 945737671223947305, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @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 = "the Land-io game"
+        await self._create_invite(ctx, 903769130790969345, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def bobbleleague(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Bobble League voice channel invite.
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Bobble League game"
+        await self._create_invite(ctx, 947957217959759964, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def askaway(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create an Ask Away voice channel invite.
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Ask Away game"
+        await self._create_invite(ctx, 976052223358406656, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def knowwhatimeme(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Know What I Meme voice channel invite.
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Know What I Meme game"
+        await self._create_invite(ctx, 950505761862189096, invite_max_age_in_seconds, app_name)
+
+    @commands.cooldown(1, 10, discord.ext.commands.BucketType.guild)
+    @commands.command()
+    async def bashout(self, ctx, invite_max_age_in_seconds=86400):
+        """
+        Create a Bash Out voice channel invite.
+        Use `0` for `invite_max_age_in_seconds` if you want the invite to be permanent.
+        """
+        app_name = "the Bash Out game"
+        await self._create_invite(ctx, 1006584476094177371, invite_max_age_in_seconds, app_name)

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."
+}

dungeon/__init__.py

@@ -1,5 +0,0 @@
-from .dungeon import Dungeon
-
-
-def setup(bot):
-    bot.add_cog(Dungeon(bot))

dungeon/dungeon.py

@@ -1,543 +0,0 @@
-import asyncio
-import datetime
-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."""
-
-    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.")
-
-        try:
-            await user.edit(
-                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)

dungeon/info.json

@@ -1,19 +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"
-}

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.

embedpeek/__init__.py

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

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

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."
+}

hunting/__init__.py

@@ -1,5 +1,14 @@
 from .hunting import Hunting
 
+__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 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."
+)
+
 
 async def setup(bot):
     bot.add_cog(Hunting(bot))

hunting/hunting.py

@@ -1,22 +1,30 @@
 import asyncio
-import discord
 import datetime
-import itertools
+from logging import warning
 import math
 import random
 import time
+from typing import Literal
 
-from redbot.core import checks, commands, Config
+import discord
-from redbot.core.utils.chat_formatting import bold, box, humanize_list, humanize_number, pagify
+from redbot.core import Config, checks, commands, bank
-from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
+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.9"
-__version__ = "3.1.3"
 
 
 class Hunting(commands.Cog):
     """Hunting, it hunts birds and things that fly."""
 
+    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, 2784481002, force_registration=True)
@@ -39,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_global(**default_global)
 
     @commands.guild_only()
     @commands.group()
@@ -56,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"
@@ -68,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"))
 
@@ -92,9 +117,7 @@ class Hunting(commands.Cog):
         header = "{score:{score_len}}{name:2}\n".format(
             score="# Birds Shot",
             score_len=score_len + 5,
-            name="Name"
+            name="Name" if not str(ctx.author.mobile_status) in ["online", "idle", "dnd"] else "Name",
-            if not str(ctx.author.mobile_status) in ["online", "idle", "dnd"]
-            else "Name",
         )
         temp_msg = header
         for account in sorted_acc:
@@ -124,9 +147,7 @@ class Hunting(commands.Cog):
                 colour=await ctx.bot.get_embed_color(location=ctx.channel),
                 description=box(title, lang="prolog") + (box(page, lang="md")),
             )
-            embed.set_footer(
+            embed.set_footer(text=f"Page {humanize_number(pages)}/{humanize_number(math.ceil(len(temp_msg) / 800))}")
-                text=f"Page {humanize_number(pages)}/{humanize_number(math.ceil(len(temp_msg) / 800))}"
-            )
             pages += 1
             page_list.append(embed)
         if len(page_list) == 1:
@@ -152,13 +173,43 @@ 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):
         """When will the next occurrence happen?"""
         try:
-            self.next_bang[ctx.guild.id]
+            hunt = self.next_bang[ctx.guild.id]
-            time = abs(datetime.datetime.utcnow() - self.next_bang[ctx.guild.id])
+            time = abs(datetime.datetime.utcnow() - hunt)
             total_seconds = int(time.total_seconds())
             hours, remainder = divmod(total_seconds, 60 * 60)
             minutes, seconds = divmod(remainder, 60)
@@ -224,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)
@@ -252,7 +327,9 @@ class Hunting(commands.Cog):
         await self.config.guild(ctx.guild).hunt_interval_minimum.set(interval_min)
         await self.config.guild(ctx.guild).hunt_interval_maximum.set(interval_max)
         await self.config.guild(ctx.guild).wait_for_bang_timeout.set(bang_timeout)
-        message += f"Timing has been set:\nMin time {interval_min}s\nMax time {interval_max}s\nBang timeout {bang_timeout}s"
+        message += (
+            f"Timing has been set:\nMin time {interval_min}s\nMax time {interval_max}s\nBang timeout {bang_timeout}s"
+        )
         await ctx.send(bold(message))
 
     @hunting.command()
@@ -280,9 +357,7 @@ class Hunting(commands.Cog):
         if channel.id not in self.paused_games:
             self.paused_games.append(channel.id)
             await channel.send(
-                bold(
+                bold("It seems there are no hunters here. The hunt will be resumed when someone treads here again.")
-                    "It seems there are no hunters here. The hunt will be resumed when someone treads here again."
-                )
             )
         return False
 
@@ -306,9 +381,7 @@ class Hunting(commands.Cog):
                     return False
                 if channel != message.channel:
                     return False
-                return (
+                return message.content.lower().split(" ")[0] == "bang" if message.content else False
-                    message.content.lower().split(" ")[0] == "bang" if message.content else False
-                )
 
             try:
                 bang_msg = await self.bot.wait_for("message", check=check, timeout=timeout)
@@ -346,19 +419,38 @@ class Hunting(commands.Cog):
 
         bang_now = time.time()
         time_for_bang = "{:.3f}".format(bang_now - now)
-        bangtime = (
+        bangtime = "" if not await self.config.guild(guild).bang_time() else f" in {time_for_bang}s"
-            "" if not await self.config.guild(guild).bang_time() else f" in {time_for_bang}s"
-        )
 
         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:
@@ -379,9 +471,7 @@ class Hunting(commands.Cog):
             self.in_game.append(message.channel.id)
 
         guild_data = await self.config.guild(message.guild).all()
-        wait_time = random.randrange(
+        wait_time = random.randrange(guild_data["hunt_interval_minimum"], guild_data["hunt_interval_maximum"])
-            guild_data["hunt_interval_minimum"], guild_data["hunt_interval_maximum"]
-        )
         self.next_bang[message.guild.id] = datetime.datetime.fromtimestamp(
             int(time.mktime(datetime.datetime.utcnow().timetuple())) + wait_time
         )
@@ -390,7 +480,7 @@ class Hunting(commands.Cog):
         self.game_tasks.append(task)
         try:
             del self.next_bang[message.guild.id]
-        except KeyError:
+        except (KeyError, AttributeError):
             pass
 
     def cog_unload(self):

hunting/info.json

@@ -1,8 +1,9 @@
 {
-	"author": ["aikaterna", "Paddo"],
+    "author": ["aikaterna", "Paddo"],
-	"description": "Hunting, it hunts birds and things that fly.",
+    "description": "Hunting, it hunts birds and things that fly.",
-	"install_msg": "Check out [p]hunting to get started.",
+    "install_msg": "Check out [p]hunting to get started.",
-	"short": "A bird hunting game.",
+    "short": "A bird hunting game.",
-	"tags": ["hunting", "hunt", "game"],
+    "tags": ["hunting", "hunt", "game"],
-	"type": "COG"
+    "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."
+}

icyparser/__init__.py

@@ -1,5 +1,7 @@
 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))

icyparser/icyparser.py

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

icyparser/info.json

@@ -1,14 +1,9 @@
 {
-	"author": [
+    "author": ["aikaterna"],
-		"aikaterna"
+    "description": "Audio addon cog for dislaying icecast/shoutcast info.",
-	],
-	"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",
+    "short": "Audio addon cog for dislaying icecast/shoutcast info",
-	"tags": [
+    "tags": ["audio", "icecast", "shoutcast"],
-		"audio",
+    "type": "COG",
-		"icecast",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-		"shoutcast"
+}
-	],
-	"type": "COG"
-}

inspirobot/__init__.py

@@ -1,5 +1,7 @@
 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))

inspirobot/info.json

@@ -1,16 +1,10 @@
 {
-	"author": [
+    "author": ["aikaterna"],
-		"aikaterna"
+    "description": "Fetch a random 'inspiring' message from http://inspirobot.me",
-	],
-	"description": "Fetch a random 'inspiring' message from http://inspirobot.me",
     "install_msg": "Thanks for installing, have fun.",
-    "permissions" : [
+    "permissions" : ["embed_links"],
-		"embed_links"
+    "short": "Fetch 'inspiring' messages.",
-	],
+    "tags": ["inspire", "inspirobot"],
-	"short": "Fetch 'inspiring' messages.",
+    "type": "COG",
-	"tags": [
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-		"inspire",
+}
-        "inspirobot"
-	],
-	"type": "COG"
-}

inspirobot/inspirobot.py

@@ -5,6 +5,11 @@ from redbot.core import commands
 
 class Inspirobot(commands.Cog):
     """Posts images generated by https://inspirobot.me"""
+
+    async def red_delete_data_for_user(self, **kwargs):
+        """ Nothing to delete """
+        return
+
     def __init__(self, bot):
         self.bot = bot
         self.session = aiohttp.ClientSession()
@@ -13,9 +18,7 @@ class Inspirobot(commands.Cog):
     async def inspireme(self, ctx):
         """Fetch a random "inspirational message" from the bot."""
         try:
-            async with self.session.request(
+            async with self.session.request("GET", "http://inspirobot.me/api?generate=true") as page:
-                "GET", "http://inspirobot.me/api?generate=true"
-            ) as page:
                 pic = await page.text(encoding="utf-8")
                 em = discord.Embed()
                 em.set_image(url=pic)

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))

invites/info.json

@@ -1,11 +1,10 @@
 {
-	"author": ["aikaterna"],
+    "author": ["aikaterna"],
-	"description": "Invite count display and leaderboard.",
+    "description": "Invite count display and leaderboard.",
     "install_msg": "Thanks for installing. Use `[p]invites` to get started.",
-	"short": "Invite count display and leaderboard.",
+    "short": "Invite count display and leaderboard.",
-	"tags": ["invites"],
+    "tags": ["invites"],
-	"min_bot_version": "3.3.10",
+    "permissions": ["administrator", "embed_links"],
-	"permissions": ["administrator", "embed_links"],
+    "type": "COG",
-	"type": "COG"
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }
-

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):
@@ -39,12 +46,13 @@ class Invites(commands.Cog):
             return await self._send_embed(ctx, PERM_MSG)
 
         if not invite_code_or_url:
-            pages = MenuPages(await ctx.guild.invites())
+            pages = MenuInvitePages(await ctx.guild.invites())
-            await self._menu(ctx, pages)
         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):
@@ -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:
+        pagified_stings = [x for x in cf.pagify(invite_info, delims=["\n"], shorten_by=16)]
-            embed.set_footer(text="Only displaying pinned invites.")
+        pages = MenuLeaderboardPages(ctx, pagified_stings, show_all=list_all_invites)
-        else:
+        await self._menu(ctx, pages)
-            embed.set_footer(text="Displaying all invites.")
-        await ctx.send(embed=embed)
 
     @invites.command(aliases=["listpinned"])
     async def listpin(self, ctx: commands.Context):
@@ -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.

latex/__init__.py

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

latex/info.json

@@ -0,0 +1,10 @@
+{
+    "author": ["aikaterna", "Stevy"],
+    "description": "Generates an image for a LaTeX expression.",
+    "install_msg": "Thanks for installing, have fun.",
+    "short": "Generates an image for a LaTeX expression.",
+    "tags": ["latex"],
+    "requirements": ["pillow"],
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}

latex/latex.py

@@ -0,0 +1,64 @@
+import aiohttp
+import discord
+import io
+import logging
+import re
+from PIL import Image, ImageOps
+import urllib.parse as parse
+from redbot.core import commands
+
+
+log = logging.getLogger("red.aikaterna.latex")
+
+START_CODE_BLOCK_RE = re.compile(r"^((```(la)?tex)(?=\s)|(```))")
+
+
+class Latex(commands.Cog):
+    """LaTeX expressions via an image."""
+
+    async def red_delete_data_for_user(self, **kwargs):
+        """Nothing to delete."""
+        return
+
+    def __init__(self, bot):
+        self.bot = bot
+        self.session = aiohttp.ClientSession()
+
+    @staticmethod
+    def cleanup_code_block(content):
+        # remove ```latex\n```/```tex\n```/``````
+        if content.startswith("```") and content.endswith("```"):
+            return START_CODE_BLOCK_RE.sub("", content)[:-3]
+        
+        # remove `foo`
+        return content.strip("` \n")
+
+    @commands.guild_only()
+    @commands.command()
+    async def latex(self, ctx, *, equation):
+        """Takes a LaTeX expression and makes it pretty."""
+        base_url = "https://latex.codecogs.com/gif.latex?%5Cbg_white%20%5CLARGE%20"
+        equation = self.cleanup_code_block(equation)
+        equation = parse.quote(equation)
+        url = f"{base_url}{equation}"
+
+        try:
+            async with self.session.get(url) as r:
+                image = await r.read()
+            image = Image.open(io.BytesIO(image)).convert("RGBA")
+        except Exception as exc:
+            log.exception("Something went wrong while trying to read the image:\n ", exc_info=exc)
+            image = None
+
+        if not image:
+            return await ctx.send("I can't get the image from the website, check your console for more information.")
+
+        image = ImageOps.expand(image, border=10, fill="white")
+        image_file_object = io.BytesIO()
+        image.save(image_file_object, format="png")
+        image_file_object.seek(0)
+        image_final = discord.File(fp=image_file_object, filename="latex.png")
+        await ctx.send(file=image_final)
+
+    def cog_unload(self):
+        self.bot.loop.create_task(self.session.close())

luigipoker/__init__.py

@@ -1,5 +1,7 @@
 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))

luigipoker/info.json

@@ -1,8 +1,9 @@
 {
-	"author": ["aikaterna", "themario30"],
+    "author": ["aikaterna", "themario30"],
-	"description": "Play the Luigi Poker minigame from New Super Mario Brothers.",
+    "description": "Play the Luigi Poker minigame from New Super Mario Brothers.",
-	"install_msg": "Thanks for installing.",
+    "install_msg": "Thanks for installing.",
-	"short": "A Luigi poker minigame.",
+    "short": "A Luigi poker minigame.",
-	"tags": ["poker", "game"],
+    "tags": ["poker", "game"],
-	"type": "COG"
+    "type": "COG",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
 }

luigipoker/luigipoker.py

@@ -1,7 +1,7 @@
 import asyncio
 import logging
 from random import randint
-from redbot.core import commands, checks
+from redbot.core import commands
 from redbot.core.utils.chat_formatting import box
 from redbot.core.utils.predicates import MessagePredicate
 
@@ -83,8 +83,13 @@ class Deck:
 
 
 class LuigiPoker(commands.Cog):
+    """The Luigi Poker minigame from New Super Mario Brothers."""
 
-    __version__ = "0.1.1"
+    async def red_delete_data_for_user(self, **kwargs):
+        """ Nothing to delete """
+        return
+
+    __version__ = "0.1.2"
 
     def __init__(self, bot):
         self.bot = bot
@@ -165,8 +170,7 @@ class LuigiPoker(commands.Cog):
             return await self.fold(ctx)
         else:
             log.error(
-                "LuigiPoker: Something broke unexpectedly in _play_response. Please report it.",
+                "LuigiPoker: Something broke unexpectedly in _play_response. Please report it.", exc_info=True,
-                exc_info=True,
             )
 
     async def hit(self, ctx):
@@ -176,9 +180,7 @@ class LuigiPoker(commands.Cog):
             "Examples: `1,3,5` or `4, 5`"
         )
         try:
-            user_resp = await ctx.bot.wait_for(
+            user_resp = await ctx.bot.wait_for("message", timeout=60, check=MessagePredicate.same_context(ctx))
-                "message", timeout=60, check=MessagePredicate.same_context(ctx)
-            )
         except asyncio.TimeoutError:
             await ctx.send("No response.")
             return await self.fold(ctx)

massunban/__init__.py

@@ -0,0 +1,7 @@
+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(MassUnban(bot))

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"]
+}

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.")

noflippedtables/__init__.py

@@ -1,5 +1,7 @@
 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))
+    bot.add_cog(NoFlippedTables(bot))

noflippedtables/info.json

@@ -1,9 +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."
-}
+}

noflippedtables/noflippedtables.py

@@ -8,6 +8,10 @@ from redbot.core.utils.chat_formatting import box
 class NoFlippedTables(commands.Cog):
     """For the table sympathizers"""
 
+    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, 2712290002, force_registration=True)
@@ -81,6 +85,8 @@ class NoFlippedTables(commands.Cog):
         user = message.author
         if not message.guild:
             return
+        if not channel.permissions_for(message.guild.me).send_messages:
+            return
         if hasattr(user, "bot") and user.bot is True:
             return
         toggle = await self.config.guild(message.guild).TOGGLE()

nolinks/__init__.py

@@ -1,5 +0,0 @@
-from .nolinks import NoLinks
-
-
-def setup(bot):
-    bot.add_cog(NoLinks(bot))

nolinks/info.json

@@ -1,17 +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"
-}

nolinks/nolinks.py

@@ -1,148 +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):
-    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)

otherbot/__init__.py

@@ -1,5 +1,9 @@
 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. "
+)
+
 
 async def setup(bot):
     cog = Otherbot(bot)

otherbot/info.json

@@ -1,9 +1,10 @@
 {
-  "author": ["aikaterna", "Predä 。#1001"],
+    "author": ["aikaterna", "Predä"],
-  "description": "Alerts a role when bot(s) go offline.",
+    "description": "Alerts a role when bot(s) go offline.",
-  "install_msg": "Thanks for installing, have fun.",
+    "install_msg": "Thanks for installing, have fun.",
-  "permissions": ["manage_roles"],
+    "permissions" : ["manage_roles"],
-  "short": "Alerts a role when bot(s) go offline.",
+    "short": "Alerts a role when bot(s) go offline.",
-  "tags": ["bots"],
+    "tags": ["bot", "offline", "uptime"],
-  "type": "COG"
+    "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. "
 }

otherbot/otherbot.py

@@ -1,3 +1,5 @@
+from typing import Literal
+
 import discord
 from redbot.core.bot import Red
 from redbot.core import commands, checks, Config
@@ -10,7 +12,21 @@ DEFAULT_ONLINE_EMOJI = "\N{WHITE HEAVY CHECK MARK}"
 
 class Otherbot(commands.Cog):
     __author__ = ["aikaterna", "Predä 。#1001"]
-    __version__ = "0.9"
+    __version__ = "0.10"
+
+    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("watching", []):
+                    bypass = guild_data.get("watching", [])
+                    bypass = set(bypass)
+                    bypass.discard(user_id)
+                    await self.config.guild_from_id(guild_id).bypass.set(list(bypass))
 
     def __init__(self, bot: Red):
         self.bot = bot

partycrash/__init__.py

@@ -1,5 +1,7 @@
 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))

partycrash/info.json

@@ -1,15 +1,10 @@
 {
-	"author": [
+    "author": ["aikaterna", "Will (tekulvw)"],
-		"aikaterna"
+    "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.",
-	"description": "Posts invites to servers, if the bot is allowed to view them. Does not generate new invites.",
+    "permissions" : ["manage_guild"],
-    "install_msg": "Thanks for installing, have fun.",
+    "short": "Post server invites.",
-    "permissions" : [
+    "tags": ["invite"],
-		"manage_guild"
+    "type": "COG",
-	],
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-	"short": "Post server invites.",
-	"tags": [
-		"invite"
-	],
-	"type": "COG"
 }

partycrash/partycrash.py

@@ -8,6 +8,10 @@ class PartyCrash(commands.Cog):
     """Partycrash inspired by v2 Admin by Will
        Does not generate invites, only lists existing invites."""
 
+    async def red_delete_data_for_user(self, **kwargs):
+        """ Nothing to delete """
+        return
+
     def __init__(self, bot):
         self.bot = bot
 
@@ -75,8 +79,6 @@ class PartyCrash(commands.Cog):
                 try:
                     await self._get_invites(guild, ctx)
                 except discord.errors.Forbidden:
-                    return await ctx.send(
+                    return await ctx.send(f"I don't have permission to get invites for {guild.name}.")
-                        f"I don't have permission to get invites for {guild.name}."
-                    )
             except asyncio.TimeoutError:
                 return await ctx.send("No server number entered, try again later.")

pingtime/__init__.py

@@ -1,5 +1,7 @@
 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))

pingtime/info.json

@@ -1,13 +1,9 @@
 {
-	"author": [
+    "author": ["aikaterna"],
-		"aikaterna"
+    "description": "It's ping... with latency. Shows all shards.",
-	],
-	"description": "It's ping... with latency. Shows all shards.",
     "install_msg": "Thanks for installing, have fun.",
-	"short": "Ping pong.",
+    "short": "Ping pong.",
-	"tags": [
+    "tags": ["ping", "pingtime", "latency"],
-		"pingtime",
+    "type": "COG",
-        "latency"
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-	],
+}
-	"type": "COG"
-}

pingtime/pingtime.py

@@ -3,8 +3,14 @@ from redbot.core import commands
 
 BaseCog = getattr(commands, "Cog", object)
 
+
 class Pingtime(BaseCog):
     """🏓"""
+
+    async def red_delete_data_for_user(self, **kwargs):
+        """ Nothing to delete """
+        return
+
     def __init__(self, bot):
         self.bot = bot
 

pressf/__init__.py

@@ -1,4 +1,7 @@
 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))

pressf/info.json

@@ -1,13 +1,9 @@
 {
-    "author": [
+    "author": ["aikaterna"],
-        "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": [
+    "tags": ["f", "pressf", "respects"],
-        "pressf",
+    "type": "COG",
-        "respects"
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-    ],
-    "type": "COG"
 }

pressf/pressf.py

@@ -7,6 +7,10 @@ from redbot.core.utils.common_filters import filter_mass_mentions
 class PressF(commands.Cog):
     """Pay some respects."""
 
+    async def red_delete_data_for_user(self, **kwargs):
+        """ Nothing to delete """
+        return
+
     def __init__(self, bot):
         self.bot = bot
         self.channels = {}
@@ -19,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
@@ -32,22 +35,21 @@ 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': []}
+        self.channels[str(ctx.channel.id)] = {"msg_id": message.id, "reacted": []}
         await asyncio.sleep(120)
         try:
             await message.delete()
         except (discord.errors.NotFound, discord.errors.Forbidden):
             pass
-        amount = len(self.channels[str(ctx.channel.id)]['reacted'])
+        amount = len(self.channels[str(ctx.channel.id)]["reacted"])
         word = "person has" if amount == 1 else "people have"
         await ctx.send(f"**{amount}** {word} paid respects to **{filter_mass_mentions(answer)}**.")
         del self.channels[str(ctx.channel.id)]
@@ -56,11 +58,11 @@ class PressF(commands.Cog):
     async def on_reaction_add(self, reaction, user):
         if str(reaction.message.channel.id) not in self.channels:
             return
-        if self.channels[str(reaction.message.channel.id)]['msg_id'] != reaction.message.id:
+        if self.channels[str(reaction.message.channel.id)]["msg_id"] != reaction.message.id:
             return
         if user.id == self.bot.user.id:
             return
-        if user.id not in self.channels[str(reaction.message.channel.id)]['reacted']:
+        if user.id not in self.channels[str(reaction.message.channel.id)]["reacted"]:
             if str(reaction.emoji) == "\U0001f1eb":
                 await reaction.message.channel.send(f"**{user.name}** has paid their respects.")
-                self.channels[str(reaction.message.channel.id)]['reacted'].append(user.id)
+                self.channels[str(reaction.message.channel.id)]["reacted"].append(user.id)

pupper/__init__.py

@@ -1,5 +0,0 @@
-from .pupper import Pupper
-
-
-async def setup(bot):
-    bot.add_cog(Pupper(bot))

pupper/info.json

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

pupper/pupper.py

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

quiz/__init__.py

@@ -1,4 +1,7 @@
 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))

quiz/info.json

@@ -1,8 +1,9 @@
 {
-	"author": ["Keane", "aikaterna"],
+    "author": ["Keane", "aikaterna"],
-	"description": "Play a kahoot-like trivia game.",
+    "description": "Play a kahoot-like trivia game.",
-	"install_msg": "Thanks for installing.",
+    "install_msg": "Thanks for installing.",
-	"short": "Play a kahoot-like trivia game.",
+    "short": "Play a kahoot-like trivia game.",
-	"tags": ["trivia", "quiz"],
+    "tags": ["trivia", "quiz"],
-	"type": "COG"
+    "type": "COG",
-}
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}

quiz/quiz.py

@@ -49,6 +49,10 @@ class Quiz(commands.Cog):
     Originally by Keane for Red v2
     """
 
+    async def red_delete_data_for_user(self, **kwargs):
+        """ Nothing to delete """
+        return
+
     def __init__(self, bot):
         self.bot = bot
 
@@ -102,19 +106,18 @@ class Quiz(commands.Cog):
         elif category_name_or_id.isdigit():
             # cat id specified
             if 9 <= int(category_name_or_id) >= 32:
-                return await ctx.send(
+                return await ctx.send(f"Invalid category number. Use `{ctx.prefix}quiz categories` to see a list.")
-                    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:
                 category_name = await self.category_name_match(category_name_or_id)
             except RuntimeError:
-                return await ctx.send(
+                return await ctx.send(f"Invalid category name. Use `{ctx.prefix}quiz categories` to see a list.")
-                    f"Invalid category name. Use `{ctx.prefix}quiz categories` to see a list."
-                )
             category_id = await self.category_id_from_name(category_name)
 
         if channel.id not in self.playing_channels:
@@ -221,9 +224,7 @@ class Quiz(commands.Cog):
             while True:
                 for channelid in list(self.playing_channels):
                     channelinfo = self.playing_channels[channelid]
-                    since_start = (
+                    since_start = (datetime.datetime.utcnow() - channelinfo["Start"]).total_seconds()
-                        datetime.datetime.utcnow() - channelinfo["Start"]
-                    ).total_seconds()
 
                     if since_start > 30 and not channelinfo["Started"]:
                         channel = self.bot.get_channel(channelid)
@@ -318,9 +319,7 @@ class Quiz(commands.Cog):
             assert answerdict[correct_letter] == html.unescape(dictionary["correct_answer"])
 
             if await self.config.guild(channel.guild).show_answer():
-                message = (
+                message = f"Correct answer:```{correct_letter.upper()}. {answerdict[correct_letter]}```"
-                    f"Correct answer:```{correct_letter.upper()}. {answerdict[correct_letter]}```"
-                )
                 await channel.send(message)
 
             # Assign scores
@@ -350,11 +349,7 @@ class Quiz(commands.Cog):
         """Ends a quiz game."""
         # non-linear credit earning .0002x^{2.9} where x is score/100
         channelinfo = self.playing_channels[channel.id]
-        idlist = sorted(
+        idlist = sorted(list(channelinfo["Players"]), key=(lambda idnum: channelinfo["Players"][idnum]), reverse=True,)
-            list(channelinfo["Players"]),
-            key=(lambda idnum: channelinfo["Players"][idnum]),
-            reverse=True,
-        )
 
         winner = channel.guild.get_member(idlist[0])
         await channel.send(f"Game over! {winner.mention} won!")
@@ -400,11 +395,7 @@ class Quiz(commands.Cog):
         """Returns a scoreboard string to be sent to the text channel."""
         channelinfo = self.playing_channels[channel.id]
         scoreboard = "\n"
-        idlist = sorted(
+        idlist = sorted(list(channelinfo["Players"]), key=(lambda idnum: channelinfo["Players"][idnum]), reverse=True,)
-            list(channelinfo["Players"]),
-            key=(lambda idnum: channelinfo["Players"][idnum]),
-            reverse=True,
-        )
         max_score = channelinfo["Players"][idlist[0]]
         end_len = len(str(max_score)) + 1
         rank = 1
@@ -457,21 +448,15 @@ class Quiz(commands.Cog):
             parameters["difficulty"] = difficulty
         for _ in range(3):
             parameters["token"] = await self.get_token(server)
-            async with self.session.get(
+            async with self.session.get("https://opentdb.com/api.php", params=parameters) as response:
-                "https://opentdb.com/api.php", params=parameters
-            ) as response:
                 response_json = await response.json()
                 response_code = response_json["response_code"]
                 if response_code == 0:
                     return response_json
                 elif response_code == 1:
-                    raise RuntimeError(
+                    raise RuntimeError("Question retrieval unsuccessful. Response code from OTDB: 1")
-                        "Question retrieval unsuccessful. Response code from OTDB: 1"
-                    )
                 elif response_code == 2:
-                    raise RuntimeError(
+                    raise RuntimeError("Question retrieval unsuccessful. Response code from OTDB: 2")
-                        "Question retrieval unsuccessful. Response code from OTDB: 2"
-                    )
                 elif response_code == 3:
                     # Token expired. Obtain new one.
                     log.debug("Quiz: Response code from OTDB: 3")
@@ -487,9 +472,7 @@ class Quiz(commands.Cog):
         and saves one if one doesn't exist."""
         token = await self.config.guild(server).token()
         if not token:
-            async with self.session.get(
+            async with self.session.get("https://opentdb.com/api_token.php", params={"command": "request"}) as response:
-                "https://opentdb.com/api_token.php", params={"command": "request"}
-            ) as response:
                 response_json = await response.json()
                 token = response_json["token"]
                 await self.config.guild(server).token.set(token)
@@ -503,17 +486,13 @@ class Quiz(commands.Cog):
         ) as response:
             response_code = (await response.json())["response_code"]
             if response_code != 0:
-                raise RuntimeError(
+                raise RuntimeError(f"Token reset was unsuccessful. Response code from OTDB: {response_code}")
-                    f"Token reset was unsuccessful. Response code from OTDB: {response_code}"
-                )
 
     async def category_selector(self):
         """Chooses a random category that has enough questions."""
         for _ in range(10):
             category = random.randint(9, 32)
-            async with self.session.get(
+            async with self.session.get("https://opentdb.com/api_count.php", params={"category": category}) as response:
-                "https://opentdb.com/api_count.php", params={"category": category}
-            ) as response:
                 response_json = await response.json()
                 assert response_json["category_id"] == category
                 if response_json["category_question_count"]["total_question_count"] > 39:

region/__init__.py

@@ -1,5 +0,0 @@
-from .region import Region
-
-
-def setup(bot):
-    bot.add_cog(Region())

region/info.json

@@ -1,9 +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
-}

region/region.py

@@ -1,49 +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."""
-
-    @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}`."
-        )

reminder/LICENSE

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

reminder/__init__.py

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

reminder/info.json

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

reminder/reminder.py

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

retrosign/__init__.py

@@ -1,5 +0,0 @@
-from .retrosign import Retrosign
-
-
-def setup(bot):
-    bot.add_cog(Retrosign(bot))

retrosign/info.json

@@ -1,19 +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"
-}

retrosign/retrosign.py

@@ -1,81 +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
-import os
-from random import choice
-import re
-import unicodedata
-
-
-class Retrosign(commands.Cog):
-    """Make an 80s retro sign. Originally by Anismash"""
-    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())

rndstatus/__init__.py

@@ -1,5 +1,7 @@
 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))

rndstatus/info.json

@@ -1,13 +1,9 @@
 {
-	"author": [
+    "author": ["aikaterna", "Twentysix"],
-		"aikaterna"
+    "description": "Random statuses with an optional bot stats mode. Ported from Twentysix's v2 cog.",
-	],
+    "install_msg": "Thanks for installing, have fun.",
-	"description": "Random statuses with an optional bot stats mode. Ported from Twentysix's v2 cog.",
+    "short": "Random bot statuses",
-	"install_msg": "Thanks for installing, have fun.",
+    "tags": ["status"],
-	"min_bot_version": "3.3.6",
+    "type": "COG",
-	"short": "Random bot statuses",
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
-	"tags": [
-		"status"
-	],
-	"type": "COG"
 }

rndstatus/rndstatus.py

@@ -3,14 +3,13 @@ import discord
 from redbot.core import Config, commands, checks
 from redbot.core.utils import AsyncIter
 from random import choice as rndchoice
-from collections import defaultdict, Counter, Sequence
+from collections import defaultdict
-import time
 import contextlib
 import asyncio
 import logging
 
 
-log = logging.getLogger("red.aikaterna-cogs.rndstatus")
+log = logging.getLogger("red.aikaterna.rndstatus")
 
 
 class RndStatus(commands.Cog):
@@ -18,49 +17,30 @@ class RndStatus(commands.Cog):
     If a custom status is already set, it won't change it until
     it's back to none. [p]set game"""
 
+    async def red_delete_data_for_user(self, **kwargs):
+        """ Nothing to delete """
+        return
+
     def __init__(self, bot):
         self.bot = bot
         self.last_change = None
         self.config = Config.get_conf(self, 2752521001, force_registration=True)
-        self._user_count = 0
 
-        self.user_task = asyncio.create_task(self._get_user_count())
         self.presence_task = asyncio.create_task(self.maybe_update_presence())
 
         default_global = {
             "botstats": False,
             "delay": 300,
-            "statuses": [
+            "statuses": ["her Turn()", "Tomb Raider II", "Transistor", "NEO Scavenger", "Python", "with your heart.",],
-                "her Turn()",
-                "Tomb Raider II",
-                "Transistor",
-                "NEO Scavenger",
-                "Python",
-                "with your heart.",
-            ],
             "streamer": "rndstatusstreamer",
-            "type": 1,
+            "type": 0,
+            "status": 0,
         }
         self.config.register_global(**default_global)
 
     def cog_unload(self):
-        self.user_task.cancel()
         self.presence_task.cancel()
 
-    async def _get_user_count(self):
-        await self.bot.wait_until_ready()
-        with contextlib.suppress(asyncio.CancelledError):
-            self._user_count = len(self.bot.users)
-            while True:
-                temp_data = defaultdict(set)
-                async for s in AsyncIter(self.bot.guilds):
-                    if s.unavailable:
-                        continue
-                    async for m in AsyncIter(s.members):
-                        temp_data["Unique Users"].add(m.id)
-                self._user_count = len(temp_data["Unique Users"])
-                await asyncio.sleep(30)
-
     @commands.group(autohelp=True)
     @commands.guild_only()
     @checks.is_owner()
@@ -78,24 +58,23 @@ class RndStatus(commands.Cog):
         Shows current list if empty."""
         saved_status = await self.config.statuses()
         if statuses == () or "" in statuses:
-            return await ctx.send("Current statuses: " + " | ".join(saved_status))
+            msg = (
+                f"Current statuses: {(' | ').join(saved_status)}\n"
+                f"To set new statuses, use the instructions in `{ctx.prefix}help rndstatus set`."
+            )
+            return await ctx.send(msg)
         await self.config.statuses.set(list(statuses))
-        await ctx.send(
+        await self.presence_updater()
-            "Done. Redo this command with no parameters to see the current list of statuses."
+        await ctx.send("Done. Redo this command with no parameters to see the current list of statuses.")
-        )
 
     @rndstatus.command(name="streamer")
     async def _streamer(self, ctx: commands.Context, *, streamer=None):
-        """Set the streamer needed for streaming statuses.
+        """Set the streamer name needed for streaming statuses."""
-        """
-
         saved_streamer = await self.config.streamer()
         if streamer is None:
-            return await ctx.send(f"Current Streamer: {saved_streamer}" )
+            return await ctx.send(f"Current Streamer: {saved_streamer}")
         await self.config.streamer.set(streamer)
-        await ctx.send(
+        await ctx.send("Done. Redo this command with no parameters to see the current streamer.")
-            "Done. Redo this command with no parameters to see the current streamer."
-        )
 
     @rndstatus.command()
     async def botstats(self, ctx, *statuses: str):
@@ -103,8 +82,7 @@ class RndStatus(commands.Cog):
         botstats = await self.config.botstats()
         await self.config.botstats.set(not botstats)
         await ctx.send(f"Botstats toggle: {not botstats}.")
-        if botstats is not False:
+        await self.presence_updater()
-            await self.bot.change_presence(activity=None)
 
     @rndstatus.command()
     async def delay(self, ctx, seconds: int):
@@ -115,77 +93,109 @@ class RndStatus(commands.Cog):
         await self.config.delay.set(seconds)
         await ctx.send(f"Interval set to {seconds} seconds.")
 
-    @rndstatus.command()
+    @rndstatus.command(name="type")
-    async def type(self, ctx, type: int):
+    async def _rndstatus_type(self, ctx, status_type: int):
-        """Define the rndstatus type.
+        """Define the rndstatus game type.
 
         Type list:
         0 = Playing
         1 = Streaming
         2 = Listening
-        3 = Watching"""
+        3 = Watching
-        if 0 <= type <= 3:
+        5 = Competing"""
-            await self.config.type.set(type)
+        if 0 <= status_type <= 3 or 0 != 5:
-            await ctx.send("Rndstatus type set.")
+            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("Type must be between 0 and 3.")
+            await ctx.send(
+                f"Status activity type must be between 0 and 3 or 5. "
+                f"See `{ctx.prefix}help rndstatus type` for more information."
+            )
+
+    @rndstatus.command()
+    async def status(self, ctx, status: int):
+        """Define the rndstatus presence status.
+
+        Status list:
+        0 = Online
+        1 = Idle
+        2 = DND
+        3 = Invisible"""
+        if 0 <= status <= 3:
+            rnd_status = {0: "online", 1: "idle", 2: "DND", 3: "invisible"}
+            await self.config.status.set(status)
+            await self.presence_updater()
+            await ctx.send(f"Rndstatus presence status set to {rnd_status[status]}.")
+        else:
+            await ctx.send(
+                f"Status presence type must be between 0 and 3. "
+                f"See `{ctx.prefix}help rndstatus status` for more information."
+            )
 
     async def maybe_update_presence(self):
-        await self.bot.wait_until_ready()
+        await self.bot.wait_until_red_ready()
-        pattern = re.compile(rf"<@!?{self.bot.user.id}>")
+        delay = await self.config.delay()
-        delay = 0
         while True:
             try:
-                cog_settings = await self.config.all()
+                await self.presence_updater()
-                guilds = self.bot.guilds
+            except Exception:
-                guild = next(g for g in guilds if not g.unavailable)
+                log.exception("Something went wrong in maybe_update_presence task:")
-                try:
-                    current_game = str(guild.me.activity.name)
-                except AttributeError:
-                    current_game = None
-                statuses = cog_settings["statuses"]
-                botstats = cog_settings["botstats"]
-                streamer = cog_settings["streamer"]
-                _type = cog_settings["type"]
-                delay = cog_settings["delay"]
 
-                url = f"https://www.twitch.tv/{streamer}"
-                prefix = await self.bot.get_valid_prefixes()
-
-                if botstats:
-                    me = self.bot.user
-                    clean_prefix = pattern.sub(f"@{me.name}", prefix[0])
-                    total_users = self._user_count
-                    servers = str(len(self.bot.guilds))
-                    botstatus = f"{clean_prefix}help | {total_users} users | {servers} servers"
-                    if (current_game != str(botstatus)) or current_game is None:
-                        if _type == 1:
-                            await self.bot.change_presence(
-                                activity=discord.Streaming(name=botstatus, url=url)
-                            )
-                        else:
-                            await self.bot.change_presence(
-                                activity=discord.Activity(name=botstatus, type=_type)
-                            )
-                else:
-                    if len(statuses) > 0:
-                        new_status = self.random_status(guild, statuses)
-                        if current_game != new_status:
-                            if (current_game != new_status) or current_game is None:
-                                if _type == 1:
-                                    await self.bot.change_presence(
-                                        activity=discord.Streaming(name=new_status, url=url)
-                                    )
-                                else:
-                                    await self.bot.change_presence(
-                                        activity=discord.Activity(name=new_status, type=_type)
-                                    )
-            except asyncio.CancelledError:
-                break
-            except Exception as e:
-                log.exception(e, exc_info=e)
             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
+        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:
+            current_game = None
+        statuses = cog_settings["statuses"]
+        botstats = cog_settings["botstats"]
+        streamer = cog_settings["streamer"]
+        _type = cog_settings["type"]
+        _status = cog_settings["status"]
+
+        url = f"https://www.twitch.tv/{streamer}"
+        prefix = await self.bot.get_valid_prefixes()
+
+        if _status == 0:
+            status = discord.Status.online
+        elif _status == 1:
+            status = discord.Status.idle
+        elif _status == 2:
+            status = discord.Status.dnd
+        elif _status == 3:
+            status = discord.Status.offline
+
+        if botstats:
+            me = self.bot.user
+            clean_prefix = pattern.sub(f"@{me.name}", prefix[0])
+            total_users = len(self.bot.users)
+            servers = str(len(self.bot.guilds))
+            botstatus = f"{clean_prefix}help | {total_users} users | {servers} servers"
+            if (current_game != str(botstatus)) or current_game is None:
+                if _type == 1:
+                    await self.bot.change_presence(activity=discord.Streaming(name=botstatus, url=url))
+                else:
+                    await self.bot.change_presence(activity=discord.Activity(name=botstatus, type=_type), status=status)
+        else:
+            if len(statuses) > 0:
+                new_status = self.random_status(guild, statuses)
+                if (current_game != new_status) or (current_game is None) or (len(statuses) == 1):
+                    if _type == 1:
+                        await self.bot.change_presence(activity=discord.Streaming(name=new_status, url=url))
+                    else:
+                        await self.bot.change_presence(
+                            activity=discord.Activity(name=new_status, type=_type), status=status
+                        )
 
     def random_status(self, guild, statuses):
         try:

rss/__init__.py

@@ -0,0 +1,11 @@
+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)
+    n.initialize()

rss/color.py

@@ -0,0 +1,131 @@
+from math import sqrt
+import discord
+import re
+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."""
+
+    async def _color_converter(self, hex_code_or_color_word: str):
+        """
+        Used for user input on rss embed color
+        Input:    discord.Color name, CSS3 color name, 0xFFFFFF, #FFFFFF, FFFFFF
+        Output:   0xFFFFFF
+        """
+        # #FFFFFF and FFFFFF to 0xFFFFFF
+        hex_match = re.match(r"#?[a-f0-9]{6}", hex_code_or_color_word.lower())
+        if hex_match:
+            hex_code = f"0x{hex_code_or_color_word.lstrip('#')}"
+            return hex_code
+
+        # discord.Color checking
+        if hasattr(discord.Color, hex_code_or_color_word):
+            hex_code = str(getattr(discord.Color, hex_code_or_color_word)())
+            hex_code = hex_code.replace("#", "0x")
+            return hex_code
+
+        # CSS3 color name checking
+        try:
+            hex_code = webcolors.name_to_hex(hex_code_or_color_word, spec="css3")
+            hex_code = hex_code.replace("#", "0x")
+            return hex_code
+        except ValueError:
+            pass
+
+        return None
+
+    async def _hex_to_css3_name(self, hex_code: str):
+        """
+        Input:  0xFFFFFF
+        Output: CSS3 color name string closest match
+        """
+        hex_code = await self._hex_validator(hex_code)
+        rgb_tuple = await self._hex_to_rgb(hex_code)
+
+        positions = list(_RGB_NAME_MAP.keys())
+        dist, nearest = _linear_nearest_neighbour(positions, rgb_tuple)
+
+        return _RGB_NAME_MAP[nearest]
+
+    async def _hex_to_rgb(self, hex_code: str):
+        """
+        Input:  0xFFFFFF
+        Output: (255, 255, 255)
+        """
+        return webcolors.hex_to_rgb(hex_code)
+
+    async def _hex_validator(self, hex_code: str):
+        """
+        Input:  0xFFFFFF
+        Output: #FFFFFF or None
+        """
+        if hex_code[:2] == "0x":
+            hex_code = hex_code.replace("0x", "#")
+        try:
+            # just a check to make sure it's a real color hex code
+            hex_code = webcolors.normalize_hex(hex_code)
+        except ValueError:
+            hex_code = None
+        return hex_code

rss/info.json

@@ -0,0 +1,10 @@
+{
+    "author": ["aikaterna"],
+    "install_msg": "Thanks for installing.",
+    "short": "Read RSS feeds.",
+    "description": "Read RSS feeds.",
+    "tags": ["rss"],
+    "permissions": ["embed_links"],
+    "requirements": ["bs4", "feedparser>=6.0.0", "webcolors==1.3"],
+    "end_user_data_statement": "This cog does not persistently store data or metadata about users."
+}

rss/quiet_template.py

@@ -0,0 +1,31 @@
+from collections import ChainMap
+from string import Template
+
+
+class QuietTemplate(Template):
+    """
+    A subclass of string.Template that is less verbose on a missing key
+    https://github.com/python/cpython/blob/919f0bc8c904d3aa13eedb2dd1fe9c6b0555a591/Lib/string.py#L123
+    """
+
+    def quiet_safe_substitute(self, mapping={}, /, **kws):
+        if mapping is {}:
+            mapping = kws
+        elif kws:
+            mapping = ChainMap(kws, mapping)
+        # Helper function for .sub()
+        def convert(mo):
+            named = mo.group('named') or mo.group('braced')
+            if named is not None:
+                try:
+                    return str(mapping[named])
+                except KeyError:
+                    # return None instead of the tag name so that
+                    # invalid tags are not present in the feed output
+                    return None
+            if mo.group('escaped') is not None:
+                return self.delimiter
+            if mo.group('invalid') is not None:
+                return mo.group()
+            raise ValueError('Unrecognized named group in pattern', self.pattern)
+        return self.pattern.sub(convert, self.template)

rss/rss_feed.py

@@ -0,0 +1,50 @@
+class RssFeed():
+    """RSS feed object"""
+
+    def __init__(self, **kwargs):
+        super().__init__()
+        self.name: str = kwargs.get("name", None)
+        self.last_title: str = kwargs.get("last_title", None)
+        self.last_link: str = kwargs.get("last_link", None)
+        self.last_time: str = kwargs.get("last_time", None)
+        self.template: str = kwargs.get("template", None)
+        self.url: str = kwargs.get("url", None)
+        self.template_tags: List[str] = kwargs.get("template_tags", [])
+        self.is_special: List[str] = kwargs.get("is_special", [])
+        self.embed: bool = kwargs.get("embed", True)
+        self.embed_color: str = kwargs.get("embed_color", None)
+        self.embed_image: str = kwargs.get("embed_image", None)
+        self.embed_thumbnail: str = kwargs.get("embed_thumbnail", None)
+
+    def to_json(self) -> dict:
+        return {
+            "name": self.name,
+            "last_title": self.last_title,
+            "last_link": self.last_link,
+            "last_time": self.last_time,
+            "template": self.template,
+            "url": self.url,
+            "template_tags": self.template_tags,
+            "is_special": self.is_special,
+            "embed": self.embed,
+            "embed_color": self.embed_color,
+            "embed_image": self.embed_image,
+            "embed_thumbnail": self.embed_thumbnail,
+        }
+
+    @classmethod
+    def from_json(cls, data: dict):
+        return cls(
+            name=data["name"] if data["name"] else None,
+            last_title=data["last_title"] if data["last_title"] else None,
+            last_link=data["last_link"] if data["last_link"] else None,
+            last_time=data["last_time"] if data["last_time"] else None,
+            template=data["template"] if data["template"] else None,
+            url=data["url"] if data["url"] else None,
+            template_tags=data["template_tags"] if data["template_tags"] else [],
+            is_special=data["is_special"] if data["is_special"] else [],
+            embed=data["embed"] if data["embed"] else True,
+            embed_color=data["embed_color"] if data["embed_color"] else None,
+            embed_image=data["embed_image"] if data["embed_image"] else None,
+            embed_thumbnail=data["embed_thumbnail"] if data["embed_thumbnail"] else None,
+        )

rss/tag_type.py

@@ -0,0 +1,13 @@
+from enum import Enum
+
+
+INTERNAL_TAGS = ["is_special", "template_tags", "embed", "embed_color", "embed_image", "embed_thumbnail"]
+
+VALID_IMAGES = ["png", "webp", "gif", "jpeg", "jpg"]
+
+
+class TagType(Enum):
+    PLAINTEXT = 1
+    HTML = 2
+    DICT = 3
+    LIST = 4

seen/__init__.py

@@ -1,5 +1,10 @@
 from .seen import Seen
 
+__red_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. "
+)
+
 
 async def setup(bot):
     cog = Seen(bot)