[YouTube] Gotta pass that context on

just keep on movin on

README.md

@@ -1,70 +1,45 @@
 # aikaterna-cogs
-v3 Cogs for Red-DiscordBot by Twentysix26.
+**v2 cogs support has ended. I will still provide bugfixes on these cogs if it is significant enough, but no new features will be added.**
 
-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.
+**Red v3 cogs can be found on the v3 branch of this repo. (https://github.com/aikaterna/aikaterna-cogs/tree/v3)**
 
-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.
+Cogs for v2 Red-DiscordBot by Twentysix26.
 
-blurplefy - Make an avatar or an image upload blurple for Discord's anniversaries.
 
-cah - Cards Against Humanity, played in DM's. This can rate limit large bots via the sheer number of messages sent. Install and use with caution on larger bots.
+autoeconomy - New users that join the server will be automatically given a bank account.
+
+away - By Paddolicious#8880. Set and unset a user as being "away".
+
+cah - Cards Against Humanity. A port of CorpBot's module: https://github.com/corpnewt/CorpBot.py
 
 chatchart - Generates a pie chart to display chat activity over the last 5000 messages. Requested by violetnyte.
 
-dadjokes - Another UltimatePancake cog. Get some dad jokes on command.
+forwarding - Forwards DMs sent to the bot to the owner of the bot. A port of the forwarding module from: https://github.com/jacobcheatley/dankbot
 
-dictonary - Define words and look up antonyms and synonyms. Originally by UltimatePancake.
+hunting - By Paddolicious#8880. It hunts birds... and things that fly.
 
-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.
+imgwelcome - Welcome users to your server with a customized image.
 
-hunting - A long overdue port of Paddo's v2 hunting game to v3.
+modclean - Clean the last 100 entries in the mod-log of Discord invite names.
 
-icyparser - Show icecast/shoutcast stream information. An audio addon cog to show the current stream info, or provide a url yourself.
+otherbot - Have multiple Red instances and want to know when one goes offline? Edit this cog and load it on your watcher bot.
 
-imgwelcome - Welcome users to your server(s) with an image. The repo can be found on my repo page here on github.
+post - Upload a saved audio playlist to the chat channel, or upload a cog. Owner only.
 
-inspirobot - Fetch "inspirational" messages from inspirobot.me with [p]inspireme.
+pug - Warcraft pug checker. A port of PugBot's module: https://github.com/reznok/PugBot
 
-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.
+radio - A hidden unpublished gem from Paddo, with a couple edits. Plays http audio streams like icecast and mp3 streams.
 
-luigipoker - Play the Luigi Poker minigame from New Super Mario Brothers. Ported from the v2 version written by themario30.
+riot - an old Fredboat command, requested by Mewleficent.
 
-noflippedtables - A v3 port of irdumb's v2 cog with a little extra surprise included. Unflip all the tables.
+seen - By Paddolicious#8880. Check when the user was last active on a server.
 
-nolinks - A very blunt hammer to remove anything that looks like a link. Roles can be whitelisted and it can watch multiple channels.
+serverlimit - Limit the bot to joining servers with over 25 members.
 
-otherbot - Alert a role when bot(s) go offline.
+wolfram - Paddolicious#8880's old wolfram cog.
 
-partycrash - A port of Will's partycrash command from the v2 Admin cog. This cog will not generate invites, but will show already-existing invites that the bot has access to view.
+youtube - Paddolicious#8880's old youtube cog, backported from my v3 version.
 
-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.
-
-retrosign - A v3 port of Anismash's retrosign cog.
-
-rndstatus - A v3 port of Twentysix's rndstatus cog with a couple extra settings.
-
-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.
-
-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.
-
-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.
+Feel free to join the server for these cogs if you'd like. https://discord.gg/th6eS3T

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

autoeconomy/autoeconomy.py

@@ -0,0 +1,161 @@
+import asyncio
+import discord
+import os
+from __main__ import send_cmd_help
+from cogs.utils import checks
+from cogs.utils.dataIO import dataIO
+from copy import deepcopy
+from discord.ext import commands
+
+default_settings = {"CHANNEL": None,
+                    "DEBUG": False,
+                    "TOGGLE": False,
+                    }
+
+
+class AutoEconomy:
+    """Auto-registers new users to the bank. Must have Economy loaded."""
+
+    def __init__(self, bot):
+        self.bot = bot
+        self.settings = dataIO.load_json('data/autoeconomy/settings.json')
+        self.version = "0.1.2"
+
+    async def save_settings(self):
+        dataIO.save_json('data/autoeconomy/settings.json', self.settings)
+
+    async def _data_check(self, ctx):
+        server = ctx.message.server
+        if server.id not in self.settings:
+            self.settings[server.id] = deepcopy(default_settings)
+            self.settings[server.id]["CHANNEL"] = ctx.message.channel.id
+            await self.save_settings()
+        econ_cog = self.bot.get_cog('Economy')
+        if not econ_cog:
+            await self.bot.say("You must have Economy loaded to use this cog. \nAny settings saved will not work until the cog is loaded.")
+            return
+
+    @checks.admin_or_permissions(manage_server=True)
+    @commands.group(pass_context=True)
+    async def autoeconomy(self, ctx):
+        """Configuration options for auto-registering Economy accounts."""
+        if ctx.invoked_subcommand is None:
+            await send_cmd_help(ctx)
+            return
+
+    @autoeconomy.command(pass_context=True, name="debug", no_pm=True)
+    async def autoeconomy_debug(self, ctx):
+        """Toggle autoeconomy debug messages."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        self.settings[server.id]["DEBUG"] = not self.settings[server.id]["DEBUG"]
+        if self.settings[server.id]["DEBUG"]:
+            await self.bot.say("Debug messages on.")
+        else:
+            await self.bot.say("Debug messages off.")
+        await self.save_settings()
+
+    @autoeconomy.command(pass_context=True, name="channel", no_pm=True)
+    async def autoeconomy_channel(self, ctx, channel: discord.Channel):
+        """Set a channel for the debug messages."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        if not server.me.permissions_in(channel).send_messages:
+            await self.bot.say("No permissions to speak in that channel.")
+            return
+        self.settings[server.id]["CHANNEL"] = channel.id
+        await self.save_settings()
+        await self.bot.send_message(channel, "This channel will be used for debug messages.")
+
+    @autoeconomy.command(pass_context=True, name="toggle", no_pm=True)
+    async def autoeconomy_toggle(self, ctx):
+        """Toggle autoeconomy on the server."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        self.settings[server.id]["TOGGLE"] = not self.settings[server.id]["TOGGLE"]
+        if self.settings[server.id]["TOGGLE"]:
+            await self.bot.say("New users will automatically be registered for a bank account.")
+        else:
+            await self.bot.say("No longer auto-registering new users.")
+        await self.save_settings()
+
+    @autoeconomy.command(name="version", pass_context=True, hidden=True)
+    async def autoeconomy_version(self):
+        """Displays the autoeconomy version."""
+        await self.bot.say("autoeconomy version {}.".format(self.version))
+
+    @autoeconomy.command(name="massregister", pass_context=True, no_pm=True)
+    async def massregister(self, ctx):
+        """Mass register existing users."""
+        econ_cog = self.bot.get_cog('Economy')
+        if not econ_cog:
+            return await self.bot.say("This requires economy to be loaded.")
+        server = ctx.message.server
+        if server.id not in econ_cog.bank.accounts:
+            return await self.bot.say(
+                "I can't register people for a bank that doesn't exist yet."
+            )
+
+        count = 0
+        for member in server.members:
+            init_balance = econ_cog.settings[server.id].get("REGISTER_CREDITS", 0)
+            try:
+                econ_cog.bank.create_account(member, initial_balance=init_balance)
+            except Exception:
+                continue
+            else:
+                count += 1
+
+        await self.bot.say(
+            "I've opened up new economy entries for "
+            "{}/{} members.".format(count, len(server.members))
+        )
+
+    async def on_member_join(self, member, mass_register=False):
+        server = member.server
+
+        if server.id not in self.settings:
+            self.settings[server.id] = deepcopy(default_settings)
+            await self.save_settings()
+        if not (self.settings[server.id]["TOGGLE"] or mass_register):
+            return
+
+        channel = self.settings[server.id]["CHANNEL"]
+        channel_object = self.bot.get_channel(channel)
+        econ_cog = self.bot.get_cog('Economy')
+
+        if server.id not in econ_cog.bank.accounts:
+            return
+        if not econ_cog:
+            return
+
+        bank = self.bot.get_cog('Economy').bank
+        init_balance = econ_cog.settings[server.id].get("REGISTER_CREDITS", 0)
+
+        try:
+            bank.create_account(member, initial_balance=init_balance)
+        except Exception:
+            if self.settings[server.id]["DEBUG"] and not mass_register:
+                await self.bot.send_message(channel_object, "Economy account already exists for {}.".format(member.name))
+            return False
+        else:
+            if self.settings[server.id]["DEBUG"] and not mass_register:
+                await self.bot.send_message(channel_object, "Bank account opened for {} and initial credits given.".format(member.name))
+            return True
+
+
+def check_folders():
+    if not os.path.exists('data/autoeconomy/'):
+        os.mkdir('data/autoeconomy/')
+
+
+def check_files():
+    if not dataIO.is_valid_json('data/autoeconomy/settings.json'):
+        defaults = {}
+        dataIO.save_json('data/autoeconomy/settings.json', defaults)
+
+
+def setup(bot):
+    check_folders()
+    check_files()
+    bot.add_cog(AutoEconomy(bot))

autoeconomy/info.json

@@ -0,0 +1,8 @@
+{
+    "AUTHOR" : "aikaterna",
+    "INSTALL_MSG" : "Use [p]autoeconomy to change settings.",
+    "NAME" : "autoeconomy",
+    "SHORT" : "Autoregister new users to the bot bank on server join.",
+    "DESCRIPTION" : "Auto-registers new users to the bot bank on server join. You must have the Economy cog loaded for this cog to work.",
+    "TAGS": ["bank", "economy", "register"]
+}

away/__init__.py

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

away/away.py

@@ -1,627 +1,88 @@
+import os
 import discord
-from redbot.core import Config, commands, checks
-from typing import Optional
-import datetime
-import re
-
-IMAGE_LINKS = re.compile(r"(http[s]?:\/\/[^\"\']*\.(?:png|jpg|jpeg|gif|png))")
+from .utils import checks
+from discord.ext import commands
+from cogs.utils.dataIO import dataIO
 
 
-class Away(commands.Cog):
+class Away:
     """Le away cog"""
-
-    default_global_settings = {"ign_servers": []}
-    default_guild_settings = {"TEXT_ONLY": False}
-    default_user_settings = {
-        "MESSAGE": False,
-        "IDLE_MESSAGE": False,
-        "DND_MESSAGE": False,
-        "OFFLINE_MESSAGE": False,
-        "GAME_MESSAGE": {},
-        "STREAMING_MESSAGE": False,
-        "LISTENING_MESSAGE": False,
-    }
-
     def __init__(self, bot):
         self.bot = bot
-        self._away = Config.get_conf(self, 8423491260, force_registration=True)
-        self._away.register_global(**self.default_global_settings)
-        self._away.register_guild(**self.default_guild_settings)
-        self._away.register_user(**self.default_user_settings)
+        self.data = dataIO.load_json('data/away/away.json')
 
-    def _draw_play(self, song):
-        song_start_time = song.start
-        total_time = song.duration
-        current_time = datetime.datetime.utcnow()
-        elapsed_time = current_time - song_start_time
-        sections = 12
-        loc_time = round((elapsed_time / total_time) * sections)  # 10 sections
-
-        bar_char = "\N{BOX DRAWINGS HEAVY HORIZONTAL}"
-        seek_char = "\N{RADIO BUTTON}"
-        play_char = "\N{BLACK RIGHT-POINTING TRIANGLE}"
-        msg = "\n" + play_char + " "
-
-        for i in range(sections):
-            if i == loc_time:
-                msg += seek_char
-            else:
-                msg += bar_char
-
-        msg += " `{:.7}`/`{:.7}`".format(str(elapsed_time), str(total_time))
-        return msg
-
-    async def make_embed_message(self, author, message, state=None):
-        """
-            Makes the embed reply
-        """
-        avatar = author.avatar_url_as()  # This will return default avatar if no avatar is present
-        color = author.color
-        if message:
-            link = IMAGE_LINKS.search(message)
-            if link:
-                message = message.replace(link.group(0), " ")
-        if state == "away":
-            em = discord.Embed(description=message, color=color)
-            em.set_author(name=f"{author.display_name} is currently away", icon_url=avatar)
-        elif state == "idle":
-            em = discord.Embed(description=message, color=color)
-            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(
-                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}",
-                icon_url=avatar,
-            )
-            em.title = getattr(author.activity, "details", None)
-            thumbnail = getattr(author.activity, "large_image_url", None)
-            if thumbnail:
-                em.set_thumbnail(url=thumbnail)
-        elif state == "gamingcustom":
-            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}",
-                icon_url=avatar,
-            )
-            em.title = getattr(status[0], "details", None)
-            thumbnail = getattr(status[0], "large_image_url", None)
-            if thumbnail:
-                em.set_thumbnail(url=thumbnail)
-        elif state == "listening":
-            em = discord.Embed(color=author.activity.color)
-            url = f"https://open.spotify.com/track/{author.activity.track_id}"
-            artist_title = f"{author.activity.title} by " + ", ".join(
-                a for a in author.activity.artists
-            )
-            limit = 256 - (
-                len(author.display_name) + 27
-            )  # incase we go over the max allowable size
-            em.set_author(
-                name=f"{author.display_name} is currently listening to",
-                icon_url=avatar,
-                url=url,
-            )
-            em.description = (
-                f"{message}\n "
-                f"[{artist_title}]({url})\n"
-                f"{self._draw_play(author.activity)}"
-            )
-
-            em.set_thumbnail(url=author.activity.album_cover_url)
-        elif state == "listeningcustom":
-            activity = [c for c in author.activities if c.type == discord.ActivityType.listening]
-            em = discord.Embed(color=activity[0].color)
-            url = f"https://open.spotify.com/track/{activity[0].track_id}"
-            artist_title = f"{activity[0].title} by " + ", ".join(a for a in activity[0].artists)
-            limit = 256 - (len(author.display_name) + 27)
-            em.set_author(
-                name=f"{author.display_name} is currently listening to",
-                icon_url=avatar,
-                url=url
-            )
-            em.description = (
-                f"{message}\n "
-                f"[{artist_title}]({url})\n"
-                f"{self._draw_play(activity[0])}"
-            )
-            em.set_thumbnail(url=activity[0].album_cover_url)
-        elif state == "streaming":
-            color = int("6441A4", 16)
-            em = discord.Embed(color=color)
-            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}",
-                icon_url=avatar,
-            )
-        elif state == "streamingcustom":
-            activity = [c for c in author.activities if c.type == discord.ActivityType.streaming]
-            color = int("6441A4", 16)
-            em = discord.Embed(color=color)
-            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}",
-                icon_url=avatar,
-            )
-        else:
-            em = discord.Embed(color=color)
-            em.set_author(name="{} is currently away".format(author.display_name), icon_url=avatar)
-        if link and state not in ["listening", "listeningcustom", "gaming"]:
-            em.set_image(url=link.group(0))
-        return em
-
-    async def find_user_mention(self, message):
-        """
-            Replaces user mentions with their username
-        """
-        for word in message.split():
-            match = re.search(r"<@!?([0-9]+)>", word)
-            if match:
-                user = await self.bot.fetch_user(int(match.group(1)))
-                message = re.sub(match.re, "@" + user.name, message)
-        return message
-
-    async def make_text_message(self, author, message, state=None):
-        """
-            Makes the message to display if embeds aren't available
-        """
-        message = await self.find_user_mention(message)
-
-        if state == "away":
-            msg = f"{author.display_name} is currently away"
-        elif state == "idle":
-            msg = f"{author.display_name} is currently idle"
-        elif state == "dnd":
-            msg = f"{author.display_name} is currently do not disturb"
-        elif state == "offline":
-            msg = f"{author.display_name} is currently offline"
-        elif state == "gaming":
-            msg = f"{author.display_name} is currently playing {author.activity.name}"
-        elif state == "gamingcustom":
-            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(
-                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":
-            status = [c for c in author.activities if c.type == discord.ActivityType.listening]
-            artist_title = f"{status[0].title} by " + ", ".join(a for a in status[0].artists)
-            currently_playing = self._draw_play(status[0])
-            msg = f"{author.display_name} is currently listening to {artist_title}\n{currently_playing}"
-        elif state == "streaming":
-            msg = f"{author.display_name} is currently streaming at {author.activity.url}"
-        elif state == "streamingcustom":
-            status = [c for c in author.activities if c.type == discord.ActivityType.streaming]
-            msg = f"{author.display_name} is currently streaming at {status[0].url}"
-        else:
-            msg = f"{author.display_name} is currently away"
-
-        if message != " " and state != "listeningcustom":
-            msg += f" and has set the following message: `{message}`"
-        elif message != " " and state == "listeningcustom":
-            msg += f"\n\nCustom message: `{message}`"
-
-        return msg
-
-    async def is_mod_or_admin(self, member: discord.Member):
-        guild = member.guild
-        if member == guild.owner:
-            return True
-        if await self.bot.is_owner(member):
-            return True
-        if await self.bot.is_admin(member):
-            return True
-        if await self.bot.is_mod(member):
-            return True
-        return False
-
-    @commands.Cog.listener()
-    async def on_message(self, message):
+    async def listener(self, message):
         tmp = {}
-        guild = message.guild
-        list_of_guilds_ign = await self._away.ign_servers()
-        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
+        server = message.server
+        if server.id not in self.data:
+            for mention in message.mentions:
+                tmp[mention] = True
+            if message.author.id != self.bot.user.id:
+                for author in tmp:
+                    if author.id in self.data:
+                        try:
+                            avatar = author.avatar_url if author.avatar else author.default_avatar_url
+                            if self.data[author.id]['MESSAGE']:
+                                em = discord.Embed(description=self.data[author.id]['MESSAGE'], color=discord.Color.blue())
+                                em.set_author(name='{} is currently away'.format(author.display_name), icon_url=avatar)
+                            else:
+                                em = discord.Embed(color=discord.Color.blue())
+                                em.set_author(name='{} is currently away'.format(author.display_name), icon_url=avatar)
+                            await self.bot.send_message(message.channel, embed=em)
+                        except:
+                            if self.data[author.id]['MESSAGE']:
+                                msg = '{} is currently away and has set the following message: `{}`'.format(author.display_name, self.data[author.id]['MESSAGE'])
+                            else:
+                                msg = '{} is currently away'.format(author.display_name)
+                            await self.bot.send_message(message.channel, msg)
 
-        for author in message.mentions:
-            if guild.id in list_of_guilds_ign and not await self.is_mod_or_admin(author):
-                continue
-            user_data = await self._away.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"]
-            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:
-                    em = await self.make_embed_message(author, away_msg, "away")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                elif (embed_links and text_only) or not embed_links:
-                    msg = await self.make_text_message(author, away_msg, "away")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            idle_msg = user_data["IDLE_MESSAGE"]
-            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:
-                    em = await self.make_embed_message(author, idle_msg, "idle")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                elif (embed_links and text_only) or not embed_links:
-                    msg = await self.make_text_message(author, idle_msg, "idle")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            dnd_msg = user_data["DND_MESSAGE"]
-            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:
-                    em = await self.make_embed_message(author, dnd_msg, "dnd")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                elif (embed_links and text_only) or not embed_links:
-                    msg = await self.make_text_message(author, dnd_msg, "dnd")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            offline_msg = user_data["OFFLINE_MESSAGE"]
-            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:
-                    em = await self.make_embed_message(author, offline_msg, "offline")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                elif (embed_links and text_only) or not embed_links:
-                    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"]
-            if streaming_msg and type(author.activity) is discord.Streaming:
-                streaming_msg, delete_after = streaming_msg
-                if embed_links and not text_only:
-                    em = await self.make_embed_message(author, streaming_msg, "streaming")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                elif (embed_links and text_only) or not embed_links:
-                    msg = await self.make_text_message(author, streaming_msg, "streaming")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            if streaming_msg and type(author.activity) is discord.CustomActivity:
-                stream_status = [
-                    c for c in author.activities if c.type == discord.ActivityType.streaming
-                ]
-                if not stream_status:
-                    continue
-                streaming_msg, delete_after = streaming_msg
-                if embed_links and not text_only:
-                    em = await self.make_embed_message(author, streaming_msg, "streamingcustom")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                elif (embed_links and text_only) or not embed_links:
-                    msg = await self.make_text_message(author, streaming_msg, "streamingcustom")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            listening_msg = user_data["LISTENING_MESSAGE"]
-            if listening_msg and type(author.activity) is discord.Spotify:
-                listening_msg, delete_after = listening_msg
-                if embed_links and not text_only:
-                    em = await self.make_embed_message(author, listening_msg, "listening")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                elif (embed_links and text_only) or not embed_links:
-                    msg = await self.make_text_message(author, listening_msg, "listening")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            if listening_msg and type(author.activity) is discord.CustomActivity:
-                listening_status = [
-                    c for c in author.activities if c.type == discord.ActivityType.listening
-                ]
-                if not listening_status:
-                    continue
-                listening_msg, delete_after = listening_msg
-                if embed_links and not text_only:
-                    em = await self.make_embed_message(author, listening_msg, "listeningcustom")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                elif (embed_links and text_only) or not embed_links:
-                    msg = await self.make_text_message(author, listening_msg, "listeningcustom")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            gaming_msgs = user_data["GAME_MESSAGE"]
-            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:
-                            em = await self.make_embed_message(author, game_msg, "gaming")
-                            await message.channel.send(embed=em, delete_after=delete_after)
-                            break  # Let's not accidentally post more than one
-                        elif (embed_links and text_only) or not embed_links:
-                            msg = await self.make_text_message(author, game_msg, "gaming")
-                            await message.channel.send(msg, delete_after=delete_after)
-                            break
-            if gaming_msgs and type(author.activity) is discord.CustomActivity:
-                game_status = [
-                    c for c in author.activities if c.type == discord.ActivityType.playing
-                ]
-                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:
-                            em = await self.make_embed_message(author, game_msg, "gamingcustom")
-                            await message.channel.send(embed=em, delete_after=delete_after)
-                            break  # Let's not accidentally post more than one
-                        elif (embed_links and text_only) or not embed_links:
-                            msg = await self.make_text_message(author, game_msg, "gamingcustom")
-                            await message.channel.send(msg, delete_after=delete_after)
-                            break
-
-    @commands.command(name="away")
-    async def away_(self, ctx, delete_after: Optional[int] = None, *, message: str = None):
-        """
-        Tell the bot you're away or back.
-
-        `delete_after` Optional seconds to delete the automatic reply
-        `message` The custom message to display when you're mentioned
-        """
-        author = ctx.message.author
-        mess = await self._away.user(author).MESSAGE()
-        if mess:
-            await self._away.user(author).MESSAGE.set(False)
-            msg = "You're now back."
+    @commands.command(pass_context=True, name="away")
+    async def _away(self, context, *message: str):
+        """Tell the bot you're away or back."""
+        author = context.message.author
+        if author.id in self.data:
+            del self.data[author.id]
+            msg = 'You\'re now back.'
         else:
-            if message is None:
-                await self._away.user(author).MESSAGE.set((" ", delete_after))
+            self.data[context.message.author.id] = {}
+            if len(str(message)) < 256:
+                self.data[context.message.author.id]['MESSAGE'] = ' '.join(context.message.clean_content.split()[1:])
             else:
-                await self._away.user(author).MESSAGE.set((message, delete_after))
-            msg = "You're now set as away."
-        await ctx.send(msg)
+                self.data[context.message.author.id]['MESSAGE'] = True
+            msg = 'You\'re now set as away.'
+        dataIO.save_json('data/away/away.json', self.data)
+        await self.bot.say(msg)
 
-    @commands.command(name="idle")
-    async def idle_(self, ctx, delete_after: Optional[int] = None, *, message: str = None):
-        """
-        Set an automatic reply when you're idle.
-
-        `delete_after` Optional seconds to delete the automatic reply
-        `message` The custom message to display when you're mentioned
-        """
-        author = ctx.message.author
-        mess = await self._away.user(author).IDLE_MESSAGE()
-        if mess:
-            await self._away.user(author).IDLE_MESSAGE.set(False)
-            msg = "The bot will no longer reply for you when you're idle."
+    @commands.command(pass_context=True, name="toggleaway")
+    @checks.mod_or_permissions(administrator=True)
+    async def _ignore(self, context):
+        server = context.message.server
+        if server.id in self.data:
+            del self.data[server.id]
+            message = 'Not ignoring this server anymore.'
         else:
-            if message is None:
-                await self._away.user(author).IDLE_MESSAGE.set((" ", delete_after))
-            else:
-                await self._away.user(author).IDLE_MESSAGE.set((message, delete_after))
-            msg = "The bot will now reply for you when you're idle."
-        await ctx.send(msg)
+            self.data[server.id] = True
+            message = 'Ignoring this server.'
+        dataIO.save_json('data/away/away.json', self.data)
+        await self.bot.say(message)
 
-    @commands.command(name="offline")
-    async def offline_(self, ctx, delete_after: Optional[int] = None, *, message: str = None):
-        """
-        Set an automatic reply when you're offline.
 
-        `delete_after` Optional seconds to delete the automatic reply
-        `message` The custom message to display when you're mentioned
-        """
-        author = ctx.message.author
-        mess = await self._away.user(author).OFFLINE_MESSAGE()
-        if mess:
-            await self._away.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))
-            else:
-                await self._away.user(author).OFFLINE_MESSAGE.set((message, delete_after))
-            msg = "The bot will now reply for you when you're offline."
-        await ctx.send(msg)
+def check_folder():
+    if not os.path.exists('data/away'):
+        print('Creating data/away folder...')
+        os.makedirs('data/away')
 
-    @commands.command(name="dnd", aliases=["donotdisturb"])
-    async def donotdisturb_(self, ctx, delete_after: Optional[int] = None, *, message: str = None):
-        """
-        Set an automatic reply when you're dnd.
 
-        `delete_after` Optional seconds to delete the automatic reply
-        `message` The custom message to display when you're mentioned
-        """
-        author = ctx.message.author
-        mess = await self._away.user(author).DND_MESSAGE()
-        if mess:
-            await self._away.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))
-            else:
-                await self._away.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)
+def check_file():
+    f = 'data/away/away.json'
+    if not dataIO.is_valid_json(f):
+        dataIO.save_json(f, {})
+        print('Creating default away.json...')
 
-    @commands.command(name="streaming")
-    async def streaming_(self, ctx, delete_after: Optional[int] = None, *, message: str = None):
-        """
-        Set an automatic reply when you're streaming.
 
-        `delete_after` Optional seconds to delete the automatic reply
-        `message` The custom message to display when you're mentioned
-        """
-        author = ctx.message.author
-        mess = await self._away.user(author).STREAMING_MESSAGE()
-        if mess:
-            await self._away.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))
-            else:
-                await self._away.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)
-
-    @commands.command(name="listening")
-    async def listening_(self, ctx, delete_after: Optional[int] = None, *, message: str = " "):
-        """
-        Set an automatic reply when you're listening to Spotify.
-
-        `delete_after` Optional seconds to delete the automatic reply
-        `message` The custom message to display when you're mentioned
-        """
-        author = ctx.message.author
-        mess = await self._away.user(author).LISTENING_MESSAGE()
-        if mess:
-            await self._away.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))
-            msg = (
-                "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_(
-        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
-        `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.
-        """
-        author = ctx.message.author
-        mess = await self._away.user(author).GAME_MESSAGE()
-        if game.lower() in mess:
-            del mess[game.lower()]
-            await self._away.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)
-            msg = f"The bot will now reply for you when you're playing {game}."
-        await ctx.send(msg)
-
-    @commands.command(name="toggleaway")
-    @checks.admin_or_permissions(administrator=True)
-    async def _ignore(self, ctx):
-        """
-        Toggle away messages on the whole server.
-
-        Mods, Admins and Bot Owner are immune to this.
-        """
-        guild = ctx.message.guild
-        if guild.id in (await self._away.ign_servers()):
-            guilds = await self._away.ign_servers()
-            guilds.remove(guild.id)
-            await self._away.ign_servers.set(guilds)
-            message = "Not ignoring this guild anymore."
-        else:
-            guilds = await self._away.ign_servers()
-            guilds.append(guild.id)
-            await self._away.ign_servers.set(guilds)
-            message = "Ignoring this guild."
-        await ctx.send(message)
-
-    @commands.command()
-    @checks.admin_or_permissions(administrator=True)
-    async def awaytextonly(self, ctx):
-        """
-        Toggle forcing the guild's away messages to be text only.
-
-        This overrides the embed_links check this cog uses for message sending.
-        """
-        text_only = await self._away.guild(ctx.guild).TEXT_ONLY()
-        if text_only:
-            message = "Away messages will now be embedded or text only based on the bot's permissions for embed links."
-        else:
-            message = "Away messages are now forced to be text only, regardless of the bot's permissions for embed links."
-        await self._away.guild(ctx.guild).TEXT_ONLY.set(not text_only)
-        await ctx.send(message)
-
-    @commands.command(name="awaysettings", aliases=["awayset"])
-    async def away_settings(self, ctx):
-        """View your current away settings"""
-        author = ctx.author
-        msg = ""
-        data = {
-            "MESSAGE": "Away",
-            "IDLE_MESSAGE": "Idle",
-            "DND_MESSAGE": "Do not disturb",
-            "OFFLINE_MESSAGE": "Offline",
-            "LISTENING_MESSAGE": "Listening",
-            "STREAMING_MESSAGE": "Streaming",
-        }
-        settings = await self._away.user(author).get_raw()
-        for attr, name in data.items():
-            if type(settings[attr]) in [tuple, list]:
-                # This is just to keep backwards compatibility
-                status_msg, delete_after = settings[attr]
-            else:
-                status_msg = settings[attr]
-                delete_after = None
-            if settings[attr] and len(status_msg) > 20:
-                status_msg = status_msg[:20] + "..."
-            if settings[attr] and len(status_msg) <= 1:
-                status_msg = "True"
-            if delete_after:
-                msg += f"{name}: {status_msg} deleted after {delete_after}s\n"
-            else:
-                msg += f"{name}: {status_msg}\n"
-        if "GAME_MESSAGE" in settings:
-            if not settings["GAME_MESSAGE"]:
-                games = "False"
-            else:
-                games = "True"
-            msg += f"Games: {games}\n"
-            for game in settings["GAME_MESSAGE"]:
-                status_msg, delete_after = settings["GAME_MESSAGE"][game]
-                if len(status_msg) > 20:
-                    status_msg = status_msg[:-20] + "..."
-                if len(status_msg) <= 1:
-                    status_msg = "True"
-                if delete_after:
-                    msg += f"{game}: {status_msg} deleted after {delete_after}s\n"
-                else:
-                    msg += f"{game}: {status_msg}\n"
-
-        if ctx.channel.permissions_for(ctx.me).embed_links:
-            em = discord.Embed(description=msg[:2048], color=author.color)
-            em.set_author(
-                name=f"{author.display_name}'s away settings", icon_url=author.avatar_url
-            )
-            await ctx.send(embed=em)
-        else:
-            await ctx.send(f"{author.display_name} away settings\n" + msg)
+def setup(bot):
+    check_folder()
+    check_file()
+    n = Away(bot)
+    bot.add_listener(n.listener, 'on_message')
+    bot.add_cog(n)

away/info.json

@@ -1,12 +1,7 @@
 {
-	"author": [
-		"aikaterna",
-        "Axas"
-	],
-	"description": "Set and unset a user as being away. Originally by Paddo.",
-	"short": "Away message toggle for users",
-	"tags": [
-		"away"
-	],
-	"type": "COG"
-}
+    "AUTHOR" : "Paddolicious#8880",
+    "NAME" : "Away",
+    "SHORT" : "Sets and unsets a user away.",
+    "DESCRIPTION" : "Sets the user as away. When someone mentions the users the bot replies with either its own message or a message set by the user that the user is away.",
+    "TAGS": ["away", "member", "tool"]
+}

blurplefy/__init__.py

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

blurplefy/blurplefy.py

@@ -1,439 +0,0 @@
-#  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
-import math
-from resizeimage import resizeimage
-from redbot.core import Config, commands, checks
-
-blurple = (114, 137, 218)
-blurplehex = 0x7289da
-darkblurple = (78, 93, 148)
-white = (255, 255, 255)
-
-
-class Blurplefy(commands.Cog):
-    def __init__(self, bot):
-        """Blurplefy images and check content of images."""
-        self.bot = bot
-        self.config = Config.get_conf(self, 2778931480, force_registration=True)
-
-        default_guild = {"role_enabled": False, "blurple_role": None}
-
-        self.config.register_guild(**default_guild)
-        self.session = aiohttp.ClientSession()
-
-    @commands.guild_only()
-    @commands.command()
-    @checks.admin_or_permissions(manage_roles=True)
-    async def blurplerole(self, ctx):
-        """Toggle a role award for having a blurple profile picture."""
-        blurple_role_id = await self.config.guild(ctx.guild).blurple_role()
-        if blurple_role_id is None:
-            await ctx.send(
-                "Enter the role name to award: it needs to be a valid, already existing role."
-            )
-
-            def check(m):
-                return m.author == ctx.author
-
-            try:
-                blurple_role = await ctx.bot.wait_for("message", timeout=15.0, check=check)
-                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.")
-                return await ctx.invoke(self.blurpleroleset, role_name=blurple_role_obj)
-            except asyncio.TimeoutError:
-                return await ctx.send("No role entered, try again later.")
-
-        role_enabled = await self.config.guild(ctx.guild).role_enabled()
-        await self.config.guild(ctx.guild).role_enabled.set(not role_enabled)
-
-        if not role_enabled:
-            word = "enabled"
-        else:
-            word = "disabled"
-        await ctx.send("Blurple role awarding {}.".format(word))
-
-    @commands.guild_only()
-    @commands.command()
-    @checks.admin_or_permissions(manage_roles=True)
-    async def blurpleroleset(self, ctx, *, role_name: discord.Role):
-        """Sets the role to award if blurplerole is on."""
-        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))
-        blurple_role_enabled = await self.config.guild(ctx.guild).role_enabled()
-        if not blurple_role_enabled:
-            await ctx.invoke(self.blurplerole)
-
-    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
-        else:
-            if not user:
-                if len(link) != 0:
-                    for image in link:
-                        picture = image.url
-            else:
-                picture = user.avatar_url
-        try:
-            async with self.session.request("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))
-            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."""
-        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
-            role_check = True
-        elif not user:
-            if len(link) != 0:
-                for image in link:
-                    picture = image.url
-                    role_check = False
-        else:
-            picture = user.avatar_url
-            role_check = False
-
-        try:
-            async with self.session.request("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))
-            return
-        try:
-            im = Image.open(BytesIO(response))
-        except Exception:
-            await ctx.send("{}, please link a valid image URL.".format(ctx.author.display_name))
-            return
-
-        im = im.convert("RGBA")
-        imsize = list(im.size)
-        impixels = imsize[0] * imsize[1]
-        # 1250x1250 = 1562500
-        maxpixelcount = 1562500
-
-        if impixels > maxpixelcount:
-            downsizefraction = math.sqrt(maxpixelcount / impixels)
-            im = resizeimage.resize_width(im, (imsize[0] * downsizefraction))
-            imsize = list(im.size)
-            impixels = imsize[0] * imsize[1]
-            await ctx.send(
-                "{}, image resized smaller for easier processing.".format(
-                    ctx.message.author.display_name
-                )
-            )
-
-        image = self.blurple_imager(im, imsize)
-        image = discord.File(fp=image, filename="image.png")
-
-        blurplenesspercentage = round(((nooftotalpixels / noofpixels) * 100), 2)
-        percentblurple = round(((noofblurplepixels / noofpixels) * 100), 2)
-        percentdblurple = round(((noofdarkblurplepixels / noofpixels) * 100), 2)
-        percentwhite = round(((noofwhitepixels / noofpixels) * 100), 2)
-
-        embed = discord.Embed(title="", colour=0x7289DA)
-        embed.add_field(
-            name="Total amount of Blurple", value="{}%".format(blurplenesspercentage), inline=False
-        )
-        embed.add_field(
-            name="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(
-                ctx.author
-            )
-        )
-        embed.set_image(url="attachment://image.png")
-        embed.set_thumbnail(url=picture)
-        await ctx.send(embed=embed, file=image)
-
-        blurple_role_enabled = await self.config.guild(ctx.guild).role_enabled()
-        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 (
-                blurplenesspercentage > 75
-                and picture == ctx.author.avatar_url
-                and blurple_role_obj not in ctx.author.roles
-                and percentblurple > 5
-            ):
-                await ctx.send(
-                    "{}, as your profile pic has enough blurple (over 75% in total and over 5% blurple), you have recieved the role **{}**!".format(
-                        ctx.message.author.display_name, blurple_role_obj.name
-                    )
-                )
-                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(
-                    "{}, your profile pic does not have enough blurple (over 75% in total and over 5% blurple), therefore you are not eligible for the role {}.".format(
-                        ctx.message.author.display_name, blurple_role_obj.name
-                    )
-                )
-
-    @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."""
-        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
-        else:
-            if not user:
-                if len(link) != 0:
-                    for image in link:
-                        picture = image.url
-            else:
-                picture = user.avatar_url
-        try:
-            async with self.session.request("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))
-            return
-        try:
-            im = Image.open(BytesIO(response))
-        except Exception:
-            await ctx.send("{}, please link a valid image URL.".format(ctx.author.display_name))
-            return
-
-        imsize = list(im.size)
-        impixels = imsize[0] * imsize[1]
-        # 1250x1250 = 1562500
-        maxpixelcount = 1562500
-
-        try:
-            i = im.info["version"]
-            isgif = True
-            gifloop = int(im.info["loop"])
-        except Exception:
-            isgif = False
-
-        await ctx.send(
-            "{}, 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(
-                "{}, image resized smaller for easier processing".format(
-                    ctx.message.author.display_name
-                )
-            )
-
-        if isgif is False:
-            image = self.imager(im, imsize)
-        else:
-            image = self.gifimager(im, gifloop, imsize)
-        await ctx.send("{}, image data extracted.".format(ctx.author.display_name))
-        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.set_author(name="Blurplefier - makes your image blurple!")
-            if isgif is False:
-                embed.set_image(url="attachment://image.png")
-            else:
-                embed.set_image(url="attachment://image.gif")
-            embed.set_footer(
-                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)
-        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):
-        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
-            for y in range(imsize[1]):
-                pixel = img[x, y]
-                check = 1
-                checkblurple = 1
-                checkwhite = 1
-                checkdarkblurple = 1
-                for i in range(3):
-                    if not (blurple[i] + colourbuffer > pixel[i] > blurple[i] - colourbuffer):
-                        checkblurple = 0
-                    if not (
-                        darkblurple[i] + colourbuffer > pixel[i] > darkblurple[i] - colourbuffer
-                    ):
-                        checkdarkblurple = 0
-                    if not (white[i] + colourbuffer > pixel[i] > white[i] - colourbuffer):
-                        checkwhite = 0
-                    if checkblurple == 0 and checkdarkblurple == 0 and checkwhite == 0:
-                        check = 0
-                if check == 0:
-                    img[x, y] = (0, 0, 0, 255)
-                if check == 1:
-                    nooftotalpixels += 1
-                if checkblurple == 1:
-                    noofblurplepixels += 1
-                if checkdarkblurple == 1:
-                    noofdarkblurplepixels += 1
-                if checkwhite == 1:
-                    noofwhitepixels += 1
-                noofpixels += 1
-
-        image_file_object = io.BytesIO()
-        im.save(image_file_object, format="png")
-        image_file_object.seek(0)
-        return image_file_object
-
-    @staticmethod
-    def imager(im, imsize):
-        im = im.convert(mode="L")
-        im = ImageEnhance.Contrast(im).enhance(1000)
-        im = im.convert(mode="RGB")
-
-        img = im.load()
-
-        for x in range(imsize[0] - 1):
-            i = 1
-            for y in range(imsize[1] - 1):
-                pixel = img[x, y]
-
-                if pixel != (255, 255, 255):
-                    img[x, y] = (114, 137, 218)
-
-        image_file_object = io.BytesIO()
-        im.save(image_file_object, format="png")
-        image_file_object.seek(0)
-        return image_file_object
-
-    @staticmethod
-    def gifimager(im, gifloop, imsize):
-        frames = [frame.copy() for frame in ImageSequence.Iterator(im)]
-        newgif = []
-
-        for frame in frames:
-            frame = frame.convert(mode="L")
-            frame = ImageEnhance.Contrast(frame).enhance(1000)
-            frame = frame.convert(mode="RGB")
-            img = frame.load()
-
-            for x in range(imsize[0]):
-                i = 1
-                for y in range(imsize[1]):
-                    pixel = img[x, y]
-                    if pixel != (255, 255, 255):
-                        img[x, y] = (114, 137, 218)
-            newgif.append(frame)
-
-        image_file_object = io.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)
-        return image_file_object
-
-    @commands.command()
-    async def countdown(self, ctx):
-        """Countdown to Discord's 6th Anniversary."""
-        embed = discord.Embed(name="", colour=0x7289da)
-        timeleft = (
-            datetime.datetime(2020, 5, 13)
-            + datetime.timedelta(hours=7)
-            - datetime.datetime.utcnow()
-        )
-        embed.set_author(name="Time left until Discord's 6th Anniversary")
-        if int(timeleft.total_seconds()) < 0:
-            timeleft = (
-                datetime.datetime(2021, 5, 13)
-                + datetime.timedelta(hours=7)
-                - datetime.datetime.utcnow()
-            )
-            embed.set_author(name="Time left until Discord's 6th Anniversary")
-        embed.add_field(
-            name="Countdown to midnight, May 13, California time (UTC-7):",
-            value=("{}".format(self._dynamic_time(int(timeleft.total_seconds())))),
-        )
-        await ctx.send(embed=embed)
-
-    @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)
-
-    def cog_unload(self):
-        self.bot.loop.create_task(self.session.close())

blurplefy/info.json

@@ -1,22 +0,0 @@
-{
-	"author": [
-		"aikaterna"
-	],
-	"description": "Blurplefy a user profile picture or image. Admins can configure an awardable role if a user's profile pic has more than a certain percentage of blurple in it.",
-    "install_msg": "Thanks for installing, have fun.",
-    "permissions" : [
-		"embed_links",
-		"manage_roles"
-	],
-	"requirements": [
-		"pillow",
-		"python-resize-image"
-	],
-	"short": "Blurplefy a user profile picture or image.",
-	"tags": [
-		"blurple",
-        "image",
-        "profile"
-	],
-	"type": "COG"
-}

cah/__init__.py

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

cah/info.json

@@ -1,18 +1,7 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Cards Against Humanity, played in DMs.",
-    "install_msg": "Warning: This cog can send a lot of DMs, and the bot can become rate limited. Be warned that installing this cog on a bot with a lot of users or servers might be detrimental to the bot's performance. Thanks for installing, have fun.",
-    "permissions" : [
-		"embed_links",
-		"manage_roles"
-	],
-	"short": "Cards Against Humanity.",
-	"tags": [
-		"CAH",
-        "cards",
-        "games"
-	],
-	"type": "COG"
+    "AUTHOR" : "aikaterna",
+    "INSTALL_MSG" : "Thanks for installing Cards Against Humanity. I highly advise only playing this game with 3-4 people on one server, on a private bot, because of the high amount of DM's this game generates.",
+    "NAME" : "cah",
+    "SHORT" : "Cards Against Humanity.",
+    "DESCRIPTION" : "This cog was made possible by CorpBot: https://github.com/corpnewt/CorpBot.py"
 }

chatchart/__init__.py

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

chatchart/chatchart.py

@@ -1,23 +1,20 @@
-#  Lines 72 through 90 are influenced heavily by cacobot's stats module:
+#  Lines 54 through 68 are 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
+#  Big thanks to Redjumpman for changing the beta version from 
 #  Imagemagick/cairosvg to matplotlib.
 #  Thanks to violetnyte for suggesting this cog.
 import discord
 import heapq
 import os
 from io import BytesIO
-from typing import Optional
 import matplotlib
-
-matplotlib.use("agg")
+matplotlib.use('agg')
 import matplotlib.pyplot as plt
-
-plt.switch_backend("agg")
-from redbot.core import commands
+plt.switch_backend('agg')
+from discord.ext import commands
 
 
-class Chatchart(commands.Cog):
+class ChatChart:
     """Show activity."""
 
     def __init__(self, bot):
@@ -31,113 +28,83 @@ class Chatchart(commands.Cog):
             sizes = sizes + [others]
             labels = labels + ["Others {:g}%".format(others)]
         if len(channel.name) >= 19:
-            channel_name = "{}...".format(channel.name[:19])
+            channel_name = '{}...'.format(channel.name[:19])
         else:
             channel_name = channel.name
         title = plt.title("Stats in #{}".format(channel_name), color="white")
         title.set_va("top")
         title.set_ha("center")
         plt.gca().axis("equal")
-        colors = [
-            "r",
-            "darkorange",
-            "gold",
-            "y",
-            "olivedrab",
-            "green",
-            "darkcyan",
-            "mediumblue",
-            "darkblue",
-            "blueviolet",
-            "indigo",
-            "orchid",
-            "mediumvioletred",
-            "crimson",
-            "chocolate",
-            "yellow",
-            "limegreen",
-            "forestgreen",
-            "dodgerblue",
-            "slateblue",
-            "gray",
-        ]
+        colors = ['r', 'darkorange', 'gold', 'y', 'olivedrab', 'green', 'darkcyan', 'mediumblue', 'darkblue', 'blueviolet', 'indigo', 'orchid', 'mediumvioletred', 'crimson', 'chocolate', 'yellow', 'limegreen','forestgreen','dodgerblue','slateblue','gray']
         pie = plt.pie(sizes, colors=colors, startangle=0)
-        plt.legend(
-            pie[0],
-            labels,
-            bbox_to_anchor=(0.7, 0.5),
-            loc="center",
-            fontsize=10,
-            bbox_transform=plt.gcf().transFigure,
-            facecolor="#ffffff",
-        )
+        plt.legend(pie[0], labels, bbox_to_anchor=(0.7, 0.5), loc="center", fontsize=10,
+                   bbox_transform=plt.gcf().transFigure, facecolor='#ffffff')
         plt.subplots_adjust(left=0.0, bottom=0.1, right=0.45)
         image_object = BytesIO()
-        plt.savefig(image_object, format="PNG", facecolor="#36393E")
+        plt.savefig(image_object, format='PNG', facecolor='#36393E')
         image_object.seek(0)
         return image_object
 
-    @commands.guild_only()
-    @commands.command()
+    @commands.command(pass_context=True, no_pm=True)
     @commands.cooldown(1, 10, commands.BucketType.channel)
-    @commands.max_concurrency(1, commands.BucketType.channel)
-    async def chatchart(self, ctx, channel: Optional[discord.TextChannel] = None, messages=5000):
+    async def chatchart(self, ctx, channel: discord.Channel=None):
         """
         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)
-
+        em = await self.bot.say(embed=e)
+		
         if channel is None:
             channel = ctx.message.channel
         history = []
         if not channel.permissions_for(ctx.message.author).read_messages == True:
-            await em.delete()
-            return await ctx.send("You're not allowed to access that channel.")
+            await self.bot.delete_message(em)
+            return await self.bot.say("You're not allowed to access that channel.")
         try:
-            async for msg in channel.history(limit=messages):
+            async for msg in self.bot.logs_from(channel, 5000):
                 history.append(msg)
         except discord.errors.Forbidden:
-            await em.delete()
-            return await ctx.send("No permissions to read that channel.")
-        msg_data = {"total count": 0, "users": {}}
+            await self.bot.delete_message(em)
+            return await self.bot.say("No permissions to read that channel.")
+        msg_data = {'total count': 0, 'users': {}}
 
         for msg in history:
-            if len(msg.author.display_name) >= 20:
-                short_name = "{}...".format(msg.author.display_name[:20]).replace("$", "\\$")
+            if len(msg.author.name) >= 20:
+                short_name = '{}...'.format(msg.author.name[:20]).replace("$", "\$")
             else:
-                short_name = msg.author.display_name.replace("$", "\\$")
-            whole_name = "{}#{}".format(short_name, msg.author.discriminator)
+                short_name = msg.author.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
+            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
+                msg_data['users'][whole_name] = {}
+                msg_data['users'][whole_name]['msgcount'] = 1
+                msg_data['total count'] += 1
 
-        if msg_data['users'] == {}:
-            await em.delete()
-            return await ctx.message.channel.send(f'Only bots have sent messages in {channel.mention}')
+        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)
 
-        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],
-        )
+        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)
         img = self.create_chart(top_ten, others, channel)
-        await em.delete()
-        await ctx.message.channel.send(file=discord.File(img, "chart.png"))
+        await self.bot.delete_message(em)
+        await self.bot.send_file(ctx.message.channel, img, filename="chart.png")
+
+
+def check_folders():
+    if not os.path.exists("data/chatchart"):
+        print("Creating data/chatchart folder...")
+        os.makedirs("data/chatchart")
+
+
+def setup(bot):
+    check_folders()
+    bot.add_cog(ChatChart(bot))

chatchart/info.json

@@ -1,18 +1,9 @@
 {
-	"author": [
-		"aikaterna",
-        "Redjumpman"
-	],
-	"description": "Generate a pie chart from the last 5000 messages in a channel to see who's been talking the most.",
-    "install_msg": "Thanks for installing, have fun.",
-	"short": "Generate a pie chart from the last 5000 messages",
-	"tags": [
-		"data",
-        "chart",
-        "activity"
-	],
-	"requirements": [
-		"matplotlib"
-	],
-	"type": "COG"
-}
+    "AUTHOR" : "aikaterna and Redjumpman",
+    "INSTALL_MSG" : "Use [p]chatchart to generate a chart for that channel.",
+    "NAME" : "chatchart",
+    "SHORT" : "Generate a pie chart from the last 5000 messages.",
+    "DESCRIPTION" : "Generate a pie chart from the last 5000 messages in a channel to see who's been talking the most.",
+    "REQUIREMENTS": ["matplotlib"],
+    "TAGS": ["data", "chart", "activity"]
+}

dadjokes/__init__.py

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

dadjokes/dadjokes.py

@@ -1,16 +0,0 @@
-from redbot.core import commands
-import aiohttp
-
-class DadJokes(commands.Cog):
-    """Random dad jokes from icanhazdadjoke.com"""
-
-    def __init__(self, bot):
-        self.bot = bot
-
-    @commands.command()
-    async def dadjoke(self, ctx):
-        """Gets a random dad joke."""
-        api = 'https://icanhazdadjoke.com/'
-        async with aiohttp.request('GET', api, headers={'Accept': 'text/plain'}) as r:
-            result = await r.text()
-            await ctx.send(f"`{result}`")

dadjokes/info.json

@@ -1,10 +0,0 @@
-{
-	"author": [
-		"UltimatePancake"
-	],
-	"description": "Gets a random dad joke from icanhazdadjoke.com",
-    "install_msg": "Gets a random dad joke from icanhazdadjoke.com. Thanks for installing.",
-	"short": "Random dad jokes",
-	"tags": ["jokes", "dad", "dadjokes"],
-	"type": "COG"
-}

dictionary/__init__.py

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

dictionary/dictionary.py

@@ -1,127 +0,0 @@
-import aiohttp
-from bs4 import BeautifulSoup
-import logging
-import re
-from redbot.core import commands
-
-
-log = logging.getLogger("red.aikaterna.dictionary")
-
-
-class Dictionary(commands.Cog):
-    """Word, yo
-    Parts of this cog are adapted from the PyDictionary library."""
-
-    def __init__(self, bot):
-        self.bot = bot
-        self.session = aiohttp.ClientSession()
-
-    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."""
-        search_msg = await ctx.send("Searching...")
-        search_term = word.split(" ", 1)[0]
-        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.")
-        for key in result:
-            str_buffer += f"\n**{key}**: \n"
-            counter = 1
-            j = False
-            for val in result[key]:
-                if val.startswith("("):
-                    str_buffer += f"{str(counter)}. *{val})* "
-                    counter += 1
-                    j = True
-                else:
-                    if j:
-                        str_buffer += f"{val}\n"
-                        j = False
-                    else:
-                        str_buffer += f"{str(counter)}. {val}\n"
-                        counter += 1
-        await search_msg.edit(content=str_buffer)
-
-    async def _definition(self, ctx, word):
-        data = await self._get_soup_object(f"http://wordnetweb.princeton.edu/perl/webwn?s={word}")
-        if not data:
-            return await ctx.send("Error fetching data.")
-        types = data.findAll("h3")
-        length = len(types)
-        lists = data.findAll("ul")
-        out = {}
-        if not lists:
-            return
-        for a in types:
-            reg = str(lists[types.index(a)])
-            meanings = []
-            for x in re.findall(r">\s\((.*?)\)\s<", reg):
-                if "often followed by" in x:
-                    pass
-                elif len(x) > 5 or " " in str(x):
-                    meanings.append(x)
-            name = a.text
-            out[name] = meanings
-        return out
-
-    async def _synonym(self, ctx, word):
-        data = await self._get_soup_object(f"http://www.thesaurus.com/browse/{word}")
-        if not data:
-            return await ctx.send("Error fetching data.")
-        section = data.find_all("ul", {"class": "css-1ytlws2 et6tpn80"})
-        try:
-            section[1]
-        except IndexError:
-            return
-        spans = section[0].findAll("li")
-        synonyms = [span.text for span in spans[:50]]
-        return synonyms
-
-    @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)
-        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"Synonyms for **{search_term}**: *{result_text}*")

dictionary/info.json

@@ -1,15 +0,0 @@
-{
-	"author": [
-		"UltimatePancake", "aikaterna"
-	],
-	"description": "Gets definitions, antonyms, or synonyms for given words",
-	"install_msg": "After loading the cog with `[p]load dictionary`, use [p]help Dictionary to view commands.",
-	"short": "Gets definitions, antonyms, or synonyms for given words",
-	"tags": [
-		"dictionary"
-	],
-	"requirements": [
-		"beautifulsoup4"
-	],
-	"type": "COG"
-}

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.

forwarding/forwarding.py

@@ -0,0 +1,49 @@
+#  forwarding.py is ported from another bot:
+#  https://github.com/jacobcheatley/dankbot
+
+import discord
+from discord.ext import commands
+from .utils.dataIO import dataIO
+from .utils import checks
+
+
+class Forwarding:
+    def __init__(self, bot: commands.Bot):
+        self.bot = bot
+        self.owner = self.get_owner()
+
+    def get_owner(self):
+        owner_id = dataIO.load_json("data/red/settings.json")["OWNER"]
+        return discord.utils.find(lambda m: m.id == owner_id, self.bot.get_all_members())
+
+    async def send_to_owner(self, **kwargs):
+        if self.owner is None:
+            self.owner = self.get_owner()
+        await self.bot.send_message(self.owner, **kwargs)
+
+    async def on_message(self, message: discord.Message):
+        if self.owner is None:
+            self.owner = self.get_owner()
+        if not message.channel.is_private or message.channel.user.id == self.owner.id:
+            return
+
+        embed = discord.Embed()
+        if message.author == self.bot.user:
+            embed.title = 'Sent PM to {}#{} ({}).'.format(message.channel.user.name, message.channel.user.discriminator, message.channel.user.id)
+        else:
+            embed.set_author(name=message.author, icon_url=message.author.avatar_url or message.author.default_avatar_url)
+            embed.title = '{} messaged me:'.format(message.channel.user.id)
+        embed.description = message.content
+        embed.timestamp = message.timestamp
+
+        await self.send_to_owner(embed=embed)
+
+    @commands.command()
+    @checks.is_owner()
+    async def pm(self, user: discord.User, *, content: str):
+        """PMs a person."""
+        await self.bot.send_message(user, content)
+
+
+def setup(bot):
+    bot.add_cog(Forwarding(bot))

forwarding/info.json

@@ -0,0 +1,7 @@
+{
+    "AUTHOR" : "aikaterna",
+    "NAME" : "forwarding",
+    "SHORT" : "Forwards DMs sent to the bot to the owner.",
+    "DESCRIPTION" : "Forwards DMs sent to the bot to the owner.",
+    "TAGS": ["message", "dm"]
+}

hunting/__init__.py

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

hunting/hunting.py

@@ -1,398 +1,240 @@
+from __main__ import send_cmd_help
+from .utils.dataIO import dataIO
+from discord.ext import commands
+from .utils import checks
+import datetime
 import asyncio
 import discord
-import datetime
-import itertools
-import math
 import random
 import time
+import os
 
-from redbot.core import checks, commands, Config
-from redbot.core.utils.chat_formatting import bold, box, humanize_list, humanize_number, pagify
-from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
+# TODO
+# Show error when timing intervals are the same
 
 
-__version__ = "3.1.3"
-
-
-class Hunting(commands.Cog):
-    """Hunting, it hunts birds and things that fly."""
-
+class Hunting:
     def __init__(self, bot):
         self.bot = bot
-        self.config = Config.get_conf(self, 2784481002, force_registration=True)
-
-        self.animals = {
-            "dove": ":dove: **_Coo!_**",
-            "penguin": ":penguin: **_Noot!_**",
-            "chicken": ":chicken: **_Bah-gawk!_**",
-            "duck": ":duck: **_Quack!_**",
-        }
+        self.scores = dataIO.load_json('data/hunting/scores.json')
+        self.subscriptions = dataIO.load_json('data/hunting/subscriptions.json')
+        self.settings = dataIO.load_json('data/hunting/settings.json')
+        self.animals = {'duck': ':duck: **_Quack!_**', 'penguin': ':penguin: **_Noot!_**', 'chicken': ':rooster: **_Bah-gawk!_**', 'pigeon': ':dove: **_Coo!_**'}
         self.in_game = []
         self.paused_games = []
-        self.next_bang = {}
-        self.game_tasks = []
+        self._latest_message_check_message_limit = 5
+        self._latest_message_check_wait_limit = self.settings['hunt_interval_maximum'] * 2
+        self.next = None
 
-        default_guild = {
-            "hunt_interval_minimum": 900,
-            "hunt_interval_maximum": 3600,
-            "wait_for_bang_timeout": 20,
-            "channels": [],
-            "bang_time": False,
-            "bang_words": True,
-        }
-        default_user = {"score": {}, "total": 0}
-        self.config.register_user(**default_user)
-        self.config.register_guild(**default_guild)
+    async def _save_scores(self):
+        dataIO.save_json('data/hunting/scores.json', self.scores)
 
-    @commands.guild_only()
-    @commands.group()
-    async def hunting(self, ctx):
-        """Hunting, it hunts birds and things that fly."""
-        if ctx.invoked_subcommand is None:
-            guild_data = await self.config.guild(ctx.guild).all()
-            if not guild_data["channels"]:
-                channel_names = ["No channels set."]
-            else:
-                channel_names = []
-                for channel_id in guild_data["channels"]:
-                    channel_obj = self.bot.get_channel(channel_id)
-                    channel_names.append(channel_obj.name)
+    async def _save_subscriptions(self):
+        dataIO.save_json('data/hunting/subscriptions.json', self.subscriptions)
 
-            hunting_mode = "Words" if guild_data["bang_words"] else "Reactions"
-            reaction_time = "On" if guild_data["bang_time"] else "Off"
+    async def _save_settings(self):
+        dataIO.save_json('data/hunting/settings.json', self.settings)
 
-            msg = f"[Hunting in]:                 {humanize_list(channel_names)}\n"
-            msg += f"[Bang timeout]:               {guild_data['wait_for_bang_timeout']} seconds\n"
-            msg += f"[Hunt interval minimum]:      {guild_data['hunt_interval_minimum']} seconds\n"
-            msg += f"[Hunt interval maximum]:      {guild_data['hunt_interval_maximum']} seconds\n"
-            msg += f"[Hunting mode]:               {hunting_mode}\n"
-            msg += f"[Bang response time message]: {reaction_time}\n"
+    @commands.group(pass_context=True, no_pm=True, name='hunting')
+    async def _hunting(self, context):
+        """Hunting, it hunts birds... and things that fly"""
+        if context.invoked_subcommand is None:
+            await send_cmd_help(context)
 
-            for page in pagify(msg, delims=["\n"]):
-                await ctx.send(box(page, lang="ini"))
-
-    @hunting.command()
-    async def leaderboard(self, ctx, global_leaderboard=False):
-        """
-        This will show the top 50 hunters for the server.
-        Use True for the global_leaderboard variable to show the global leaderboard.
-        """
-        userinfo = await self.config._all_from_scope(scope="USER")
-        if not userinfo:
-            return await ctx.send(bold("Please shoot something before you can brag about it."))
-
-        async with ctx.typing():
-            sorted_acc = sorted(userinfo.items(), key=lambda x: (x[1]["total"]), reverse=True)[:50]
-
-        if not hasattr(ctx.guild, "members"):
-            global_leaderboard = True
-
-        pound_len = len(str(len(sorted_acc)))
-        score_len = 10
-        header = "{score:{score_len}}{name:2}\n".format(
-            score="# Birds Shot",
-            score_len=score_len + 5,
-            name="Name"
-            if not str(ctx.author.mobile_status) in ["online", "idle", "dnd"]
-            else "Name",
-        )
-        temp_msg = header
-        for account in sorted_acc:
-            if account[1]["total"] == 0:
-                continue
-            if global_leaderboard or (account[0] in [member.id for member in ctx.guild.members]):
-                user_obj = self.bot.get_user(account[0]) or account[0]
-            else:
-                continue
-            if isinstance(user_obj, discord.User) and len(str(user_obj)) > 28:
-                user_name = f"{user_obj.name[:19]}...#{user_obj.discriminator}"
-            else:
-                user_name = str(user_obj)
-            if user_obj == ctx.author:
-                temp_msg += f"{humanize_number(account[1]['total']) + '   ': <{score_len + 4}} <<{user_name}>>\n"
-            else:
-                temp_msg += f"{humanize_number(account[1]['total']) + '   ': <{score_len + 4}} {user_name}\n"
-
-        page_list = []
-        pages = 1
-        for page in pagify(temp_msg, delims=["\n"], page_length=800):
-            if global_leaderboard:
-                title = "Global Hunting Leaderboard"
-            else:
-                title = f"Hunting Leaderboard For {ctx.guild.name}"
-            embed = discord.Embed(
-                colour=await ctx.bot.get_embed_color(location=ctx.channel),
-                description=box(title, lang="prolog") + (box(page, lang="md")),
-            )
-            embed.set_footer(
-                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:
-            await ctx.send(embed=page_list[0])
+    @_hunting.command(pass_context=True, no_pm=True, name='start')
+    async def _start(self, context):
+        """Start the hunt"""
+        server = context.message.server
+        channel = context.message.channel
+        if server.id in self.subscriptions:
+            message = '**We\'re already hunting!**'
         else:
-            await menu(ctx, page_list, DEFAULT_CONTROLS)
+            self.subscriptions[server.id] = channel.id
+            message = '**The hunt has started. Good luck to all.**'
+            await self._save_subscriptions()
+        await self.bot.say(message)
 
-    @checks.mod_or_permissions(manage_guild=True)
-    @hunting.command()
-    async def bangtime(self, ctx):
-        """Toggle displaying the bang response time from users."""
-        toggle = await self.config.guild(ctx.guild).bang_time()
-        await self.config.guild(ctx.guild).bang_time.set(not toggle)
-        toggle_text = "will not" if toggle else "will"
-        await ctx.send(f"Bang reaction time {toggle_text} be shown.\n")
-
-    @checks.mod_or_permissions(manage_guild=True)
-    @hunting.command()
-    async def mode(self, ctx):
-        """Toggle whether the bot listens for 'bang' or a reaction."""
-        toggle = await self.config.guild(ctx.guild).bang_words()
-        await self.config.guild(ctx.guild).bang_words.set(not toggle)
-        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 next(self, ctx):
-        """When will the next occurrence happen?"""
-        try:
-            self.next_bang[ctx.guild.id]
-            time = abs(datetime.datetime.utcnow() - self.next_bang[ctx.guild.id])
-            total_seconds = int(time.total_seconds())
-            hours, remainder = divmod(total_seconds, 60 * 60)
-            minutes, seconds = divmod(remainder, 60)
-            message = f"The next occurrence will be in {hours} hours and {minutes} minutes."
-        except KeyError:
-            message = "There is currently no hunt."
-        await ctx.send(bold(message))
-
-    @hunting.command(name="score")
-    async def score(self, ctx, member: discord.Member = None):
-        """This will show the score of a hunter."""
-        if not member:
-            member = ctx.author
-        score = await self.config.user(member).score()
-        total = 0
-        kill_list = []
-        if not score:
-            message = "Please shoot something before you can brag about it."
-
-        for animal in score.items():
-            total = total + animal[1]
-            if animal[1] == 1 or animal[0][-1] == "s":
-                kill_list.append(f"{animal[1]} {animal[0].capitalize()}")
-            else:
-                kill_list.append(f"{animal[1]} {animal[0].capitalize()}s")
-            message = f"{member.name} shot a total of {total} animals ({humanize_list(kill_list)})"
-        await ctx.send(bold(message))
-
-    @checks.mod_or_permissions(manage_guild=True)
-    @hunting.command()
-    async def start(self, ctx, channel: discord.TextChannel = None):
-        """Start the hunt."""
-        if not channel:
-            channel = ctx.channel
-
-        if not channel.permissions_for(ctx.guild.me).send_messages:
-            return await ctx.send(bold("I can't send messages in that channel!"))
-
-        channel_list = await self.config.guild(ctx.guild).channels()
-        if channel.id in channel_list:
-            message = f"We're already hunting in {channel.mention}!"
+    @_hunting.command(pass_context=True, no_pm=True, name='stop')
+    async def _stop(self, context):
+        """Stop the hunt"""
+        server = context.message.server
+        if server.id not in self.subscriptions:
+            message = '**We\'re not hunting!**'
         else:
-            channel_list.append(channel.id)
-            message = f"The hunt has started in {channel.mention}. Good luck to all."
-            await self.config.guild(ctx.guild).channels.set(channel_list)
+            del self.subscriptions[server.id]
+            message = '**The hunt has stopped.**'
+            await self._save_subscriptions()
+        await self.bot.say(message)
 
-        await ctx.send(bold(message))
-
-    @checks.mod_or_permissions(manage_guild=True)
-    @hunting.command()
-    async def stop(self, ctx, channel: discord.TextChannel = None):
-        """Stop the hunt."""
-        if not channel:
-            channel = ctx.channel
-        channel_list = await self.config.guild(ctx.guild).channels()
-
-        if channel.id not in channel_list:
-            message = f"We're not hunting in {channel.mention}!"
-        else:
-            channel_list.remove(channel.id)
-            message = f"The hunt has stopped in {channel.mention}."
-            await self.config.guild(ctx.guild).channels.set(channel_list)
-
-        await ctx.send(bold(message))
-
-    @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)
-        """
-        message = ""
+    @_hunting.command(no_pm=True, name='timing')
+    @checks.is_owner()
+    async def _timing(self, interval_min: int, interval_max: int, bang_timeout: int):
+        """Change the timing"""
         if interval_min > interval_max:
-            return await ctx.send("`interval_min` needs to be lower than `interval_max`.")
-        if interval_min < 0 and interval_max < 0 and bang_timeout < 0:
-            return await ctx.send("Please no negative numbers!")
-        if interval_min < 120:
-            interval_min = 120
-            message += "Minimum interval set to minimum of 120s.\n"
-        if interval_max < 240:
-            interval_max = 240
-            message += "Maximum interval set to minimum of 240s.\n"
-        if bang_timeout < 10:
-            bang_timeout = 10
-            message += "Bang timeout set to minimum of 10s.\n"
+            message = '**`interval_min` needs to be lower than `interval_max`**'
+        elif interval_min < 0 and interval_max < 0 and bang_timeout < 0:
+            message = '**Please no negative numbers!**'
+        elif interval_min == interval_max:
+            message = '**`interval_min` and `interval_max` cannot be the same**'
+        else:
+            self.settings['hunt_interval_minimum'] = interval_min
+            self.settings['hunt_interval_maximum'] = interval_max
+            self.settings['wait_for_bang_timeout'] = bang_timeout
+            await self._save_settings()
+            message = '**Timing has been set.**'
+        await self.bot.say(message)
 
-        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"
-        await ctx.send(bold(message))
+    @_hunting.command(pass_context=True, no_pm=True, name='next')
+    @checks.is_owner()
+    async def _next(self, context):
+        """When will the next occurance happen?"""
+        if self.next:
+            time = abs(datetime.datetime.utcnow() - self.next)
+            total_seconds = int(time.total_seconds())
+            hours, remainder = divmod(total_seconds, 60*60)
+            minutes, seconds = divmod(remainder, 60)
+            message = '**The next occurance will be in {} hours and {} minutes.**'.format(hours, minutes)
+        else:
+            message = '**There is currently no hunt.**'
+        await self.bot.say(message)
 
-    @hunting.command()
-    async def version(self, ctx):
-        """Show the cog version."""
-        await ctx.send(f"Hunting version {__version__}.")
+    @_hunting.command(pass_context=True, no_pm=True, name='score')
+    async def _score(self, context, member: discord.Member):
+        """This will show the score of a hunter"""
+        server = context.message.server
+        if server.id in self.scores:
+            if member.id in self.scores[server.id]:
+                message = '**{} shot a total of {} animals ({})**'.format(member.mention, self.scores[server.id][member.id]['total'], ', '.join([str(self.scores[server.id][member.id]['score'][x]) + ' ' + x.capitalize() + 's' for x in self.scores[server.id][member.id]['score']]))  # (', '.join([str(self.scores[server.id][member.id]['score'][x]) + ' ' + x.capitalize() + 's' for x in self.scores[server.id][member.id]['score']]))
+            else:
+                message = '**Please shoot something before you can brag about it.**'
+        else:
+            message = '**Please shoot something before you can brag about it.**'
+        await self.bot.say(message)
 
-    async def _add_score(self, guild, author, avian):
-        user_data = await self.config.user(author).all()
-        try:
-            user_data["score"][avian] += 1
-        except KeyError:
-            user_data["score"][avian] = 1
-        user_data["total"] += 1
-        await self.config.user(author).set_raw(value=user_data)
+    @_hunting.command(pass_context=True, no_pm=True, name='clearscore')
+    @checks.serverowner()
+    async def _clearscore(self, context):
+        """Clear the leaderboard"""
+        server = context.message.server
+        if server.id in self.scores:
+            self.scores[server.id] = {}
+            await self._save_scores()
+            message = 'Leaderboard is cleared'
+        else:
+            message = 'There\'s nothing to clear'
+        await self.bot.say(message)
+
+    @_hunting.command(pass_context=True, no_pm=True, name='leaderboard', aliases=['scores'])
+    async def _huntingboard(self, context):
+        """This will show the top hunters on this server"""
+        server = context.message.server
+        if server.id in self.scores:
+            p = self.scores[server.id]
+            scores = sorted(p, key=lambda x: (p[x]['total']), reverse=True)
+            message = '```\n{:<4}{:<8}{}\n\n'.format('#', 'TOTAL', 'USERNAME')
+            for i, hunter in enumerate(scores, 1):
+                if i > 10:
+                    break
+                message += '{:<4}{:<8}{} ({})\n'.format(i, p[hunter]['total'], p[hunter]['author_name'], ', '.join([str(p[hunter]['score'][x]) + ' ' + x.capitalize() + 's' for x in p[hunter]['score']]))
+            message += '```'
+        else:
+            message = '**Please shoot something before you can brag about it.**'
+        await self.bot.say(message)
+
+    async def add_score(self, server, author, avian):
+        if server.id not in self.scores:
+            self.scores[server.id] = {}
+        if author.id not in self.scores[server.id]:
+            self.scores[server.id][author.id] = {}
+            self.scores[server.id][author.id]['score'] = {}
+            self.scores[server.id][author.id]['total'] = 0
+            self.scores[server.id][author.id]['author_name'] = ''
+            for a in list(self.animals.keys()):
+                self.scores[server.id][author.id]['score'][a] = 0
+        if avian not in self.scores[server.id][author.id]['score']:
+            self.scores[server.id][author.id]['score'][avian] = 0
+        self.scores[server.id][author.id]['author_name'] = author.display_name
+        self.scores[server.id][author.id]['score'][avian] += 1
+        self.scores[server.id][author.id]['total'] += 1
+        await self._save_scores()
+
+    async def _wait_for_bang(self, server, channel):
+        def check(message):
+            return message.content.lower().split(' ')[0] == 'bang' or message.content.lower() == 'b' if message.content else False
+
+        animal = random.choice(list(self.animals.keys()))
+        await self.bot.send_message(channel, self.animals[animal])
+        message = await self.bot.wait_for_message(channel=channel, timeout=self.settings['wait_for_bang_timeout'], check=check)
+        if message:
+            author = message.author
+            if random.randrange(0, 17) > 1:
+                await self.add_score(server, author, animal)
+                msg = '**{} shot a {}!**'.format(author.mention, animal)
+            else:
+                msg = '**{} missed the shot and the {} got away!**'.format(author.mention, animal)
+        else:
+            msg = '**The {} got away!** :confused:'.format(animal)
+        self.in_game.remove(channel.id)
+        await self.bot.send_message(channel, msg)
 
     async def _latest_message_check(self, channel):
-        hunt_int_max = await self.config.guild(channel.guild).hunt_interval_maximum()
-        async for message in channel.history(limit=5):
-            delta = datetime.datetime.utcnow() - message.created_at
-            if delta.total_seconds() < hunt_int_max * 2 and message.author.id != self.bot.user.id:
+        async for message in self.bot.logs_from(channel, limit=self._latest_message_check_message_limit, reverse=True):
+            delta = datetime.datetime.utcnow() - message.timestamp
+            if delta.total_seconds() < self._latest_message_check_wait_limit and message.author.id != self.bot.user.id:
                 if channel.id in self.paused_games:
                     self.paused_games.remove(channel.id)
                 return True
         if channel.id not in self.paused_games:
             self.paused_games.append(channel.id)
-            await channel.send(
-                bold(
-                    "It seems there are no hunters here. The hunt will be resumed when someone treads here again."
-                )
-            )
+            await self.bot.send_message(channel, '**It seems there are no hunters here. The hunt will be resumed when someone treads here again.**')
         return False
 
-    def _next_sorter(self, guild_id, value):
-        try:
-            self.next_bang[guild_id]
-        except KeyError:
-            self.next_bang[guild_id] = value
+    async def _hunting_loop(self):
+        while self == self.bot.get_cog('Hunting'):
+            wait_time = random.randrange(self.settings['hunt_interval_minimum'], self.settings['hunt_interval_maximum'])
+            self.next = datetime.datetime.fromtimestamp(int(time.mktime(datetime.datetime.utcnow().timetuple())) + wait_time)
+            await asyncio.sleep(wait_time)
+            for server in self.subscriptions:
+                if self.subscriptions[server] not in self.in_game:
+                    channel = self.bot.get_channel(self.subscriptions[server])
+                    server = self.bot.get_server(server)
+                    if await self._latest_message_check(channel):
+                        self.in_game.append(self.subscriptions[server.id])
+                        self.bot.loop = asyncio.get_event_loop()
+                        self.bot.loop.create_task(self._wait_for_bang(server, channel))
 
-    async def _wait_for_bang(self, guild, channel):
-        animal = random.choice(list(self.animals.keys()))
-        animal_message = await channel.send(self.animals[animal])
-        now = time.time()
-        timeout = await self.config.guild(guild).wait_for_bang_timeout()
 
-        shooting_type = await self.config.guild(guild).bang_words()
-        if shooting_type:
+def check_folder():
+    if not os.path.exists('data/hunting'):
+        print('Creating data/hunting folder...')
+        os.makedirs('data/hunting')
 
-            def check(message):
-                if guild != message.guild:
-                    return False
-                if channel != message.channel:
-                    return False
-                return (
-                    message.content.lower().split(" ")[0] == "bang" if message.content else False
-                )
 
-            try:
-                bang_msg = await self.bot.wait_for("message", check=check, timeout=timeout)
-            except asyncio.TimeoutError:
-                self.in_game.remove(channel.id)
-                return await channel.send(f"The {animal} got away!")
-            author = bang_msg.author
+def check_files():
+    f = 'data/hunting/settings.json'
+    if not dataIO.is_valid_json(f):
+        print('Creating empty settings.json...')
+        data = {}
+        data['hunt_interval_minimum'] = 300
+        data['hunt_interval_maximum'] = 600
+        data['wait_for_bang_timeout'] = 30
+        dataIO.save_json(f, data)
 
-        else:
-            emoji = "\N{COLLISION SYMBOL}"
-            await animal_message.add_reaction(emoji)
+    f = 'data/hunting/subscriptions.json'
+    if not dataIO.is_valid_json(f):
+        print('Creating empty subscriptions.json...')
+        dataIO.save_json(f, {})
 
-            def check(reaction, user):
-                if user.bot:
-                    return False
-                if guild != reaction.message.guild:
-                    return False
-                if channel != reaction.message.channel:
-                    return False
-                return user and str(reaction.emoji) == "💥"
+    f = 'data/hunting/scores.json'
+    if not dataIO.is_valid_json(f):
+        print('Creating empty scores.json...')
+        dataIO.save_json(f, {})
 
-            try:
-                await self.bot.wait_for("reaction_add", check=check, timeout=timeout)
-            except asyncio.TimeoutError:
-                self.in_game.remove(channel.id)
-                return await channel.send(f"The {animal} got away!")
 
-            message_with_reacts = await animal_message.channel.fetch_message(animal_message.id)
-            reacts = message_with_reacts.reactions[0]
-            async for user in reacts.users():
-                if user.bot:
-                    continue
-                author = user
-                break
-
-        bang_now = time.time()
-        time_for_bang = "{:.3f}".format(bang_now - now)
-        bangtime = (
-            "" 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}!"
-        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))
-
-    @commands.Cog.listener()
-    async def on_message(self, message):
-        if not message.guild:
-            return
-        if message.author.bot:
-            return
-        if not message.channel.permissions_for(message.guild.me).send_messages:
-            return
-        if message.channel.id in self.in_game:
-            return
-        channel_list = await self.config.guild(message.guild).channels()
-        if not channel_list:
-            return
-        if message.channel.id not in channel_list:
-            return
-
-        if await self._latest_message_check(message.channel):
-            self.in_game.append(message.channel.id)
-
-        guild_data = await self.config.guild(message.guild).all()
-        wait_time = random.randrange(
-            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
-        )
-        await asyncio.sleep(wait_time)
-        task = self.bot.loop.create_task(self._wait_for_bang(message.guild, message.channel))
-        self.game_tasks.append(task)
-        try:
-            del self.next_bang[message.guild.id]
-        except KeyError:
-            pass
-
-    def cog_unload(self):
-        for task in self.game_tasks:
-            task.cancel()
+def setup(bot):
+    check_folder()
+    check_files()
+    cog = Hunting(bot)
+    loop = asyncio.get_event_loop()
+    loop.create_task(cog._hunting_loop())
+    bot.add_cog(cog)

hunting/info.json

@@ -1,8 +1,7 @@
 {
-	"author": ["aikaterna", "Paddo"],
-	"description": "Hunting, it hunts birds and things that fly.",
-	"install_msg": "Check out [p]hunting to get started.",
-	"short": "A bird hunting game.",
-	"tags": ["hunting", "hunt", "game"],
-	"type": "COG"
-}
+    "AUTHOR" : "Paddolicious#8880",
+    "NAME" : "Hunting",
+    "SHORT" : "Hunting, it hunts birds... and things that fly",
+    "DESCRIPTION" : "Hunting, it hunts birds... and things that fly",
+    "TAGS": ["Hunting", "hunt", "birds", "paddo"]
+}

icyparser/__init__.py

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

icyparser/icyparser.py

@@ -1,77 +0,0 @@
-import aiohttp
-import discord
-import lavalink
-import struct
-import re
-from redbot.core import commands
-
-
-class IcyParser(commands.Cog):
-    def __init__(self, bot):
-        self.bot = bot
-        self.session = aiohttp.ClientSession()
-
-    async def _icyparser(self, url: str):
-        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.command(aliases=["icynp"])
-    async def icyparser(self, ctx, url=None):
-        """Show Icecast or Shoutcast stream information, if any."""
-        if not url:
-            audiocog = self.bot.get_cog("Audio")
-            if not audiocog:
-                return await ctx.send("Audio is not loaded.")
-            try:
-                player = lavalink.get_player(ctx.guild.id)
-            except KeyError:
-                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)
-        else:
-            icy = await self._icyparser(url)
-        if not icy[0]:
-            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."
-            )
-        song = f"**[{icy[0]}]({player.current.uri if not url else url})**\n"
-        embed = discord.Embed(
-            colour=await ctx.embed_colour(), title="Now Playing", description=song
-        )
-        if icy[2]:
-            embed.set_thumbnail(url=icy[1])
-        await ctx.send(embed=embed)

icyparser/info.json

@@ -1,14 +0,0 @@
-{
-	"author": [
-		"aikaterna"
-	],
-	"description": "Audio addon cog for dislaying icecast/shoutcast info.",
-    "install_msg": "Thanks for installing, have fun.",
-	"short": "Audio addon cog for dislaying icecast/shoutcast info",
-	"tags": [
-		"audio",
-		"icecast",
-		"shoutcast"
-	],
-	"type": "COG"
-}

imgwelcome/imgwelcome.py

@@ -0,0 +1,619 @@
+#  _is_hex, _hex_to_rgb, _rgb_to_hex are from Stevy's leveler.py
+#  Also thanks to Stevy for nice, smooth circles.
+#  https://github.com/AznStevy/Maybe-Useful-Cogs
+#  imgwelcomeset_upload is based on code in orels' drawing.py
+#  https://github.com/orels1/ORELS-Cogs
+#  Parts of _create_welcome and on_member_join are from the Welcomer bot:
+#  https://discordbots.org/bot/330416853971107840
+#  Font switcher, font outline, and bonus text announcement toggles
+#  thanks to Sitryk.
+#  Font listing from FlapJack + aikaterna's yet unpublished wordcloud cog.
+import asyncio
+import aiohttp
+import datetime
+import discord
+import os
+import re
+import time
+from __main__ import send_cmd_help
+from cogs.utils.dataIO import dataIO
+from cogs.utils import checks
+from copy import deepcopy
+from discord.ext import commands
+from io import BytesIO
+from PIL import Image, ImageFont, ImageOps, ImageDraw
+
+
+default_settings = {"ANNOUNCE": False,
+                    "BACKGROUND": "data/imgwelcome/transparent.png",
+                    "BONUSES": {"ACCOUNT_WARNINGS": True,
+                                "SPECIAL_USERS": True
+                                },
+                    "BORDER": [255, 255, 255, 230],
+                    "CHANNEL": None,
+                    "OUTLINE": [0, 0, 0, 255],
+                    "SERVERTEXT": [255, 255, 255, 230],
+                    "TEXT": [255, 255, 255, 230],
+                    "FONT": {"WELCOME_FONT": {"PATH": "data/imgwelcome/fonts/UniSansHeavy.otf",
+                                               "SIZE": 50},
+                             "SERVER_FONT": {"PATH": "data/imgwelcome/fonts/UniSansHeavy.otf",
+                                              "SIZE": 20},
+                             "NAME_FONT": {"PATH": "data/imgwelcome/fonts/UniSansHeavy.otf",
+                                            "SIZE": {"NORMAL": 30,
+                                                      "MEDIUM": 22,
+                                                      "SMALL": 18,
+                                                      "SMALLEST": 12
+                                                    }
+                                            }
+                            }
+                    }
+
+
+class ImgWelcome:
+    """Welcomes a user to the server with an image."""
+
+    def __init__(self, bot):
+        self.bot = bot
+        self.settings = dataIO.load_json('data/imgwelcome/settings.json')
+        self.version = "0.1.8"
+        self.session = aiohttp.ClientSession()
+        
+    def __unload(self):
+        self.session.close()
+
+    async def save_settings(self):
+        dataIO.save_json('data/imgwelcome/settings.json', self.settings)
+
+    async def _create_welcome(self, member, url, test_member_number: int = None):
+        server = member.server
+        wfont = self.settings[server.id]["FONT"]["WELCOME_FONT"]
+        sfont = self.settings[server.id]["FONT"]["SERVER_FONT"]
+        nfont = self.settings[server.id]["FONT"]["NAME_FONT"]
+        welcome_font = ImageFont.truetype(wfont["PATH"], wfont["SIZE"])
+        server_font = ImageFont.truetype(sfont["PATH"], sfont["SIZE"])
+
+        name_font = ImageFont.truetype(nfont["PATH"], nfont["SIZE"]["NORMAL"])
+        name_font_medium = ImageFont.truetype(nfont["PATH"], nfont["SIZE"]["MEDIUM"])
+        name_font_small = ImageFont.truetype(nfont["PATH"], nfont["SIZE"]["SMALL"])
+        name_font_smallest = ImageFont.truetype(nfont["PATH"], nfont["SIZE"]["SMALLEST"])
+        background = Image.open(self.settings[server.id]["BACKGROUND"]).convert('RGBA')
+        no_profile_picture = Image.open("data/imgwelcome/noimage.png")
+
+        global welcome_picture
+        welcome_picture = Image.new("RGBA", (500, 150))
+        welcome_picture = ImageOps.fit(background, (500, 150), centering=(0.5, 0.5))
+        welcome_picture.paste(background)
+        welcome_picture = welcome_picture.resize((500, 150), Image.NEAREST)
+
+        profile_area = Image.new("L", (512, 512), 0)
+        draw = ImageDraw.Draw(profile_area)
+        draw.ellipse(((0, 0), (512, 512)), fill=255)
+        circle_img_size = tuple(self.settings[member.server.id]["CIRCLE"])
+        profile_area = profile_area.resize((circle_img_size), Image.ANTIALIAS)
+        try:
+            url = url.replace('webp?size=1024', 'png')
+            url = url.replace('gif?size=1024', 'png')
+            await self._get_profile(url)
+            profile_picture = Image.open('data/imgwelcome/profilepic.png')
+        except:
+            profile_picture = no_profile_picture
+        profile_area_output = ImageOps.fit(profile_picture, (circle_img_size), centering=(0, 0))
+        profile_area_output.putalpha(profile_area)
+
+        bordercolor = tuple(self.settings[member.server.id]["BORDER"])
+        fontcolor = tuple(self.settings[member.server.id]["TEXT"])
+        servercolor = tuple(self.settings[member.server.id]["SERVERTEXT"])
+        textoutline = tuple(self.settings[server.id]["OUTLINE"])
+
+        mask = Image.new('L', (512, 512), 0)
+        draw_thumb = ImageDraw.Draw(mask)
+        draw_thumb.ellipse((0, 0) + (512, 512), fill=255, outline=0)
+        circle = Image.new("RGBA", (512, 512))
+        draw_circle = ImageDraw.Draw(circle)
+        draw_circle.ellipse([0, 0, 512, 512], fill=(bordercolor[0], bordercolor[1], bordercolor[2], 180), outline=(255, 255, 255, 250))
+        circle_border_size = await self._circle_border(circle_img_size)
+        circle = circle.resize((circle_border_size), Image.ANTIALIAS)
+        circle_mask = mask.resize((circle_border_size), Image.ANTIALIAS)
+        circle_pos = (7 + int((136 - circle_border_size[0]) / 2))
+        border_pos = (11 + int((136 - circle_border_size[0]) / 2))
+        drawtwo = ImageDraw.Draw(welcome_picture)
+        welcome_picture.paste(circle, (circle_pos, circle_pos), circle_mask)
+        welcome_picture.paste(profile_area_output, (border_pos, border_pos), profile_area_output)
+
+        uname = (str(member.name) + "#" + str(member.discriminator))
+
+        def _outline(original_position: tuple, text: str, pixel_displacement: int, font, textoutline):
+            op = original_position
+            pd = pixel_displacement
+
+            left = (op[0] - pd, op[1])
+            right = (op[0] + pd, op[1])
+            up = (op[0], op[1] - pd)
+            down = (op[0], op[1] + pd)
+
+            drawtwo.text(left, text, font=font, fill=(textoutline))
+            drawtwo.text(right, text, font=font, fill=(textoutline))
+            drawtwo.text(up, text, font=font, fill=(textoutline))
+            drawtwo.text(down, text, font=font, fill=(textoutline))
+
+            drawtwo.text(op, text, font=font, fill=(textoutline))
+
+        _outline((150, 16), "Welcome", 1, welcome_font, (textoutline))
+        drawtwo.text((150, 16), "Welcome", font=welcome_font, fill=(fontcolor))
+
+        if len(uname) <= 17:
+            _outline((152, 63), uname, 1, name_font, (textoutline))
+            drawtwo.text((152, 63), uname, font=name_font, fill=(fontcolor))
+
+        if len(uname) > 17:
+            if len(uname) <= 23:
+                _outline((152, 66), uname, 1,  name_font_medium, (textoutline))
+                drawtwo.text((152, 66), uname, font=name_font_medium, fill=(fontcolor))
+
+        if len(uname) >= 24:
+            if len(uname) <= 32:
+                _outline((152, 70), uname, 1,  name_font_small, (textoutline))
+                drawtwo.text((152, 70), uname, font=name_font_small, fill=(fontcolor))
+
+        if len(uname) >= 33:
+            _outline((152, 73), uname, 1,  name_font_smallest, (textoutline))
+            drawtwo.text((152, 73), uname, font=name_font_smallest, fill=(fontcolor))
+
+        if test_member_number is None:
+            members = sorted(server.members,
+                               key=lambda m: m.joined_at).index(member) + 1
+        else:
+            members = test_member_number
+
+        member_number = str(members) + self._get_suffix(members)
+        sname = str(member.server.name) + '!' if len(str(member.server.name)) <= 28 else str(member.server.name)[:23] + '...'
+
+        _outline((152, 96), "You are the " + str(member_number) + " member", 1, server_font, (textoutline))
+        drawtwo.text((152, 96), "You are the " + str(member_number) + " member", font=server_font, fill=(servercolor))
+        _outline((152, 116), 'of ' + sname, 1, server_font, (textoutline))
+        drawtwo.text((152, 116), 'of ' + sname, font=server_font, fill=(servercolor))
+
+        image_object = BytesIO()
+        welcome_picture.save(image_object, format="PNG")
+        image_object.seek(0)
+        return image_object
+
+    async def _circle_border(self, circle_img_size: tuple):
+        border_size = []
+        for i in range(len(circle_img_size)):
+            border_size.append(circle_img_size[0] + 8)
+        return tuple(border_size)
+
+    async def _data_check(self, ctx):
+        server = ctx.message.server
+        if server.id not in self.settings:
+            self.settings[server.id] = deepcopy(default_settings)
+            self.settings[server.id]["CHANNEL"] = ctx.message.channel.id
+            await self.save_settings()
+
+        if "BONUSES" not in self.settings[server.id].keys():
+            self.settings[server.id]["BONUSES"] = {"ACCOUNT_WARNINGS": True,
+                                                   "SPECIAL_USERS": True
+                                                   }
+            await self.save_settings()
+
+        if "CIRCLE" not in self.settings[server.id].keys():
+            self.settings[server.id]["CIRCLE"] = [128, 128]
+            await self.save_settings()
+
+        if "CHANNEL" not in self.settings[server.id].keys():
+            self.settings[server.id]["CHANNEL"] = ctx.message.channel.id
+            await self.save_settings()
+
+        if "FONT" not in self.settings[server.id].keys():
+            self.settings[server.id]["FONT"] = {"WELCOME_FONT": {"PATH": "data/imgwelcome/fonts/UniSansHeavy.otf",
+                                                                  "SIZE": 50},
+                                                "SERVER_FONT": {"PATH": "data/imgwelcome/fonts/UniSansHeavy.otf",
+                                                                 "SIZE": 20},
+                                                "NAME_FONT": {"PATH": "data/imgwelcome/fonts/UniSansHeavy.otf",
+                                                               "SIZE": {"NORMAL": 30,
+                                                                         "MEDIUM": 22,
+                                                                         "SMALL": 18,
+                                                                         "SMALLEST": 12
+                                                                        }
+                                                                }
+                                                }
+
+        if "OUTLINE" not in self.settings[server.id].keys():
+            self.settings[server.id]["OUTLINE"] = [0, 0, 0, 255]
+            await self.save_settings()
+
+    async def _get_profile(self, url):
+        async with self.session.get(url) as r:
+            image = await r.content.read()
+        with open('data/imgwelcome/profilepic.png', 'wb') as f:
+            f.write(image)
+
+    def _get_suffix(self, 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 _hex_to_rgb(self, hex_num: str, a: int):
+        h = hex_num.lstrip('#')
+
+        # if only 3 characters are given
+        if len(str(h)) == 3:
+            expand = ''.join([x*2 for x in str(h)])
+            h = expand
+
+        colors = [int(h[i:i+2], 16) for i in (0, 2, 4)]
+        colors.append(a)
+        return tuple(colors)
+
+    def _is_hex(self, color: str):
+        if color is not None and len(color) != 4 and len(color) != 7:
+            return False
+
+        reg_ex = r'^#(?:[0-9a-fA-F]{3}){1,2}$'
+        return re.search(reg_ex, str(color))
+
+    def _rgb_to_hex(self, rgb):
+        rgb = tuple(rgb[:3])
+        return '#%02x%02x%02x' % rgb
+
+    @checks.admin_or_permissions(manage_server=True)
+    @commands.group(pass_context=True)
+    async def imgwelcome(self, ctx):
+        """Configuration options for the welcome image."""
+        if ctx.invoked_subcommand is None:
+            await send_cmd_help(ctx)
+            return
+
+    @imgwelcome.command(pass_context=True, name="border", no_pm=True)
+    async def imgwelcome_border(self, ctx, bordercolor=None):
+        """Set the profile image border color.
+        Use hex codes for colors and ‘clear’ for transparent."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        default_a = 230
+        valid = True
+
+        if bordercolor == "clear":
+            self.settings[server.id]["BORDER"] = [0, 0, 0, 0]
+        elif self._is_hex(bordercolor):
+            self.settings[server.id]["BORDER"] = self._hex_to_rgb(bordercolor, default_a)
+        else:
+            await self.bot.say('Border color is invalid. Use #000000 as a format.')
+            valid = False
+
+        if valid:
+            await self.bot.say('The profile border color has been set.')
+            await self.save_settings()
+
+    @imgwelcome.command(pass_context=True, name="channel", no_pm=True)
+    async def imgwelcome_channel(self, ctx, channel: discord.Channel):
+        """Set the announcement channel."""
+        server = ctx.message.server
+        if not server.me.permissions_in(channel).send_messages:
+            await self.bot.say("No permissions to speak in that channel.")
+            return
+        await self._data_check(ctx)
+        self.settings[server.id]["CHANNEL"] = channel.id
+        await self.save_settings()
+        await self.bot.send_message(channel, "This channel will be used for welcome messages.")
+
+    @imgwelcome.command(name='clear', pass_context=True, no_pm=True)
+    async def imgwelcome_clear(self, ctx):
+        """Set the background to transparent."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        self.settings[server.id]['BACKGROUND'] = 'data/imgwelcome/transparent.png'
+        await self.save_settings()
+        await self.bot.say('Welcome image background is now transparent.')
+
+    @imgwelcome.command(pass_context=True, name="outline", no_pm=True)
+    async def imgwelcome_outline(self, ctx, outline=None):
+        """Set the text outline. White or black."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        valid = True
+        if outline == "white":
+            self.settings[server.id]["OUTLINE"] = [255, 255, 255, 255]
+            await self.save_settings()
+        elif outline == "black":
+            self.settings[server.id]["OUTLINE"] = [0, 0, 0, 255]
+            await self.save_settings()
+        else:
+            await self.bot.say('Outline color is invalid. Use white or black.')
+            valid = False
+
+        if valid:
+            await self.bot.say('The text outline has been set.')
+
+    @imgwelcome.command(name="preview", pass_context=True, no_pm=True)
+    async def imagewelcome_preview(self, ctx, member: discord.Member=None, number: int=None):
+        """Show a welcome image with the current settings."""
+        server = ctx.message.server
+        channel = ctx.message.channel
+        if member is None:
+            member = ctx.message.author
+        await self._data_check(ctx)
+        channel_object = self.bot.get_channel(channel.id)
+        await self.bot.send_typing(channel_object)
+        image_object = await self._create_welcome(member, member.avatar_url, number)
+        await self.bot.send_file(channel_object, image_object, filename="welcome.png")
+
+    @imgwelcome.command(pass_context=True, name="size", no_pm=True)
+    async def imgwelcome_profilesize(self, ctx, profilesize: int):
+        """Set the profile size in pixels. Use one number, 128 is recommended."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        if profilesize is 0:
+            await self.bot.say("Profile picture size must be larger than 0.")
+            return
+        else:
+            self.settings[server.id]["CIRCLE"] = [profilesize, profilesize]
+            await self.save_settings()
+            await self.bot.say('The profile picture size has been set.')
+
+    @imgwelcome.command(pass_context=True, name="text", no_pm=True)
+    async def imgwelcome_text(self, ctx, textcolor: str, servercolor: str):
+        """Set text colors. Use hex code for colors."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        default_a = 230
+        valid = True
+
+        if self._is_hex(textcolor):
+            self.settings[server.id]["TEXT"] = self._hex_to_rgb(textcolor, default_a)
+        else:
+            await self.bot.say('Welcome text color is invalid. Use #000000 as a format.')
+            valid = False
+
+        if self._is_hex(servercolor):
+            self.settings[server.id]["SERVERTEXT"] = self._hex_to_rgb(servercolor, default_a)
+        else:
+            await self.bot.say('Server text color is invalid. Use #000000 as a format.')
+            valid = False
+
+        if valid:
+            await self.bot.say('The text colors have been set.')
+            await self.save_settings()
+
+    @imgwelcome.command(pass_context=True, name="toggle", no_pm=True)
+    async def imgwelcome_toggle(self, ctx):
+        """Toggle welcome messages on the server."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        self.settings[server.id]["ANNOUNCE"] = not self.settings[server.id]["ANNOUNCE"]
+        if self.settings[server.id]["ANNOUNCE"]:
+            await self.bot.say("Now welcoming new users.")
+        else:
+            await self.bot.say("No longer welcoming new users.")
+        await self.save_settings()
+
+    @imgwelcome.command(name='upload', pass_context=True, no_pm=True)
+    async def imgwelcome_upload(self, ctx, default=None):
+        """Upload a background through Discord. 500px x 150px.
+        This must be an image file and not a url."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        await self.bot.say("Please send the file to use as a background. File must be 500px x 150px.")
+        answer = await self.bot.wait_for_message(timeout=30, author=ctx.message.author)
+
+        try:
+            bg_url = answer.attachments[0]["url"]
+            success = True
+        except Exception as e:
+            success = False
+            print(e)
+
+        serverimage = Image
+
+        if success:
+            try:
+                async with self.session.get(bg_url) as r:
+                    image = await r.content.read()
+                    if not os.path.exists('data/imgwelcome/{}'.format(server.id)):
+                        os.makedirs('data/imgwelcome/{}'.format(server.id))
+                serverbg = 'data/imgwelcome/{}/serverbg.png'.format(server.id)
+                with open(serverbg, 'wb') as f:
+                    f.write(image)
+                    serverimage = Image.open(serverbg).convert('RGBA')
+                    success = True
+
+            except Exception as e:
+                success = False
+                print(e)
+            if success:
+                if serverimage.size == (500, 150):
+                    self.settings[server.id]['BACKGROUND'] = "data/imgwelcome/" + ctx.message.server.id + "/serverbg.png"
+                    await self.save_settings()
+                else:
+                    await self.bot.say("Image needs to be 500x150.")
+                    return
+                background_img = ('data/imgwelcome/{}/serverbg.png'.format(server.id))
+                self.settings[server.id]['BACKGROUND'] = (background_img)
+                await self.save_settings()
+                await self.bot.say('Welcome image for this server set to uploaded file.')
+            else:
+                await self.bot.say("Couldn't get the image from Discord.")
+        else:
+            await self.bot.say("Couldn't get the image.")
+
+    @imgwelcome.group(pass_context=True, name='bonus', no_pm=True)
+    async def imgwelcome_bonus(self, ctx):
+        """Toggle display of additional text welcome messages when a user joins the server."""
+        if ctx.invoked_subcommand is None or isinstance(ctx.invoked_subcommand, commands.Group):
+            await send_cmd_help(ctx)
+            return
+
+    @imgwelcome_bonus.command(pass_context=True, name='user', no_pm=True)
+    async def bonus_user(self, ctx):
+        """Toggle text announcement when a user is x 100th to join or #1337."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        self.settings[server.id]["BONUSES"]["SPECIAL_USERS"] = not self.settings[server.id]["BONUSES"]["SPECIAL_USERS"]
+        await self.save_settings()
+        if self.settings[server.id]["BONUSES"]["SPECIAL_USERS"]:
+            msg = "I will now announce when special users join."
+        else:
+            msg = "I will no longer announce when special users join."
+        await self.bot.say(msg)
+
+    @imgwelcome_bonus.command(pass_context=True, name='warn', no_pm=True)
+    async def bonus_warn(self, ctx):
+        """Toggle text announcement when a new user's account is <7d old."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        self.settings[server.id]["BONUSES"]["ACCOUNT_WARNINGS"] = not self.settings[server.id]["BONUSES"]["ACCOUNT_WARNINGS"]
+        await self.save_settings()
+        if self.settings[server.id]["BONUSES"]["ACCOUNT_WARNINGS"]:
+            msg = "I will now announce when new accounts join."
+        else:
+            msg = "I will no longer announce when new accounts join."
+        await self.bot.say(msg)
+
+    @imgwelcome.group(pass_context=True, name='font', no_pm=True)
+    async def imgwelcome_font(self, ctx):
+        """Place your font files in the data/imgwelcome/fonts/ directory.
+        Valid font areas to change are: welcome, server and name.
+        """
+        if ctx.invoked_subcommand is None or isinstance(ctx.invoked_subcommand, commands.Group):
+            await send_cmd_help(ctx)
+            return
+
+    @imgwelcome_font.command(pass_context=True, name='list', no_pm=True)
+    async def fontg_list(self, ctx):
+        """List fonts in the directory."""
+        channel = ctx.message.channel
+        directory = "data/imgwelcome/fonts/"
+        fonts = sorted(os.listdir(directory))
+
+        if len(fonts) == 0:
+            await self.bot.send_message(channel, "No fonts found. Place "
+                                        "fonts in /data/imgwelcome/fonts/.")
+            return
+
+        pager = commands.formatter.Paginator(prefix='```', suffix='```', max_size=2000)
+        pager.add_line('Current fonts:')
+        for font_name in fonts:
+            pager.add_line(font_name)
+        for page in pager.pages:
+            await self.bot.send_message(channel, page)
+
+    @imgwelcome_font.command(pass_context=True, name='name', no_pm=True)
+    async def fontg_name(self, ctx, font_name: str, size: int=None):
+        """Change the name text font.
+        e.g. [p]imgwelcome font name "UniSansHeavy.otf"
+        """
+        await self._data_check(ctx)
+        server = ctx.message.server
+
+        directory = "data/imgwelcome/fonts/"
+        if size is None:
+            size = self.settings[server.id]["FONT"]["NAME_FONT"]["SIZE"]["NORMAL"]
+
+        try:
+            ImageFont.truetype(directory + font_name, size)
+        except:
+            await self.bot.say("I could not find that font file.")
+            return
+
+        self.settings[server.id]["FONT"]["NAME_FONT"]["PATH"] = directory + font_name
+        self.settings[server.id]["FONT"]["NAME_FONT"]["SIZE"]["NORMAL"] = size
+        self.settings[server.id]["FONT"]["NAME_FONT"]["SIZE"]["MEDIUM"] = size - 8
+        self.settings[server.id]["FONT"]["NAME_FONT"]["SIZE"]["SMALL"] = size - 12
+        self.settings[server.id]["FONT"]["NAME_FONT"]["SIZE"]["SMALLEST"] = size - 18
+        await self.save_settings()
+        await self.bot.say("Name font changed to: {}".format(font_name[:-4]))
+
+    @imgwelcome_font.command(pass_context=True, name='server', no_pm=True)
+    async def fontg_server(self, ctx, font_name: str, size: int=None):
+        """Change the server text font."""
+        await self._data_check(ctx)
+        server = ctx.message.server
+
+        directory = "data/imgwelcome/fonts/"
+        if size is None:
+            size = self.settings[server.id]["FONT"]["SERVER_FONT"]["SIZE"]
+
+        try:
+            ImageFont.truetype(directory + font_name, size)
+        except:
+            await self.bot.say("I could not find that font file.")
+            return
+
+        self.settings[server.id]["FONT"]["SERVER_FONT"]["PATH"] = directory + font_name
+        self.settings[server.id]["FONT"]["SERVER_FONT"]["SIZE"] = size
+        await self.save_settings()
+        await self.bot.say("Server text font changed to: {}".format(font_name[:-4]))
+        pass
+
+    @imgwelcome_font.command(pass_context=True, name='welcome', no_pm=True)
+    async def fontg_welcome(self, ctx, font_name: str, size: int=None):
+        """Change the welcome text font."""
+        # try open file_name, if fail tell user
+        # if opens change settings, tell user success
+        # if file_name doesn't exist, list available fonts
+        await self._data_check(ctx)
+        server = ctx.message.server
+
+        directory = "data/imgwelcome/fonts/"
+        if size is None:
+            size = self.settings[server.id]["FONT"]["WELCOME_FONT"]["SIZE"]
+
+        try:
+            ImageFont.truetype(directory + font_name, size)
+        except:
+            await self.bot.say("I could not find that font file.")
+            return
+
+        self.settings[server.id]["FONT"]["WELCOME_FONT"]["PATH"] = directory + font_name
+        self.settings[server.id]["FONT"]["WELCOME_FONT"]["SIZE"] = size
+        await self.save_settings()
+        await self.bot.say("Welcome font changed to: {}".format(font_name[:-4]))
+        pass
+
+    @imgwelcome.command(name="version", pass_context=True, hidden=True)
+    async def imagewelcomeset_version(self):
+        """Displays the imgwelcome version."""
+        await self.bot.say("imgwelcome version {}.".format(self.version))
+
+    async def on_member_join(self, member):
+        server = member.server
+        if server.id not in self.settings:
+            self.settings[server.id] = deepcopy(default_settings)
+            await self.save_settings()
+        if not self.settings[server.id]["ANNOUNCE"]:
+            return
+        channelid = self.settings[server.id]["CHANNEL"]
+        channel_object = self.bot.get_channel(channelid)
+        await self.bot.send_typing(channel_object)
+        image_object = await self._create_welcome(member, member.avatar_url)
+        await self.bot.send_file(channel_object, image_object, filename="welcome.png")
+        if ((len(member.server.members) % 100) == 0 or (len(member.server.members) == 1337)) and self.settings[server.id]["BONUSES"]["SPECIAL_USERS"]:
+            msg = "\N{PARTY POPPER} Thanks <@" + member.id + ">, you're the ***" + str(len(member.server.members)) + "*** th user on this server! \N{PARTY POPPER}"
+            await self.bot.send_message(channel_object, msg)
+        date_join = datetime.datetime.strptime(str(member.created_at), "%Y-%m-%d %H:%M:%S.%f")
+        date_now = datetime.datetime.now(datetime.timezone.utc)
+        date_now = date_now.replace(tzinfo=None)
+        since_join = date_now - date_join
+        if since_join.days < 7 and self.settings[server.id]["BONUSES"]["ACCOUNT_WARNINGS"]:
+            await self.bot.send_message(channel_object, "\N{WARNING SIGN} This account was created less than a week ago (" + str(since_join.days) + " days ago)")
+
+
+def check_folders():
+    if not os.path.exists('data/imgwelcome/'):
+        os.mkdir('data/imgwelcome/')
+
+
+def check_files():
+    if not dataIO.is_valid_json('data/imgwelcome/settings.json'):
+        defaults = {}
+        dataIO.save_json('data/imgwelcome/settings.json', defaults)
+
+
+def setup(bot):
+    check_folders()
+    check_files()
+    bot.add_cog(ImgWelcome(bot))

imgwelcome/info.json

@@ -0,0 +1,9 @@
+{
+    "AUTHOR" : "aikaterna",
+    "INSTALL_MSG" : "Use [p]imgwelcome to change settings.",
+    "NAME" : "imgwelcome",
+    "SHORT" : "Welcome users to your server with an image.",
+    "DESCRIPTION" : "Welcome users to your server with an image.",
+    "REQUIREMENTS": ["Pillow"],
+    "TAGS": ["welcome", "welcome image", "images"]
+}

info.json

@@ -1,7 +1,7 @@
 {
-    "author" : ["aikaterna (aikaterna#1393)"],
-    "install_msg" : "Thanks for installing. Please submit issue reports on my repo if something's broken. You can find me in the Red servers or at the invite on my repo.",
-    "name" : "aikaterna-cogs",
-    "short" : "Utility and fun cogs",
-    "description" : "Cogs requested by others, personal cogs, or orphaned cogs."
+    "AUTHOR" : "aikaterna",
+    "INSTALL_MSG" : "Thanks for installing. Please PR any issues or code changes, I'm sure some cogs of mine will need some work.",
+    "NAME" : "aikaterna-cogs",
+    "SHORT" : "Some cogs I've mashed together while learning Python.",
+    "DESCRIPTION" : "Someday, this repository will have cogs that I actually wrote by myself. Until then, enjoy my learning process of taking code and modifying it."
 }

inspirobot/__init__.py

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

inspirobot/info.json

@@ -1,16 +0,0 @@
-{
-	"author": [
-		"aikaterna"
-	],
-	"description": "Fetch a random 'inspiring' message from http://inspirobot.me",
-    "install_msg": "Thanks for installing, have fun.",
-    "permissions" : [
-		"embed_links"
-	],
-	"short": "Fetch 'inspiring' messages.",
-	"tags": [
-		"inspire",
-        "inspirobot"
-	],
-	"type": "COG"
-}

inspirobot/inspirobot.py

@@ -1,27 +0,0 @@
-import aiohttp
-import discord
-from redbot.core import commands
-
-
-class Inspirobot(commands.Cog):
-    """Posts images generated by https://inspirobot.me"""
-    def __init__(self, bot):
-        self.bot = bot
-        self.session = aiohttp.ClientSession()
-
-    @commands.command()
-    async def inspireme(self, ctx):
-        """Fetch a random "inspirational message" from the bot."""
-        try:
-            async with self.session.request(
-                "GET", "http://inspirobot.me/api?generate=true"
-            ) as page:
-                pic = await page.text(encoding="utf-8")
-                em = discord.Embed()
-                em.set_image(url=pic)
-                await ctx.send(embed=em)
-        except Exception as e:
-            await ctx.send(f"Oops, there was a problem: {e}")
-
-    def cog_unload(self):
-        self.bot.loop.create_task(self.session.close())

invites/__init__.py

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

invites/info.json

@@ -1,11 +0,0 @@
-{
-	"author": ["aikaterna"],
-	"description": "Invite count display and leaderboard.",
-    "install_msg": "Thanks for installing. Use `[p]invites` to get started.",
-	"short": "Invite count display and leaderboard.",
-	"tags": ["invites"],
-	"min_bot_version": "3.3.10",
-	"permissions": ["administrator", "embed_links"],
-	"type": "COG"
-}
-

invites/invites.py

@@ -1,284 +0,0 @@
-from __future__ import annotations
-import discord
-from datetime import datetime
-import re
-from typing import List, Callable
-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}$")
-
-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"
-
-
-class Invites(commands.Cog):
-    def __init__(self, bot):
-        self.bot = bot
-        self.config = Config.get_conf(self, 2713371001, force_registration=True)
-
-        default_guild = {"pinned_invites": []}
-
-        self.config.register_guild(**default_guild)
-
-    @commands.guild_only()
-    @commands.group()
-    async def invites(self, ctx: commands.Context):
-        """Invite information."""
-        pass
-
-    @commands.max_concurrency(1, commands.BucketType.user)
-    @invites.command()
-    async def show(self, ctx: commands.Context, invite_code_or_url: str = None):
-        """Show the stats for an invite, or show all invites."""
-        if not ctx.me.permissions_in(ctx.channel).administrator:
-            return await self._send_embed(ctx, PERM_MSG)
-
-        if not invite_code_or_url:
-            pages = MenuPages(await ctx.guild.invites())
-            await self._menu(ctx, pages)
-        else:
-            invite_code = await self._find_invite_code(invite_code_or_url)
-            if not invite_code:
-                return await self._send_embed(ctx, FAILURE_MSG)
-
-    @invites.command()
-    async def leaderboard(self, ctx: commands.Context, list_all_invites: bool = False):
-        """List pinned invites or all invites in a leaderboard style."""
-        if not ctx.me.permissions_in(ctx.channel).administrator:
-            return await self._send_embed(ctx, PERM_MSG)
-
-        if not list_all_invites:
-            pinned_invites = await self.config.guild(ctx.guild).pinned_invites()
-            if not pinned_invites:
-                return await self._send_embed(ctx, "No invites are pinned, or there are no invites to display.")
-        else:
-            pinned_invites = await ctx.guild.invites()
-        invite_info = ""
-        for i, invite_code_or_object in enumerate(pinned_invites):
-            if not list_all_invites:
-                inv_object = await self._get_invite_from_code(ctx, invite_code_or_object)
-            else:
-                inv_object = invite_code_or_object
-            max_uses = await self.get_invite_max_uses(ctx, inv_object)
-            inv_details = f"{i+1}. {inv_object.url} [ {inv_object.uses} uses / {max_uses} max ]\n"
-            invite_info += inv_details
-        embed = discord.Embed(title=f"Invite Usage for {ctx.guild.name}", description=invite_info)
-        if not list_all_invites:
-            embed.set_footer(text="Only displaying pinned invites.")
-        else:
-            embed.set_footer(text="Displaying all invites.")
-        await ctx.send(embed=embed)
-
-    @invites.command(aliases=["listpinned"])
-    async def listpin(self, ctx: commands.Context):
-        """List pinned invites."""
-        pinned_invites = await self.config.guild(ctx.guild).pinned_invites()
-        invite_list = "None." if len(pinned_invites) == 0 else "\n".join(pinned_invites)
-        await self._send_embed(ctx, "Pinned Invites", invite_list)
-
-    @invites.command()
-    async def pin(self, ctx: commands.Context, invite_code_or_url: str):
-        """Pin an invite to the leaderboard."""
-        if not ctx.me.permissions_in(ctx.channel).administrator:
-            return await self._send_embed(ctx, PERM_MSG)
-
-        invite_code = await self._find_invite_code(invite_code_or_url)
-        invite_code = await self._check_invite_code(ctx, invite_code)
-        if not invite_code:
-            return await self._send_embed(ctx, FAILURE_MSG)
-
-        existing_pins = await self.config.guild(ctx.guild).pinned_invites()
-        if invite_code not in existing_pins:
-            existing_pins.append(invite_code)
-            await self.config.guild(ctx.guild).pinned_invites.set(existing_pins)
-            await self._send_embed(ctx, f"{invite_code} was added to the pinned list.")
-        else:
-            await self._send_embed(ctx, f"{invite_code} is already in the pinned list.")
-
-    @invites.command()
-    async def unpin(self, ctx: commands.Context, invite_code_or_url: str):
-        """Unpin an invite from the leaderboard."""
-        invite_code = await self._find_invite_code(invite_code_or_url)
-        if not invite_code:
-            return await self._send_embed(ctx, FAILURE_MSG)
-
-        pinned_invites = await self.config.guild(ctx.guild).pinned_invites()
-        if invite_code in pinned_invites:
-            pinned_invites.remove(invite_code)
-        else:
-            return await self._send_embed(ctx, f"{invite_code} isn't in the pinned list.")
-        await self.config.guild(ctx.guild).pinned_invites.set(pinned_invites)
-        await self._send_embed(ctx, f"{invite_code} was removed from the pinned list.")
-
-    @invites.command(hidden=True)
-    async def version(self, ctx):
-        """Invites version."""
-        await self._send_embed(ctx, self.__version__)
-
-    @staticmethod
-    async def _check_invite_code(ctx: commands.Context, invite_code: str):
-        for invite in await ctx.guild.invites():
-            if invite.code == invite_code:
-                return invite_code
-            else:
-                continue
-
-            return None
-
-    @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)
-        if invite_match:
-            return invite_code_or_url
-        else:
-            sep = invite_code_or_url.rfind("/")
-            if sep:
-                try:
-                    invite_code = invite_code_or_url.rsplit("/", 1)[1]
-                    return invite_code
-                except IndexError:
-                    return None
-
-            return None
-
-    @staticmethod
-    async def _get_invite_from_code(ctx: commands.Context, invite_code: str):
-        for invite in await ctx.guild.invites():
-            if invite.code == invite_code:
-                return invite
-            else:
-                continue
-
-            return None
-
-    @classmethod
-    async def get_invite_max_uses(self, ctx: commands.Context, invite_object: discord.Invite):
-        if invite_object.max_uses == 0:
-            return "\N{INFINITY}"
-        else:
-            return invite_object.max_uses
-
-    async def _menu(self, ctx: commands.Context, pages: List[discord.Embed]):
-        # `wait` in this function is whether the menus wait for completion.
-        # An example of this is with concurrency:
-        # If max_concurrency's wait arg is False (the default):
-        # This function's wait being False will not follow the expected max_concurrency behaviour
-        # This function's wait being True will follow the expected max_concurrency behaviour
-        await MenuActions(source=pages, delete_message_after=False, clear_reactions_after=True, timeout=180).start(
-            ctx, wait=True
-        )
-
-    @staticmethod
-    async def _send_embed(ctx: commands.Context, title: str = None, description: str = None):
-        title = "\N{ZERO WIDTH SPACE}" if title is None else title
-        embed = discord.Embed()
-        embed.title = title
-        if description:
-            embed.description = description
-        embed.colour = await ctx.embed_colour()
-        await ctx.send(embed=embed)
-
-
-class MenuPages(menus.ListPageSource):
-    def __init__(self, methods: List[discord.Invite]):
-        super().__init__(methods, per_page=1)
-
-    async def format_page(self, menu: MenuActions, invite: discord.Invite) -> discord.Embed:
-        # Use the menu to generate pages as they are needed instead of giving it a list of
-        # already-generated embeds.
-        embed = discord.Embed(title=f"Invites for {menu.ctx.guild.name}")
-        max_uses = await Invites.get_invite_max_uses(menu.ctx, invite)
-        msg = f"{cf.bold(invite.url)}\n\n"
-        msg += f"Uses: {invite.uses}/{max_uses}\n"
-        msg += f"Target Channel: {invite.channel.mention}\n"
-        msg += f"Created by: {invite.inviter.mention}\n"
-        msg += f"Created at: {invite.created_at.strftime('%m-%d-%Y @ %H:%M:%S UTC')}\n"
-        if invite.temporary:
-            msg += "Temporary invite\n"
-        if invite.max_age == 0:
-            max_age = f""
-        else:
-            max_age = f"Max age: {self._dynamic_time(int(invite.max_age))}"
-        msg += f"{max_age}"
-        embed.description = msg
-
-        return embed
-
-    @staticmethod
-    def _dynamic_time(time: int):
-        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)
-
-
-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.
-        This is passed to :meth:`discord.ext.commands.Bot.wait_for <Bot.wait_for>`.
-
-        There should be no reason to override this function for most users.
-        This is done this way in this cog to let a bot owner operate the menu
-        along with the original command invoker.
-
-        Parameters
-        ------------
-        payload: :class:`discord.RawReactionActionEvent`
-            The payload to check.
-
-        Returns
-        ---------
-        :class:`bool`
-            Whether the payload should be processed.
-        """
-        if payload.message_id != self.message.id:
-            return False
-        if payload.user_id not in (*self.bot.owner_ids, self._author_id):
-            return False
-
-        return payload.emoji in self.buttons
-
-    async def show_checked_page(self, page_number: int) -> None:
-        # This is a custom impl of show_checked_page that allows looping around back to the
-        # beginning of the page stack when at the end and using next, or looping to the end
-        # when at the beginning page and using prev.
-        max_pages = self._source.get_max_pages()
-        try:
-            if max_pages is None:
-                await self.show_page(page_number)
-            elif page_number >= max_pages:
-                await self.show_page(0)
-            elif page_number < 0:
-                await self.show_page(max_pages - 1)
-            elif max_pages > page_number >= 0:
-                await self.show_page(page_number)
-        except IndexError:
-            pass
-
-    @menus.button("\N{UP-POINTING RED TRIANGLE}", position=menus.First(1))
-    async def prev(self, payload: discord.RawReactionActionEvent):
-        await self.show_checked_page(self.current_page - 1)
-
-    @menus.button("\N{DOWN-POINTING RED TRIANGLE}", position=menus.First(2))
-    async def next(self, payload: discord.RawReactionActionEvent):
-        await self.show_checked_page(self.current_page + 1)
-
-    @menus.button("\N{CROSS MARK}", position=menus.Last(0))
-    async def close_menu(self, payload: discord.RawReactionActionEvent) -> None:
-        self.stop()

luigipoker/__init__.py

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

luigipoker/info.json

@@ -1,8 +0,0 @@
-{
-	"author": ["aikaterna", "themario30"],
-	"description": "Play the Luigi Poker minigame from New Super Mario Brothers.",
-	"install_msg": "Thanks for installing.",
-	"short": "A Luigi poker minigame.",
-	"tags": ["poker", "game"],
-	"type": "COG"
-}

luigipoker/luigipoker.py

@@ -1,426 +0,0 @@
-import asyncio
-import logging
-from random import randint
-from redbot.core import commands, checks
-from redbot.core.utils.chat_formatting import box
-from redbot.core.utils.predicates import MessagePredicate
-
-
-log = logging.getLogger("red.aikaterna.luigipoker")
-
-
-class Card:
-    def __init__(self, card_number=None):
-        self._number = card_number if card_number else randint(1, 6)
-        self._suit = self._suit()
-
-    def _suit(self):
-        if self._number == 1:
-            suit = "\N{CLOUD}\N{VARIATION SELECTOR-16}"
-        elif self._number == 2:
-            suit = "\N{MUSHROOM}"
-        elif self._number == 3:
-            suit = "\N{SUNFLOWER}"
-        elif self._number == 4:
-            suit = "\N{LARGE GREEN SQUARE}"
-        elif self._number == 5:
-            suit = "\N{LARGE RED SQUARE}"
-        elif self._number == 6:
-            suit = "\N{WHITE MEDIUM STAR}"
-        else:
-            suit = "Error!"
-
-        return suit
-
-    def __repr__(self):
-        return f"{self._suit}"
-
-    def num(self):
-        return self._number
-
-    def suit(self):
-        return self._suit
-
-
-class Deck:
-    def __init__(self):
-        self._length = 5
-        self._deck = self._create_deck()
-        self.first_pair = 0
-        self.second_pair = 0
-        self.new_deck()
-
-    def _create_deck(self):
-        temp = [Card() for x in range(0, self._length)]
-        return temp
-
-    def _new_card(self, i):
-        self._deck[i] = Card()
-
-    def _sort_deck(self):
-        self._deck.sort(key=lambda x: x.num(), reverse=True)
-
-    def new_deck(self):
-        self._deck = self._create_deck()
-        self._sort_deck()
-
-    def deck(self):
-        return self._deck
-
-    def num(self, i):
-        return self._deck[i].num()
-
-    def swap(self, i):
-        for x in i:
-            self._new_card(int(x) - 1)
-        self._sort_deck()
-
-    def suit(self, i):
-        return self._deck[i].suit()
-
-    def len(self):
-        return self._length
-
-
-class LuigiPoker(commands.Cog):
-
-    __version__ = "0.1.1"
-
-    def __init__(self, bot):
-        self.bot = bot
-        self._in_game = {}
-        self._hit = {}
-        self.player_deck = Deck()
-        self.dealer_deck = Deck()
-
-    @commands.group()
-    async def poker(self, ctx):
-        """The Luigi Poker minigame from New Super Mario Brothers."""
-        if ctx.invoked_subcommand is None:
-            space = "\N{EN SPACE}"
-            msg = (
-                f"I'm Luigi, Number 1!\n"
-                f"This game plays the same as Luigi's "
-                f"Poker in Super Mario 64 DS Minigames.\n"
-                f"The card's worth is based on the suit.\n"
-                f"Starman > Mario > Luigi > Fire Flower > Mushroom > Cloud.\n"
-                f"{space*3}{Card(6)}{space*4}>{space*3}{Card(5)}{space*3}>{space*3}{Card(4)}{space*3}"
-                f">{space*6}{Card(3)}{space*6}>{space*4}{Card(2)}{space*5}>{space*4}{Card(1)}\n"
-                f"---------------------------------------------------------\n"
-                f"The following table represents the winning matches.\n"
-                f"For example, a Full House is greater than Three of a Kind, but "
-                f"less than a Four of a Kind.\n"
-                f"---------------------------------------------------------\n"
-                f"Flush:           {Card(6)}{Card(6)}{Card(6)}{Card(6)}{Card(6)}\n"
-                f"Four of a Kind:  {Card(6)}{Card(6)}{Card(6)}{Card(6)}\n"
-                f"Full House:      {Card(6)}{Card(6)}{Card(6)}{Card(3)}{Card(3)}\n"
-                f"Three of a Kind: {Card(6)}{Card(6)}{Card(6)}\n"
-                f"Two Pairs:       {Card(6)}{Card(6)}{Card(2)}{Card(2)}\n"
-                f"Pair:            {Card(6)}{Card(6)}\n"
-            )
-            await ctx.send(box(msg))
-            return await ctx.send(
-                f"Are you ready to play my game?! What are you waiting for? Start the game using `{ctx.prefix}poker play`!"
-            )
-
-    @poker.command()
-    async def play(self, ctx):
-        """Starts the Game!"""
-        if not self._in_game.get(ctx.guild.id, False):
-            self._in_game[ctx.guild.id] = True
-            self.player_deck.new_deck()
-            self.dealer_deck.new_deck()
-        else:
-            return await ctx.send("You're already in a game...")
-
-        square = "\N{WHITE MEDIUM SMALL SQUARE}"
-        msg = (
-            f"Dealer's Deck: {square*5}\n"
-            f"Your Deck:     {self.player_deck.suit(0)}{self.player_deck.suit(1)}"
-            f"{self.player_deck.suit(2)}{self.player_deck.suit(3)}{self.player_deck.suit(4)}"
-        )
-
-        await ctx.send(box(msg))
-
-        if self._hit.get(ctx.guild.id, False):
-            await ctx.send("`Stay` or `fold`?")
-            answers = ["stay", "fold"]
-        else:
-            await ctx.send("`Stay`, `hit`, or `fold`?")
-            answers = ["stay", "hit", "fold"]
-        await self._play_response(ctx, answers)
-
-    async def _play_response(self, ctx, answers):
-        pred = MessagePredicate.lower_contained_in(answers, ctx=ctx)
-        try:
-            user_resp = await ctx.bot.wait_for("message", timeout=120, check=pred)
-        except asyncio.TimeoutError:
-            await ctx.send("No response.")
-            return await self.fold(ctx)
-        if "stay" in user_resp.content.lower():
-            return await self.stay(ctx)
-        elif "hit" in user_resp.content.lower():
-            return await self.hit(ctx)
-        elif "fold" in user_resp.content.lower():
-            return await self.fold(ctx)
-        else:
-            log.error(
-                "LuigiPoker: Something broke unexpectedly in _play_response. Please report it.",
-                exc_info=True,
-            )
-
-    async def hit(self, ctx):
-        card_question = await ctx.send(
-            "What cards do you want to swap out?\n"
-            "Use numbers 1 through 5 to specify, with commas in between.\n"
-            "Examples: `1,3,5` or `4, 5`"
-        )
-        try:
-            user_resp = await ctx.bot.wait_for(
-                "message", timeout=60, check=MessagePredicate.same_context(ctx)
-            )
-        except asyncio.TimeoutError:
-            await ctx.send("No response.")
-            return await self.fold(ctx)
-
-        user_answers = user_resp.content.strip().split(",")
-        user_answers_valid = list(set(user_answers) & set(["1", "2", "3", "4", "5"]))
-        if len(user_answers_valid) == 0:
-            return await self.hit(ctx)
-
-        await ctx.send("Swapping Cards...")
-        self.player_deck.swap(user_answers_valid)
-        square = "\N{WHITE MEDIUM SMALL SQUARE}"
-        msg = (
-            f"Dealer's Deck: {square*5}\n"
-            f"Your Deck:     {self.player_deck.suit(0)}{self.player_deck.suit(1)}"
-            f"{self.player_deck.suit(2)}{self.player_deck.suit(3)}{self.player_deck.suit(4)}"
-        )
-        await ctx.send(box(msg))
-        await ctx.send("`Stay` or `fold`?")
-        self._hit[ctx.guild.id] = True
-        answers = ["stay", "fold"]
-        await self._play_response(ctx, answers)
-
-    async def fold(self, ctx):
-        msg = "You have folded.\n"
-        msg += box(
-            f"Dealer's Deck: {self.dealer_deck.suit(0)}{self.dealer_deck.suit(1)}"
-            f"{self.dealer_deck.suit(2)}{self.dealer_deck.suit(3)}{self.dealer_deck.suit(4)}\n"
-            f"Your Deck:     {self.player_deck.suit(0)}{self.player_deck.suit(1)}"
-            f"{self.player_deck.suit(2)}{self.player_deck.suit(3)}{self.player_deck.suit(4)}"
-        )
-
-        self._in_game[ctx.guild.id] = False
-        self._hit[ctx.guild.id] = False
-        await ctx.send(msg)
-
-    async def stay(self, ctx):
-        say = ""
-        win = False
-        same_move = False
-        tied = False
-
-        # Flush
-        if self.flush(self.player_deck) != self.flush(self.dealer_deck):
-            say = "a Flush"
-            if self.flush(self.player_deck):
-                win = True
-        elif self.flush(self.player_deck) and self.flush(self.dealer_deck):
-            say = "Flush"
-            same_move = True
-            if self.player_deck.first_pair > self.dealer_deck.first_pair:
-                win = True
-            elif self.player_deck.first_pair == self.dealer_deck.first_pair:
-                tied = True
-
-        # Four of a Kind
-        elif self.four_of_a_kind(self.player_deck) != self.four_of_a_kind(self.dealer_deck):
-            say = "a Four of a Kind"
-            if self.four_of_a_kind(self.player_deck):
-                win = True
-        elif self.four_of_a_kind(self.player_deck) and self.four_of_a_kind(self.dealer_deck):
-            say = "Four of a Kind"
-            same_move = True
-            if self.player_deck.first_pair > self.dealer_deck.first_pair:
-                win = True
-            elif self.player_deck.first_pair == self.dealer_deck.first_pair:
-                tied = True
-
-        # Full House
-        elif self.full_house(self.player_deck) != self.full_house(self.dealer_deck):
-            say = "a Full House"
-            if self.full_house(self.player_deck):
-                win = True
-        elif self.full_house(self.player_deck) and self.full_house(self.dealer_deck):
-            say = "Full House"
-            same_move = True
-            if self.player_deck.first_pair > self.dealer_deck.first_pair:
-                win = True
-            elif self.player_deck.second_pair > self.dealer_deck.second_pair:
-                win = True
-            elif (
-                self.player_deck.first_pair == self.dealer_deck.first_pair
-                and self.player_deck.second_pair == self.dealer_deck.second_pair
-            ):
-                tied = True
-
-        # Full House
-        elif self.three_of_a_kind(self.player_deck) != self.three_of_a_kind(self.dealer_deck):
-            say = "a Three of a Kind"
-            if self.three_of_a_kind(self.player_deck):
-                win = True
-        elif self.three_of_a_kind(self.player_deck) and self.three_of_a_kind(self.dealer_deck):
-            say = "Three of a Kind"
-            same_move = True
-            if self.player_deck.first_pair > self.dealer_deck.first_pair:
-                win = True
-            elif self.player_deck.first_pair == self.dealer_deck.first_pair:
-                tied = True
-
-        # Two Pairs
-        elif self.two_pair(self.player_deck) != self.two_pair(self.dealer_deck):
-            say = "Two Pairs"
-            if self.two_pair(self.player_deck):
-                win = True
-        elif self.two_pair(self.player_deck) and self.two_pair(self.dealer_deck):
-            say = "Two Pairs"
-            same_move = True
-            if self.player_deck.first_pair > self.dealer_deck.first_pair:
-                win = True
-            elif self.player_deck.second_pair > self.dealer_deck.second_pair:
-                win = True
-            elif (
-                self.player_deck.first_pair == self.dealer_deck.first_pair
-                and self.player_deck.second_pair == self.dealer_deck.second_pair
-            ):
-                tied = True
-
-        # One Pair
-        elif self.one_pair(self.player_deck) != self.one_pair(self.dealer_deck):
-            say = "a Pair"
-            if self.one_pair(self.player_deck):
-                win = True
-        elif self.one_pair(self.player_deck) and self.one_pair(self.dealer_deck):
-            say = "Pair"
-            same_move = True
-            if self.player_deck.first_pair > self.dealer_deck.first_pair:
-                win = True
-            elif self.player_deck.first_pair == self.dealer_deck.first_pair:
-                tied = True
-        else:
-            tied = True
-
-        msg = "You've stayed.\n"
-
-        if same_move:
-            if win:
-                msg += f"You won! Your {say} is greater than Dealer's {say}!"
-            else:
-                msg += f"You lost! The Dealer's {say} is greater than your {say}!"
-        elif win:
-            msg += f"You won! You got {say}!"
-        elif tied:
-            msg += "Both the Dealer and the Player have tied."
-        else:
-            msg += f"You lost! The Dealer got {say}."
-
-        msg += box(
-            f"Dealer's Deck: {self.dealer_deck.suit(0)}{self.dealer_deck.suit(1)}"
-            f"{self.dealer_deck.suit(2)}{self.dealer_deck.suit(3)}{self.dealer_deck.suit(4)}\n"
-            f"Your Deck:     {self.player_deck.suit(0)}{self.player_deck.suit(1)}"
-            f"{self.player_deck.suit(2)}{self.player_deck.suit(3)}{self.player_deck.suit(4)}"
-        )
-        self._in_game[ctx.guild.id] = False
-        self._hit[ctx.guild.id] = False
-        await ctx.send(msg)
-
-    @staticmethod
-    def one_pair(deck):
-        answer = False
-        for x in range(0, deck.len() - 1):
-            if deck.num(x) == deck.num(x + 1):
-                deck.first_pair = deck.num(x)
-                answer = True
-
-        return answer
-
-    @staticmethod
-    def two_pair(deck):
-        answer = False
-        first_pair = 0
-        second_pair = 0
-
-        for x in range(0, deck.len() - 1):
-            if deck.num(x) == deck.num(x + 1):
-                if first_pair == 0:
-                    first_pair = deck.num(x)
-                elif first_pair != deck.num(x) and second_pair == 0:
-                    second_pair = deck.num(x)
-
-        if first_pair != 0 and second_pair != 0:
-            deck.first_pair = first_pair
-            deck.second_pair = second_pair
-            answer = True
-
-        return answer
-
-    @staticmethod
-    def three_of_a_kind(deck):
-        answer = False
-        for x in range(0, deck.len() - 2):
-            if deck.num(x) == deck.num(x + 1) and deck.num(x + 1) == deck.num(x + 2):
-                deck.first_pair = deck.num(x)
-                answer = True
-
-        return answer
-
-    @staticmethod
-    def full_house(deck):
-        answer = False
-        first_pair = 0
-        second_pair = 0
-        for x in range(0, deck.len() - 2):
-            if deck.num(x) == deck.num(x + 1) and deck.num(x + 1) == deck.num(x + 2):
-                if first_pair == 0:
-                    first_pair = deck.num(x)
-        for x in range(0, deck.len() - 1):
-            if deck.num(x) == deck.num(x + 1):
-                if first_pair != deck.num(x) and second_pair == 0:
-                    second_pair = deck.num(x)
-
-        if first_pair != 0 and second_pair != 0:
-            deck.first_pair = first_pair
-            deck.second_pair = second_pair
-            answer = True
-
-        return answer
-
-    @staticmethod
-    def four_of_a_kind(deck):
-        answer = False
-        for x in range(0, deck.len() - 3):
-            if (
-                deck.num(x) == deck.num(x + 1)
-                and deck.num(x + 1) == deck.num(x + 2)
-                and deck.num(x + 2) == deck.num(x + 3)
-            ):
-                deck.first_pair = deck.num(x)
-                answer = True
-
-        return answer
-
-    @staticmethod
-    def flush(deck):
-        answer = False
-        x = 0
-        if (
-            deck.num(x) == deck.num(x + 1)
-            and deck.num(x + 1) == deck.num(x + 2)
-            and deck.num(x + 2) == deck.num(x + 3)
-            and deck.num(x + 3) == deck.num(x + 4)
-        ):
-            deck.first_pair = deck.num(x)
-            answer = True
-
-        return answer

modclean/info.json

@@ -0,0 +1,8 @@
+{
+    "AUTHOR" : "aikaterna and sitryk",
+    "INSTALL_MSG" : "Use `[p]modclean #mod-log` to clean your mod log channel. Edits out Discord invite links from banned or kicked users.",
+    "NAME" : "modclean",
+    "SHORT" : "Clean your mod log channel of Discord invite names.",
+    "DESCRIPTION" : "Clean your mod log channel of Discord invite names.",
+    "TAGS": ["modlog"]
+}

modclean/modclean.py

@@ -0,0 +1,40 @@
+import discord
+import re
+from cogs.utils import checks
+from discord.ext import commands
+
+
+class ModClean:
+    def __init__(self, bot):
+        self.bot = bot
+
+    @commands.command(no_pm=True, pass_context=True)
+    @checks.is_owner()
+    async def modclean(self, ctx, modchannel: discord.Channel = None):
+        """Clean a v2 mod-log channel of invite names."""
+        if not modchannel:
+            return await self.bot.say(
+                "Please use the mod channel in the command. ({}modclean #channelname)".format(
+                    ctx.prefix
+                )
+            )
+
+        IL_raw = r"(discordapp.com/invite|discord.me|discord.gg)(?:/#)?(?:/invite)?/([a-z0-9\-]+)"
+        InvLink = re.compile(IL_raw, re.I)
+
+        try:
+            async for m in self.bot.logs_from(modchannel, 100):
+                if not (m.author == ctx.message.server.me):
+                    continue
+                elif InvLink.search(m.content) is None:
+                    continue
+                else:
+                    new_cont = InvLink.sub("[REMOVED LINK]", m.content)
+                    await self.bot.edit_message(m, new_cont)
+        except discord.errors.Forbidden:
+            return await self.bot.say("No permissions to read that channel.")
+        await self.bot.say("Done.")
+
+
+def setup(bot):
+    bot.add_cog(ModClean(bot))

noflippedtables/__init__.py

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

noflippedtables/info.json

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

noflippedtables/noflippedtables.py

@@ -1,131 +0,0 @@
-import asyncio
-from random import uniform as randfloat
-import re
-from redbot.core import commands, checks, Config
-from redbot.core.utils.chat_formatting import box
-
-
-class NoFlippedTables(commands.Cog):
-    """For the table sympathizers"""
-
-    def __init__(self, bot):
-        self.bot = bot
-        self.config = Config.get_conf(self, 2712290002, force_registration=True)
-
-        default_guild = {
-            "ALL_TABLES": True,
-            "BOT_EXEMPT": False,
-            "SNACKBEAR": False,
-            "TOGGLE": False,
-        }
-
-        self.config.register_guild(**default_guild)
-
-        self.flippedTables = {}
-
-    @checks.mod_or_permissions(manage_guild=True)
-    @commands.group()
-    async def tableset(self, ctx):
-        """Got some nice settings for my UNflipped tables"""
-        if ctx.invoked_subcommand is None:
-            settings = await self.config.guild(ctx.guild).all()
-            msg = "[Current Settings]\n"
-            for k, v in settings.items():
-                msg += str(k) + ": " + str(v) + "\n"
-            await ctx.send(box(msg, lang="ini"))
-
-    @tableset.command()
-    async def flipall(self, ctx):
-        """Enables/disables right all unflipped tables in a message"""
-        settings = await self.config.guild(ctx.guild).ALL_TABLES()
-        await self.config.guild(ctx.guild).ALL_TABLES.set(not settings)
-        if not settings:
-            await ctx.send("All tables will now be unflipped.")
-        else:
-            await ctx.send("Now only one table unflipped per message.")
-
-    @tableset.command()
-    async def flipbot(self, ctx):
-        """Enables/disables allowing bot to flip tables"""
-        settings = await self.config.guild(ctx.guild).BOT_EXEMPT()
-        await self.config.guild(ctx.guild).BOT_EXEMPT.set(not settings)
-        if not settings:
-            await ctx.send("Bot is now allowed to leave its own tables flipped.")
-        else:
-            await ctx.send("Bot must now unflip tables that itself flips.")
-
-    @tableset.command()
-    async def snackbear(self, ctx):
-        """Snackburr is unflipping tables!"""
-        settings = await self.config.guild(ctx.guild).SNACKBEAR()
-        await self.config.guild(ctx.guild).SNACKBEAR.set(not settings)
-        if not settings:
-            await ctx.send("Snackburr will now unflip tables.")
-        else:
-            await ctx.send("Snackburr is heading off for his errands!")
-
-    @tableset.command()
-    async def toggle(self, ctx):
-        """Toggle the unflipping on or off."""
-        settings = await self.config.guild(ctx.guild).TOGGLE()
-        await self.config.guild(ctx.guild).TOGGLE.set(not settings)
-        if not settings:
-            await ctx.send("No table shall be left unflipped in this server.")
-        else:
-            await ctx.send("No more unflipping here.")
-
-    @commands.Cog.listener()
-    # so much fluff just for this OpieOP
-    async def on_message(self, message):
-        channel = message.channel
-        user = message.author
-        if not message.guild:
-            return
-        if hasattr(user, "bot") and user.bot is True:
-            return
-        toggle = await self.config.guild(message.guild).TOGGLE()
-        if not toggle:
-            return
-        if channel.id not in self.flippedTables:
-            self.flippedTables[channel.id] = {}
-        # ┬─┬ ┬┬ ┻┻ ┻━┻ ┬───┬ ┻━┻ will leave 3 tables left flipped
-        # count flipped tables
-        for m in re.finditer("┻━*┻|┬─*┬", message.content):
-            t = m.group()
-            bot_exempt = await self.config.guild(message.guild).BOT_EXEMPT()
-            if "┻" in t and not (message.author.id == self.bot.user.id and bot_exempt):
-                if t in self.flippedTables[channel.id]:
-                    self.flippedTables[channel.id][t] += 1
-                else:
-                    self.flippedTables[channel.id][t] = 1
-                    all_tables = await self.config.guild(message.guild).ALL_TABLES()
-                    if not all_tables:
-                        break
-            else:
-                f = t.replace("┬", "┻").replace("─", "━")
-                if f in self.flippedTables[channel.id]:
-                    if self.flippedTables[channel.id][f] <= 0:
-                        del self.flippedTables[channel.id][f]
-                    else:
-                        self.flippedTables[channel.id][f] -= 1
-        # wait random time. some tables may be unflipped by now.
-        await asyncio.sleep(randfloat(0, 1.5))
-        tables = ""
-
-        deleteTables = []
-        # unflip tables in self.flippedTables[channel.id]
-        for t, n in self.flippedTables[channel.id].items():
-            snackburr = await self.config.guild(message.guild).SNACKBEAR()
-            if snackburr:
-                unflipped = t.replace("┻", "┬").replace("━", "─") + " ノʕ •ᴥ•ノʔ" + "\n"
-            else:
-                unflipped = t.replace("┻", "┬").replace("━", "─") + " ノ( ゜-゜ノ)" + "\n"
-            for i in range(0, n):
-                tables += unflipped
-                # in case being processed in parallel
-                self.flippedTables[channel.id][t] -= 1
-            deleteTables.append(t)
-        for t in deleteTables:
-            del self.flippedTables[channel.id][t]
-        if tables != "":
-            await channel.send(tables)

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,7 +0,0 @@
-from .otherbot import Otherbot
-
-
-async def setup(bot):
-    cog = Otherbot(bot)
-    await cog.generate_cache()
-    bot.add_cog(cog)

otherbot/info.json

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

otherbot/otherbot.py

@@ -1,412 +1,17 @@
 import discord
-from redbot.core.bot import Red
-from redbot.core import commands, checks, Config
 
-from datetime import datetime
-
-DEFAULT_OFFLINE_EMOJI = "\N{LARGE RED CIRCLE}"
-DEFAULT_ONLINE_EMOJI = "\N{WHITE HEAVY CHECK MARK}"
-
-
-class Otherbot(commands.Cog):
-    __author__ = ["aikaterna", "Predä 。#1001"]
-    __version__ = "0.9"
-
-    def __init__(self, bot: Red):
+class OtherbotStatus:
+    def __init__(self, bot):
         self.bot = bot
-        self.config = Config.get_conf(self, 2730321001, force_registration=True)
-        self.config.register_guild(
-            ping=None,
-            reporting=None,
-            watching=[],
-            online_watching=[],
-            offline_emoji=DEFAULT_OFFLINE_EMOJI,
-            online_emoji=DEFAULT_ONLINE_EMOJI,
-            embed_offline=True,
-            embed_online=True,
-        )
 
-    async def generate_cache(self):
-        self.otherbot_cache = await self.config.all_guilds()
-
-    def cog_unload(self):
-        self.otherbot_cache.clear()
-
-    async def get_watching(self, watch_list: list, watch_type: str, guild: int):
-        data = []
-        for user_id in watch_list:
-            user = self.bot.get_user(user_id)
-            if not user:
-                async with self.config.guild_from_id(guild).all() as config:
-                    config[watch_type].remove(user_id)
-            else:
-                data.append(user.mention)
-        return data
-
-    @commands.group()
-    @commands.guild_only()
-    @checks.admin_or_permissions(manage_roles=True)
-    async def otherbot(self, ctx: commands.Context):
-        """Otherbot configuration options."""
-        # Following logic from Trusty's welcome cog:
-        # https://github.com/TrustyJAID/Trusty-cogs/blob/master/welcome/welcome.py#L81
-        guild = ctx.guild
-        if not ctx.invoked_subcommand:
-            guild_data = await self.config.guild(guild).all()
-            settings_name = dict(
-                ping="Ping role",
-                reporting="Channel reporting",
-                watching="Offline tracking",
-                online_watching="Online tracking",
-                offline_emoji="Offline emoji",
-                online_emoji="Online emoji",
-                embed_offline="Offline embed",
-                embed_online="Online embed",
-            )
-            msg = ""
-            if ctx.channel.permissions_for(ctx.me).embed_links:
-                em = discord.Embed(
-                    color=await ctx.embed_colour(), title=f"Otherbot settings for {guild.name}"
-                )
-                for attr, name in settings_name.items():
-                    if attr == "ping":
-                        role = guild.get_role(guild_data["ping"])
-                        if role:
-                            msg += f"**{name}**: {role.mention}\n"
-                        else:
-                            msg += f"**{name}**: Not set.\n"
-                    elif attr == "reporting":
-                        channel = guild.get_channel(guild_data["reporting"])
-                        if channel:
-                            msg += f"**{name}**: {channel.mention}\n"
-                        else:
-                            msg += f"**{name}**: Not set.\n"
-                    elif attr == "watching":
-                        if guild_data["watching"]:
-                            msg += (
-                                f"**{name}**: "
-                                + " ".join(
-                                    await self.get_watching(
-                                        guild_data["watching"], "watching", guild.id
-                                    )
-                                )
-                                + "\n"
-                            )
-                        else:
-                            msg += f"**{name}**: Not set.\n"
-                    elif attr == "online_watching":
-                        if guild_data["online_watching"]:
-                            msg += (
-                                f"**{name}**: "
-                                + " ".join(
-                                    await self.get_watching(
-                                        guild_data["online_watching"], "online_watching", guild.id
-                                    )
-                                )
-                                + "\n"
-                            )
-                        else:
-                            msg += f"**{name}**: Not set.\n"
-                    else:
-                        msg += f"**{name}**: {guild_data[attr]}\n"
-                em.description = msg
-                em.set_thumbnail(url=guild.icon_url)
-                await ctx.send(embed=em)
-            else:
-                msg = "```\n"
-                for attr, name in settings_name.items():
-                    if attr == "ping":
-                        role = guild.get_role(guild_data["ping"])
-                        if role:
-                            msg += f"{name}: {role.mention}\n"
-                        else:
-                            msg += f"{name}: Not set.\n"
-                    elif attr == "reporting":
-                        channel = guild.get_channel(guild_data["reporting"])
-                        if channel:
-                            msg += f"{name}: {channel.mention}\n"
-                        else:
-                            msg += f"{name}: Not set.\n"
-                    elif attr == "watching":
-                        if guild_data["watching"]:
-                            msg += (
-                                f"{name}: "
-                                + " ".join(
-                                    await self.get_watching(
-                                        guild_data["watching"], "watching", guild.id
-                                    )
-                                )
-                                + "\n"
-                            )
-                        else:
-                            msg += f"{name}: Not set."
-                    elif attr == "online_watching":
-                        if guild_data["online_watching"]:
-                            msg += (
-                                f"{name}: "
-                                + " ".join(
-                                    await self.get_watching(
-                                        guild_data["online_watching"], "online_watching", guild.id
-                                    )
-                                )
-                                + "\n"
-                            )
-                        else:
-                            msg += f"{name}: Not set.\n"
-                    else:
-                        msg += f"**{name}**: {guild_data[attr]}\n"
-                msg += "```"
-                await ctx.send(msg)
-
-    @otherbot.command()
-    async def channel(self, ctx: commands.Context, channel: discord.TextChannel = None):
-        """
-        Sets the channel to report in.
-        
-        Default to the current one.
-        """
-        if not channel:
-            channel = ctx.channel
-        await self.config.guild(ctx.guild).reporting.set(channel.id)
-        await ctx.send(f"Reporting channel set to: {channel.mention}.")
-        await self.generate_cache()
-
-    @otherbot.command()
-    async def pingrole(self, ctx: commands.Context, role_name: discord.Role = None):
-        """Sets the role to use for pinging. Leave blank to reset it."""
-        if not role_name:
-            await self.config.guild(ctx.guild).ping.set(None)
-            return await ctx.send("Ping role cleared.")
-        await self.config.guild(ctx.guild).ping.set(role_name.id)
-        pingrole_id = await self.config.guild(ctx.guild).ping()
-        pingrole_obj = discord.utils.get(ctx.guild.roles, id=pingrole_id)
-        await ctx.send(f"Ping role set to: `{pingrole_obj.name}`.")
-        await self.generate_cache()
-
-    @otherbot.group(name="watch", aliases=["watching"])
-    async def otherbot_watch(self, ctx: commands.Context):
-        """Watch settings."""
-
-    @otherbot_watch.group(name="offline")
-    async def otherbot_watch_offline(self, ctx: commands.Context):
-        """Manage offline notifications."""
-
-    @otherbot_watch_offline.command(name="add")
-    async def otherbot_watch_offline_add(self, ctx: commands.Context, bot: discord.Member):
-        """Add a bot that will be tracked when it goes offline."""
-        if not bot.bot:
-            return await ctx.send(
-                "You can't track normal users. Please try again with a bot user."
-            )
-
-        async with self.config.guild(ctx.guild).watching() as watch_list:
-            watch_list.append(bot.id)
-        await ctx.send(f"I will now track {bot.mention} when it goes offline.")
-        await self.generate_cache()
-
-    @otherbot_watch_offline.command(name="remove")
-    async def otherbot_watch_offline_remove(self, ctx: commands.Context, bot: discord.Member):
-        """Removes a bot currently tracked."""
-        if not bot.bot:
-            return await ctx.send(
-                "You can't choose a normal user. Please try again with a bot user."
-            )
-
-        async with self.config.guild(ctx.guild).watching() as watch_list:
-            try:
-                watch_list.remove(bot.id)
-                await ctx.send(
-                    f"Successfully removed {bot.mention} from offline tracked bot list."
-                )
-            except ValueError:
-                await ctx.send(f"{bot.mention} is not currently tracked.")
-        await self.generate_cache()
-
-    @otherbot_watch_offline.command(name="list")
-    async def otherbot_watch_offline_list(self, ctx: commands.Context):
-        """Lists currently tracked bots."""
-        watching = await self.config.guild(ctx.guild).watching()
-        if not watching:
-            return await ctx.send("There is currently no bots tracked for offline status.")
-
-        watching_list = await self.get_watching(watching, "watching", ctx.guild.id)
-        await ctx.send(
-            f"{len(watching):,} bot{'s' if len(watching) > 1 else ''} are currently tracked for offline status:\n"
-            + ", ".join(watching_list)
-        )
-        await self.generate_cache()
-
-    @otherbot_watch_offline.command(name="emoji")
-    async def otherbot_watch_offline_emoji(self, ctx: commands.Context, *, emoji: str = None):
-        """Choose which emoji that will be used for offline messages."""
-        if not emoji:
-            await self.config.guild(ctx.guild).offline_emoji.set(DEFAULT_OFFLINE_EMOJI)
-            await ctx.send(f"Offline emoji resetted to default: {DEFAULT_OFFLINE_EMOJI}")
+    async def on_member_update(self, before, after):
+        if after.status == discord.Status.offline and after.id == "000000000000000000":  #  this is the bot id that you want to watch
+            channel_object = self.bot.get_channel("000000000000000000") #  this is the channel id for the watcher bot to scream in
+            await self.bot.send_message(channel_object, "<@000000000000000000>, the bot is offline.")  # this is the person to ping and the message
         else:
-            await self.config.guild(ctx.guild).offline_emoji.set(emoji)
-            await ctx.tick()
-        await self.generate_cache()
+            pass
 
-    @otherbot_watch_offline.command(name="embed")
-    async def otherbot_watch_offline_embed(self, ctx: commands.Context):
-        """Set wether you want to receive notifications in embed or not."""
-        current = await self.config.guild(ctx.guild).embed_offline()
-        await self.config.guild(ctx.guild).embed_offline.set(not current)
-        await ctx.send(
-            "I will now send offline notifications in embeds."
-            if not current
-            else "I will no longer send offline notifications in embeds."
-        )
-        await self.generate_cache()
 
-    @otherbot_watch.group(name="online")
-    async def otherbot_watch_online(self, ctx: commands.Context):
-        """Manage online notifications."""
-
-    @otherbot_watch_online.command(name="add")
-    async def otherbot_watch_online_add(self, ctx: commands.Context, bot: discord.Member):
-        """Add a bot that will be tracked when it comes back online."""
-        if not bot.bot:
-            return await ctx.send(
-                "You can't track normal users. Please try again with a bot user."
-            )
-
-        async with self.config.guild(ctx.guild).online_watching() as watch_list:
-            watch_list.append(bot.id)
-        await ctx.send(f"I will now track {bot.mention} when it goes back online.")
-        await self.generate_cache()
-
-    @otherbot_watch_online.command(name="remove")
-    async def otherbot_watch_online_remove(self, ctx: commands.Context, bot: discord.Member):
-        """Removes a bot currently tracked."""
-        if not bot.bot:
-            return await ctx.send(
-                "You can't choose a normal user. Please try again with a bot user."
-            )
-
-        async with self.config.guild(ctx.guild).online_watching() as watch_list:
-            try:
-                watch_list.remove(bot.id)
-                await ctx.send(f"Successfully removed {bot.mention} from online tracked bot list.")
-            except ValueError:
-                await ctx.send(f"{bot.mention} is not currently tracked.")
-        await self.generate_cache()
-
-    @otherbot_watch_online.command(name="list")
-    async def otherbot_watch_online_list(self, ctx: commands.Context):
-        """Lists currently tracked bots."""
-        watching = await self.config.guild(ctx.guild).online_watching()
-        if not watching:
-            return await ctx.send("There is currently no bots tracked for online status.")
-
-        watching_list = await self.get_watching(watching, "online_watching", ctx.guild.id)
-        await ctx.send(
-            f"{len(watching):,} bot{'s' if len(watching) > 1 else ''} are currently tracked for online status:\n"
-            + ", ".join(watching_list)
-        )
-        await self.generate_cache()
-
-    @otherbot_watch_online.command(name="emoji")
-    async def otherbot_watch_online_emoji(self, ctx: commands.Context, *, emoji: str = None):
-        """Choose which emoji that will be used for online messages."""
-        if not emoji:
-            await self.config.guild(ctx.guild).online_emoji.set(DEFAULT_ONLINE_EMOJI)
-            await ctx.send(f"Online emoji resetted to default: {DEFAULT_ONLINE_EMOJI}")
-        else:
-            await self.config.guild(ctx.guild).online_emoji.set(emoji)
-            await ctx.tick()
-        await self.generate_cache()
-
-    @otherbot_watch_online.command(name="embed")
-    async def otherbot_watch_online_embed(self, ctx: commands.Context):
-        """Set wether you want to receive notifications in embed or not."""
-        current = await self.config.guild(ctx.guild).embed_online()
-        await self.config.guild(ctx.guild).embed_online.set(not current)
-        await ctx.send(
-            "I will now send online notifications in embeds."
-            if not current
-            else "I will no longer send online notifications in embeds."
-        )
-        await self.generate_cache()
-
-    @commands.Cog.listener()
-    async def on_member_update(self, before: discord.Member, after: discord.Member):
-        if after.guild is None or not after.bot:
-            return
-
-        data = self.otherbot_cache.get(after.guild.id)
-        if data is None:
-            return
-        channel = self.bot.get_channel(data["reporting"])
-        if not channel:
-            return
-        if not (data["watching"] or data["online_watching"]):
-            return
-        if (
-            before.status != discord.Status.offline
-            and after.status == discord.Status.offline
-            and (after.id in data["watching"])
-        ):
-            try:
-                if data["embed_offline"]:
-                    em = discord.Embed(
-                        color=0x8B0000,
-                        description=f"{after.mention} is offline. {data['offline_emoji']}",
-                        timestamp=datetime.utcnow(),
-                    )
-                    if not data["ping"]:
-                        await channel.send(embed=em)
-                    else:
-                        if discord.version_info.minor < 4:
-                            await channel.send(f"<@&{data['ping']}>", embed=em)
-                        else:
-                            await channel.send(
-                                f"<@&{data['ping']}>",
-                                embed=em,
-                                allowed_mentions=discord.AllowedMentions(roles=True),
-                            )
-                else:
-                    if not data["ping"]:
-                        await channel.send(f"{after.mention} is offline. {data['offline_emoji']}")
-                    else:
-                        await channel.send(
-                            f"<@&{data['ping']}>, {after.mention} is offline. {data['offline_emoji']}"
-                        )
-            except discord.Forbidden:
-                async with self.config.guild(after.guild).watching() as old_data:
-                    old_data.remove(after.id)
-        elif (
-            before.status == discord.Status.offline
-            and after.status != discord.Status.offline
-            and (after.id in data["online_watching"])
-        ):
-            try:
-                if data["embed_online"]:
-                    em = discord.Embed(
-                        color=0x008800,
-                        description=f"{after.mention} is back online. {data['online_emoji']}",
-                        timestamp=datetime.utcnow(),
-                    )
-                    if not data["ping"]:
-                        await channel.send(embed=em)
-                    else:
-                        if discord.version_info.minor < 4:
-                            await channel.send(f"<@&{data['ping']}>", embed=em)
-                        else:
-                            await channel.send(
-                                f"<@&{data['ping']}>",
-                                embed=em,
-                                allowed_mentions=discord.AllowedMentions(roles=True),
-                            )
-                else:
-                    if not data["ping"]:
-                        await channel.send(
-                            f"{after.mention} is back online. {data['online_emoji']}"
-                        )
-                    else:
-                        await channel.send(
-                            f"<@&{data['ping']}>, {after.mention} is back online. {data['online_emoji']}"
-                        )
-            except discord.Forbidden:
-                async with self.config.guild(after.guild).online_watching() as old_data:
-                    old_data.remove(after.id)
+def setup(bot):
+    n = OtherbotStatus(bot)
+    bot.add_cog(n)

partycrash/__init__.py

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

partycrash/info.json

@@ -1,15 +0,0 @@
-{
-	"author": [
-		"aikaterna"
-	],
-	"description": "Posts invites to servers, if the bot is allowed to view them. Does not generate new invites.",
-    "install_msg": "Thanks for installing, have fun.",
-    "permissions" : [
-		"manage_guild"
-	],
-	"short": "Post server invites.",
-	"tags": [
-		"invite"
-	],
-	"type": "COG"
-}

partycrash/partycrash.py

@@ -1,82 +0,0 @@
-import discord
-from redbot.core import commands, checks
-from redbot.core.utils.chat_formatting import box, pagify
-import asyncio
-
-
-class PartyCrash(commands.Cog):
-    """Partycrash inspired by v2 Admin by Will
-       Does not generate invites, only lists existing invites."""
-
-    def __init__(self, bot):
-        self.bot = bot
-
-    async def _get_invites(self, guild, ctx):
-        answers = ("yes", "y")
-        if not guild:
-            return await ctx.send("I'm not in that server.")
-        try:
-            invites = await guild.invites()
-        except discord.errors.Forbidden:
-            return await ctx.send(f"I don't have permission to view invites for {guild.name}.")
-        if not invites:
-            return await ctx.send("I couldn't access any invites.")
-        await ctx.send(f"Are you sure you want to post the invite(s) to {guild.name} here?")
-
-        def check(m):
-            return m.author == ctx.author
-
-        try:
-            msg = await ctx.bot.wait_for("message", timeout=15.0, check=check)
-            if msg.content.lower().strip() in answers:
-                msg = f"Invite(s) for **{guild.name}**:"
-                for url in invites:
-                    msg += f"\n{url}"
-                await ctx.send(msg)
-            else:
-                await ctx.send("Alright then.")
-        except asyncio.TimeoutError:
-            await ctx.send("I guess not.")
-
-    @commands.command()
-    @checks.is_owner()
-    async def partycrash(self, ctx, idnum=None):
-        """Lists servers and existing invites for them."""
-        if idnum:
-            guild = self.bot.get_guild(int(idnum))
-            await self._get_invites(guild, ctx)
-        else:
-            msg = ""
-            guilds = sorted(self.bot.guilds, key=lambda s: s.name)
-            for i, guild in enumerate(guilds, 1):
-                if len(guild.name) > 32:
-                    guild_name = f"{guild.name[:32]}..."
-                else:
-                    guild_name = guild.name
-                if i < 10:
-                    i = f"0{i}"
-                msg += f"{i}: {guild_name:35} ({guild.id})\n"
-            msg += "\nTo post the existing invite(s) for a server just type its number."
-            for page in pagify(msg, delims=["\n"]):
-                await ctx.send(box(page))
-
-            def check(m):
-                return m.author == ctx.author
-
-            try:
-                msg = await ctx.bot.wait_for("message", timeout=20.0, check=check)
-                try:
-                    guild_no = int(msg.content.strip())
-                    guild = guilds[guild_no - 1]
-                except ValueError:
-                    return await ctx.send("You must enter a number.")
-                except IndexError:
-                    return await ctx.send("Index out of range.")
-                try:
-                    await self._get_invites(guild, ctx)
-                except discord.errors.Forbidden:
-                    return await ctx.send(
-                        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.")

picwelcome/info.json

@@ -0,0 +1,9 @@
+{
+    "AUTHOR" : "aikaterna",
+    "INSTALL_MSG" : "Use [p]picwelcome to change settings.",
+    "NAME" : "picwelcome",
+    "SHORT" : "Welcome users to your server with a picture.",
+    "DESCRIPTION" : "Welcome users to your server with a picture.",
+    "REQUIREMENTS": ["Pillow"],
+    "TAGS": ["welcome", "welcome image", "images"]
+}

picwelcome/picwelcome.py

@@ -0,0 +1,168 @@
+#  picwelcomeset_upload is based on code in orels' drawing.py
+#  https://github.com/orels1/ORELS-Cogs
+
+import asyncio
+import aiohttp
+import datetime
+import discord
+import os
+from __main__ import send_cmd_help
+from cogs.utils.dataIO import dataIO
+from cogs.utils import checks
+from copy import deepcopy
+from discord.ext import commands
+from PIL import Image
+
+
+default_settings = {"ANNOUNCE": False,
+                    "PICTURE": "data/picwelcome/default.png",
+                    "CHANNEL": None,
+                    }
+
+
+class PicWelcome:
+    """Welcome new users with a static image."""
+
+    def __init__(self, bot):
+        self.bot = bot
+        self.settings = dataIO.load_json('data/picwelcome/settings.json')
+        self.version = "0.0.1"
+
+    async def save_settings(self):
+        dataIO.save_json('data/picwelcome/settings.json', self.settings)
+
+    async def _data_check(self, ctx):
+        server = ctx.message.server
+        if server.id not in self.settings:
+            self.settings[server.id] = deepcopy(default_settings)
+            self.settings[server.id]["CHANNEL"] = ctx.message.channel.id
+            await self.save_settings()
+
+    @checks.admin_or_permissions(manage_server=True)
+    @commands.group(pass_context=True)
+    async def picwelcome(self, ctx):
+        """Configuration options for a welcome picture."""
+        if ctx.invoked_subcommand is None:
+            await send_cmd_help(ctx)
+            return
+
+    @picwelcome.command(pass_context=True, name="channel", no_pm=True)
+    async def picwelcome_channel(self, ctx, channel: discord.Channel):
+        """Set the announcement channel."""
+        server = ctx.message.server
+        if not server.me.permissions_in(channel).send_messages:
+            await self.bot.say("No permissions to speak in that channel.")
+            return
+        await self._data_check(ctx)
+        self.settings[server.id]["CHANNEL"] = channel.id
+        await self.save_settings()
+        await self.bot.send_message(channel, "This channel will be used for welcome pictures.")
+
+    @picwelcome.command(name='reset', pass_context=True, no_pm=True)
+    async def picwelcome_reset(self, ctx):
+        """Set the welcome picture back to the default."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        self.settings[server.id]['PICTURE'] = 'data/picwelcome/default.png'
+        await self.save_settings()
+        await self.bot.say('Welcome picture reset to default.')
+
+    @picwelcome.command(name="preview", pass_context=True, no_pm=True)
+    async def picwelcome_preview(self, ctx, member: discord.Member=None, number: int=None):
+        """Show a the welcome picture with the current settings."""
+        server = ctx.message.server
+        channel = ctx.message.channel
+        if member is None:
+            member = ctx.message.author
+        await self._data_check(ctx)
+        channel_object = self.bot.get_channel(channel.id)
+        await self.bot.send_typing(channel_object)
+        serverpicture = self.settings[server.id]["PICTURE"]
+        await self.bot.send_file(channel_object, serverpicture)
+
+    @picwelcome.command(pass_context=True, name="toggle", no_pm=True)
+    async def picwelcome_toggle(self, ctx):
+        """Toggle welcome pictures on the server."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        self.settings[server.id]["ANNOUNCE"] = not self.settings[server.id]["ANNOUNCE"]
+        if self.settings[server.id]["ANNOUNCE"]:
+            await self.bot.say("Now welcoming new users with a picture.")
+        else:
+            await self.bot.say("No longer welcoming new users with a picture.")
+        await self.save_settings()
+
+    @picwelcome.command(name='upload', pass_context=True, no_pm=True)
+    async def picwelcome_upload(self, ctx, default=None):
+        """Upload a picture through Discord.
+        This must be an image file and not a url."""
+        server = ctx.message.server
+        await self._data_check(ctx)
+        await self.bot.say("Please send the file to use as a welcome picture.")
+        answer = await self.bot.wait_for_message(timeout=30, author=ctx.message.author)
+
+        try:
+            bg_url = answer.attachments[0]["url"]
+            success = True
+        except Exception as e:
+            success = False
+            print(e)
+
+        serverimage = Image
+        if success:
+            try:
+                async with aiohttp.get(bg_url) as r:
+                    image = await r.content.read()
+                    if not os.path.exists('data/picwelcome/{}'.format(server.id)):
+                        os.makedirs('data/picwelcome/{}'.format(server.id))
+                file_suffix = bg_url.rsplit('.', 1)[1]
+                serverbg = 'data/picwelcome/{}/serverpic.{}'.format(server.id, file_suffix)
+                with open(serverbg, 'wb') as f:
+                    f.write(image)
+                    serverimage = Image.open(serverbg).convert('RGBA')
+                    success = True
+            except Exception as e:
+                success = False
+                print(e)
+
+            if success:
+                self.settings[server.id]['PICTURE'] = "data/picwelcome/{}/serverpic.{}".format(ctx.message.server.id, file_suffix)
+                await self.save_settings()
+                await self.bot.say('Welcome image for this server set to uploaded file.')
+            else:
+                await self.bot.say("Couldn't get the image from Discord.")
+        else:
+            await self.bot.say("Couldn't get the image.")
+
+    @picwelcome.command(name="version", pass_context=True, hidden=True)
+    async def picwelcome_version(self):
+        """Displays the picwelcome version."""
+        await self.bot.say("picwelcome version {}.".format(self.version))
+
+    async def on_member_join(self, member):
+        server = member.server
+        if server.id not in self.settings:
+            self.settings[server.id] = deepcopy(default_settings)
+            await self.save_settings()
+        if not self.settings[server.id]["ANNOUNCE"]:
+            return
+        channelid = self.settings[server.id]["CHANNEL"]
+        channel_object = self.bot.get_channel(channelid)
+        await self.bot.send_typing(channel_object)
+        serverpicture = self.settings[server.id]["PICTURE"]
+        await self.bot.send_file(channel_object, serverpicture)
+
+def check_folders():
+    if not os.path.exists('data/picwelcome/'):
+        os.mkdir('data/picwelcome/')
+
+def check_files():
+    if not dataIO.is_valid_json('data/picwelcome/settings.json'):
+        defaults = {}
+        dataIO.save_json('data/picwelcome/settings.json', defaults)
+
+
+def setup(bot):
+    check_folders()
+    check_files()
+    bot.add_cog(PicWelcome(bot))

pingtime/__init__.py

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

pingtime/info.json

@@ -1,13 +0,0 @@
-{
-	"author": [
-		"aikaterna"
-	],
-	"description": "It's ping... with latency. Shows all shards.",
-    "install_msg": "Thanks for installing, have fun.",
-	"short": "Ping pong.",
-	"tags": [
-		"pingtime",
-        "latency"
-	],
-	"type": "COG"
-}

pingtime/pingtime.py

@@ -1,18 +0,0 @@
-from redbot.core import commands
-
-
-BaseCog = getattr(commands, "Cog", object)
-
-class Pingtime(BaseCog):
-    """🏓"""
-    def __init__(self, bot):
-        self.bot = bot
-
-    @commands.command()
-    async def pingtime(self, ctx):
-        """Ping pong."""
-        latencies = self.bot.latencies
-        msg = "Pong!\n"
-        for shard, pingt in latencies:
-            msg += "Shard {}/{}: {}ms\n".format(shard + 1, len(latencies), round(pingt * 1000))
-        await ctx.send(msg)

post/post.py

@@ -0,0 +1,31 @@
+from discord.ext import commands
+from .utils import checks
+
+class Post:
+    def __init__(self,bot):
+        self.bot = bot
+
+    @commands.command(no_pm=True, pass_context=True)
+    @checks.is_owner()
+    async def postsongs(self, ctx, playlist):
+        """Posts a playlist."""
+        try:
+             await self.bot.send_file(ctx.message.channel, 'data/audio/playlists/{}/{}.txt'.format(ctx.message.server.id, playlist))
+        except FileNotFoundError:
+             try:
+                 await self.bot.send_file(ctx.message.channel, 'data/audio/playlists/{}.txt'.format(playlist))
+             except FileNotFoundError:
+                 await self.bot.say("No playlist named {}.".format(playlist))
+
+    @commands.command(no_pm=True, pass_context=True)
+    @checks.is_owner()
+    async def postcog(self, ctx, cogname):
+        """Posts a cog."""
+        try:
+             await self.bot.send_file(ctx.message.channel, 'cogs/{}.py'.format(cogname))
+        except FileNotFoundError:
+             await self.bot.say("No cog named {}.".format(cogname))
+
+def setup(bot):
+    n = Post(bot)
+    bot.add_cog(n)

pressf/__init__.py

@@ -1,4 +0,0 @@
-from .pressf import PressF
-
-def setup(bot):
-    bot.add_cog(PressF(bot))

pressf/info.json

@@ -1,13 +0,0 @@
-{
-    "author": [
-        "aikaterna"
-    ],
-    "description": "Pay respects to a thing or user by pressing f.",
-    "install_msg": "Thanks for installing, have fun.",
-    "short": "Press f to pay respects.",
-    "tags": [
-        "pressf",
-        "respects"
-    ],
-    "type": "COG"
-}

pressf/pressf.py

@@ -1,66 +0,0 @@
-import asyncio
-import discord
-from redbot.core import commands
-from redbot.core.utils.common_filters import filter_mass_mentions
-
-
-class PressF(commands.Cog):
-    """Pay some respects."""
-
-    def __init__(self, bot):
-        self.bot = bot
-        self.channels = {}
-
-    @commands.command()
-    @commands.bot_has_permissions(add_reactions=True)
-    async def pressf(self, ctx, *, user: discord.User = None):
-        """Pay respects by pressing F"""
-        if str(ctx.channel.id) in self.channels:
-            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
-        else:
-            await ctx.send("What do you want to pay respects to?")
-
-            def check(m):
-                return m.author == ctx.author and m.channel == ctx.channel
-
-            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."
-        )
-        await message.add_reaction("\U0001f1eb")
-        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'])
-        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)]
-
-    @commands.Cog.listener()
-    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:
-            return
-        if user.id == self.bot.user.id:
-            return
-        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)

pug/info.json

@@ -0,0 +1,8 @@
+{
+    "AUTHOR" : "aikaterna",
+    "INSTALL_MSG" : "Thanks for installing Pug. Now you can check out your Warcraft pugs for raid-readiness through Discord.",
+    "NAME" : "Pug",
+    "SHORT" : "Warcraft character lookup.",
+    "DESCRIPTION" : "This tool lets you check potential group pugs for enchants, gems, and raid completion. It was made possible by PugBot: https://github.com/reznok/PugBot",
+    "TAGS" : ["warcraft", "raiding", "raid"]
+}

pug/pug.py

@@ -0,0 +1,313 @@
+import json
+import os
+import requests
+from .utils.dataIO import dataIO
+from __main__ import send_cmd_help
+from discord.ext import commands
+from .utils import checks
+
+
+class Pug:
+
+    def __init__(self, bot):
+        self.bot = bot
+        self.settings = dataIO.load_json("data/pug/config.json")
+        self.fp = "data/pug/config.json"
+        API_KEY = self.settings["blizzard_api_key"]
+        default_region = self.settings["default_region"]
+
+    LEG_WITH_SOCKET = [
+        132369, 132410, 137044, 132444, 132449, 132452, 132460, 133973, 133974, 137037, 137038, 137039, 137040, 137041,
+        137042, 137043, 132378, 137045, 137046, 137047, 137048, 137049, 137050, 137051, 137052, 137054, 137055, 137220,
+        137223, 137276, 137382, 138854
+    ]
+
+    ENCHANTABLE_SLOTS = ["neck", "back", "finger1", "finger2"]
+
+    region_locale = {
+        'us': ['us', 'en_US', 'en'],
+        'eu': ['eu', 'en_GB', 'en']
+    #    'kr': ['kr', 'ko_KR', 'ko'],
+    #    'tw': ['tw', 'zh_TW', 'zh'],
+    #    'es': ['es', 'es_MX', 'es'],	es lookup is broken until the armory site is migrated to the new format
+    }
+
+    def get_sockets(self, player_dictionary):
+        """
+        Return dict with total sockets and count of equipped gems and slots that are missing
+
+        :param player_dictionary: Retrieved player dict from API
+        :return: dict()
+        """
+        sockets = 0
+        equipped_gems = 0
+
+        for item in player_dictionary["items"]:
+            if item in "averageItemLevel" or item in "averageItemLevelEquipped":
+                continue
+
+            if int(player_dictionary["items"][item]["id"]) in self.LEG_WITH_SOCKET:
+                sockets += 1
+
+            for bonus in player_dictionary["items"][item]["bonusLists"]:
+                if bonus == 1808:  # 1808 is Legion prismatic socket bonus
+                    sockets += 1
+
+            if item in ["neck", "finger1", "finger2"]:
+                if player_dictionary["items"][item]["context"] == "trade-skill":
+                    sockets += 1
+
+            for ttip in player_dictionary["items"][item]["tooltipParams"]:
+                if item in "mainHand" or item in "offHand":  # Ignore Relic
+                    continue
+                if "gem" in ttip:  # Equipped gems are listed as gem0, gem1, etc...
+                    equipped_gems += 1
+
+        return {"total_sockets": sockets,
+                "equipped_gems": equipped_gems}
+
+    def get_enchants(self, player_dictionary):
+        """
+        Get count of enchants missing and slots that are missing
+        :param player_dictionary:
+        :return: dict()
+        """
+        self.missing_enchant_slots = []
+        for slot in self.ENCHANTABLE_SLOTS:
+            if "enchant" not in player_dictionary["items"][slot]["tooltipParams"]:
+                self.missing_enchant_slots.append(slot)
+
+        return {
+            "enchantable_slots": len(self.ENCHANTABLE_SLOTS),
+            "missing_slots": self.missing_enchant_slots,
+            "total_missing": len(self.missing_enchant_slots)
+        }
+
+    def get_raid_progression(self, player_dictionary, raid):
+        r = [x for x in player_dictionary["progression"]
+        ["raids"] if x["name"] in raid][0]
+        normal = 0
+        heroic = 0
+        mythic = 0
+
+        for boss in r["bosses"]:
+            if boss["normalKills"] > 0:
+                normal += 1
+            if boss["heroicKills"] > 0:
+                heroic += 1
+            if boss["mythicKills"] > 0:
+                mythic += 1
+
+        return {"normal": normal,
+                "heroic": heroic,
+                "mythic": mythic,
+                "total_bosses": len(r["bosses"])}
+
+    def get_mythic_progression(self, player_dictionary):
+        achievements = player_dictionary["achievements"]
+        plus_two = 0
+        plus_five = 0
+        plus_ten = 0
+
+        if 33096 in achievements["criteria"]:
+            index = achievements["criteria"].index(33096)
+            plus_two = achievements["criteriaQuantity"][index]
+
+        if 33097 in achievements["criteria"]:
+            index = achievements["criteria"].index(33097)
+            plus_five = achievements["criteriaQuantity"][index]
+
+        if 33098 in achievements["criteria"]:
+            index = achievements["criteria"].index(33098)
+            plus_ten = achievements["criteriaQuantity"][index]
+
+        return {
+            "plus_two": plus_two,
+            "plus_five": plus_five,
+            "plus_ten": plus_ten
+        }
+
+    def get_char(self, name, server, target_region):
+        self.settings = dataIO.load_json("data/pug/config.json")  # Load Configs
+        API_KEY = self.settings["blizzard_api_key"]
+        r = requests.get("https://%s.api.battle.net/wow/character/%s/%s?fields=items+progression+achievements&locale=%s&apikey=%s" % (
+                self.region_locale[target_region][0], server, name, self.region_locale[target_region][1], API_KEY))
+
+        if r.status_code != 200:
+            raise Exception("Could not find character (No 200 from API).")
+
+        player_dict = json.loads(r.text)
+
+        r = requests.get(
+            "https://%s.api.battle.net/wow/data/character/classes?locale=%s&apikey=%s" % (
+                self.region_locale[target_region][0], self.region_locale[target_region][1], API_KEY))
+        if r.status_code != 200:
+            raise Exception("Could Not Find Character Classes (No 200 From API)")
+        class_dict = json.loads(r.text)
+        class_dict = {c['id']: c['name'] for c in class_dict["classes"]}
+		
+        r = requests.get("https://%s.api.battle.net/wow/character/%s/%s?fields=stats&locale=%s&apikey=%s" % (
+                self.region_locale[target_region][0], server, name, self.region_locale[target_region][1], API_KEY))
+        if r.status_code != 200:
+            raise Exception("Could not find character stats (No 200 From API).")
+        stats_dict = json.loads(r.text)
+
+        health = stats_dict["stats"]["health"]
+        power = stats_dict["stats"]["power"]
+        powertype = stats_dict["stats"]["powerType"]
+        powertypeproper = powertype.title()
+        strength = stats_dict["stats"]["str"]
+        agi = stats_dict["stats"]["agi"]
+        int = stats_dict["stats"]["int"]
+        sta = stats_dict["stats"]["sta"]
+        crit = stats_dict["stats"]["critRating"]
+        critrating = stats_dict["stats"]["crit"]
+        haste = stats_dict["stats"]["hasteRating"]
+        hasterating = stats_dict["stats"]["haste"]
+        mastery = stats_dict["stats"]["masteryRating"]
+        masteryrating = stats_dict["stats"]["mastery"]
+        vers = stats_dict["stats"]["versatility"]
+        versrating = stats_dict["stats"]["versatilityDamageDoneBonus"]
+        equipped_ivl = player_dict["items"]["averageItemLevelEquipped"]
+        sockets = self.get_sockets(player_dict)
+        enchants = self.get_enchants(player_dict)
+        tov_progress = self.get_raid_progression(player_dict, "Trial of Valor")
+        en_progress = self.get_raid_progression(player_dict, "The Emerald Nightmare")
+        nh_progress = self.get_raid_progression(player_dict, "The Nighthold")
+        tos_progress = self.get_raid_progression(player_dict, "Tomb of Sargeras")
+        ant_progress = self.get_raid_progression(player_dict, "Antorus, the Burning Throne")
+        mythic_progress = self.get_mythic_progression(player_dict)
+
+        armory_url = 'http://{}.battle.net/wow/{}/character/{}/{}/advanced'.format(
+            self.region_locale[target_region][0], self.region_locale[target_region][2], server, name)
+
+        return_string = ''
+        return_string += "**%s** - **%s** - **%s %s**\n" % (
+            name.title(), server.title(), player_dict['level'], class_dict[player_dict['class']])
+        return_string += '<{}>\n'.format(armory_url)
+        return_string += '```ini\n'  # start Markdown
+
+        # iLvL
+        return_string += "[Equipped Item Level]: %s\n" % equipped_ivl
+
+        # Mythic Progression
+        return_string += "[Mythics]: +2: %s, +5: %s, +10: %s\n" % (mythic_progress["plus_two"],
+                                                                 mythic_progress["plus_five"],
+                                                                 mythic_progress["plus_ten"])
+
+        # Raid Progression
+        return_string += "[EN]: {1}/{0} (N), {2}/{0} (H), {3}/{0} (M)\n".format(en_progress["total_bosses"],
+                                                                              en_progress["normal"],
+                                                                              en_progress["heroic"],
+                                                                              en_progress["mythic"])
+        return_string += "[TOV]: {1}/{0} (N), {2}/{0} (H), {3}/{0} (M)\n".format(tov_progress["total_bosses"],
+                                                                               tov_progress["normal"],
+                                                                               tov_progress["heroic"],
+                                                                               tov_progress["mythic"])
+        return_string += "[NH]: {1}/{0} (N), {2}/{0} (H), {3}/{0} (M)\n".format(nh_progress["total_bosses"],
+                                                                               nh_progress["normal"],
+                                                                               nh_progress["heroic"],
+                                                                               nh_progress["mythic"])
+        return_string += "[TOS]: {1}/{0} (N), {2}/{0} (H), {3}/{0} (M)\n".format(tos_progress["total_bosses"],
+                                                                               tos_progress["normal"],
+                                                                               tos_progress["heroic"],
+                                                                               tos_progress["mythic"])
+        return_string += "[ANT]: {1}/{0} (N), {2}/{0} (H), {3}/{0} (M)\n".format(ant_progress["total_bosses"],
+                                                                               ant_progress["normal"],
+                                                                               ant_progress["heroic"],
+                                                                               ant_progress["mythic"])
+        # Gems
+        return_string += "[Gems Equipped]: %s/%s\n" % (
+            sockets["equipped_gems"], sockets["total_sockets"])
+
+        # Enchants
+        return_string += "[Enchants]: %s/%s\n" % (enchants["enchantable_slots"] - enchants["total_missing"],
+                                                enchants["enchantable_slots"])
+        if enchants["total_missing"] > 0:
+            return_string += "[Missing Enchants]: {0}".format(
+                ", ".join(enchants["missing_slots"]))
+
+        # Stats
+        return_string += "\n"
+        return_string += "[Health]: {}   [{}]: {}\n".format(health, powertypeproper, power)
+        return_string += "[Str]: {}  [Agi]: {}\n".format(strength, agi, int, sta)
+        return_string += "[Int]: {}  [Sta]: {}\n".format(int, sta)
+        return_string += "[Crit]:    {}, {}%   [Haste]: {}, {}%\n".format(crit, critrating, haste, hasterating,)
+        return_string += "[Mastery]: {}, {}%   [Vers]:  {}, {}% bonus damage\n".format(mastery, masteryrating, vers, versrating)
+
+        return_string += '```'  # end Markdown
+        return return_string
+
+    @commands.command(name="pug", pass_context=True, no_pm=True)
+    async def _pug(self, ctx, *, message):
+        """A Warcraft Armory character lookup tool.
+        Use: !pug <name> <server> <region>
+        Hyphenate two-word servers (Ex: Twisting-Nether)."""
+        self.settings = dataIO.load_json("data/pug/config.json")  # Load Configs
+        default_region = self.settings["default_region"]
+        target_region = default_region
+        channel = ctx.message.channel
+        try:
+            i = str(ctx.message.content).split(' ')
+            name = i[1]
+            server = i[2]
+            if len(i) == 4 and i[3].lower() in self.region_locale.keys():
+                target_region = i[3].lower()
+            character_info = self.get_char(name, server, target_region)
+            await self.bot.send_message(ctx.message.channel, character_info)
+        except Exception as e:
+            print(e)
+            await self.bot.send_message(ctx.message.channel, "Error with character name or server.")
+
+    @commands.command(pass_context=True, name='pugtoken')
+    @checks.is_owner()
+    async def _pugtoken(self, context, key: str):
+        """Sets the token for the Blizzard API.
+        You can use this command in a private message to the bot.
+
+        Get an API token at: https://dev.battle.net/member/register"""
+        settings = dataIO.load_json(self.fp)
+        settings['blizzard_api_key'] = key
+        dataIO.save_json(self.fp, settings)
+        await self.bot.say("API key set.")
+
+    @commands.command(pass_context=True, name='pugregion')
+    @checks.is_owner()
+    async def _pugregion(self, context, key: str):
+        """Sets the default region."""
+        settings = dataIO.load_json(self.fp)
+        settings['default_region'] = key
+        dataIO.save_json(self.fp, settings)
+        await self.bot.say("Default region set.")
+
+    @commands.command()
+    async def pugcredits(self):
+        """Code credits."""
+        message = await self._credit()
+        await self.bot.say(message)
+
+    async def _credit(self):
+        message = "```This cog is made possible by Pugbot.\n"
+        message+= "Please visit https://github.com/reznok/PugBot for more information.\n"
+        message+= "```"
+        return message
+
+
+def check_folders():
+    if not os.path.exists("data/pug"):
+        print("Creating data/pug folder...")
+        os.mkdir("data/pug")
+
+
+def check_files():
+    fp = "data/pug/config.json"
+    if not dataIO.is_valid_json(fp):
+        print("Creating config.json...")
+        dataIO.save_json(fp, {"blizzard_api_key": "", "default_region": "us"})
+
+
+def setup(bot):
+    check_folders()
+    check_files()
+    n = Pug(bot)
+    bot.add_cog(n)

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 +0,0 @@
-from .quiz import Quiz
-
-def setup(bot):
-    bot.add_cog(Quiz(bot))

quiz/info.json

@@ -1,8 +0,0 @@
-{
-	"author": ["Keane", "aikaterna"],
-	"description": "Play a kahoot-like trivia game.",
-	"install_msg": "Thanks for installing.",
-	"short": "Play a kahoot-like trivia game.",
-	"tags": ["trivia", "quiz"],
-	"type": "COG"
-}

quiz/quiz.py

@@ -1,554 +0,0 @@
-import aiohttp
-import asyncio
-import datetime
-import discord
-import html
-import logging
-import math
-import random
-import time
-
-from redbot.core import bank, checks, commands, Config
-from redbot.core.errors import BalanceTooHigh
-from redbot.core.utils.chat_formatting import box
-
-
-log = logging.getLogger("red.aikaterna.quiz")
-
-
-def check_global_setting_admin():
-    """
-    Command decorator. If the bank is not global, it checks if the author is
-    either a bot admin or has the manage_guild permission.
-    """
-
-    async def pred(ctx: commands.Context):
-        author = ctx.author
-        if not await bank.is_global():
-            if not isinstance(ctx.channel, discord.abc.GuildChannel):
-                return False
-            if await ctx.bot.is_owner(author):
-                return True
-            if author == ctx.guild.owner:
-                return True
-            if ctx.channel.permissions_for(author).manage_guild:
-                return True
-            admin_role_ids = await ctx.bot.get_admin_role_ids(ctx.guild.id)
-            for role in author.roles:
-                if role.id in admin_role_ids:
-                    return True
-        else:
-            return await ctx.bot.is_owner(author)
-
-    return commands.check(pred)
-
-
-class Quiz(commands.Cog):
-    """
-    Play a kahoot-like trivia game with questions from Open Trivia Database.
-    Originally by Keane for Red v2
-    """
-
-    def __init__(self, bot):
-        self.bot = bot
-
-        self.game_tasks = []
-        self.playing_channels = {}
-        self.session = aiohttp.ClientSession()
-        self.starter_task = self.bot.loop.create_task(self.start_loop())
-
-        self.config = Config.get_conf(self, 2782511001, force_registration=True)
-        default_guild = {
-            "afk": 3,
-            "multiplier": 100,
-            "questions": 20,
-            "show_answer": True,
-            "token": None,
-        }
-        self.config.register_guild(**default_guild)
-
-    @commands.guild_only()
-    @commands.group()
-    async def quiz(self, ctx):
-        """Play a kahoot-like trivia game.
-        Questions from the Open Trivia Database.
-
-        In this game, you will compete with other players to correctly answer each
-        question as quickly as you can. You have 10 seconds to type the answer
-        choice before time runs out. The longer you take to say the right answer,
-        the fewer points you get. If you get it wrong, you get no points. Only the
-        first valid answer (A, B, C, or D) will be recorded - be sure of the
-        answer before replying!
-
-        To end the game, stop responding to the questions and the game will time out.
-        """
-        pass
-
-    @quiz.command(name="play")
-    async def quiz_play(self, ctx, *, category_name_or_id=None):
-        """
-        Create or join a quiz game.
-        Specify a category name or ID number, otherwise it will be random.
-        Use [p]quiz categories to list category names or id numbers.
-        """
-        channel = ctx.message.channel
-        player = ctx.message.author
-
-        if not category_name_or_id:
-            # random
-            category_id = await self.category_selector()
-            category_name = await self.category_name_from_id(category_id)
-
-        elif category_name_or_id.isdigit():
-            # cat id specified
-            if 9 <= int(category_name_or_id) >= 32:
-                return await ctx.send(
-                    f"Invalid category number. Use `{ctx.prefix}quiz categories` to see a list."
-                )
-            category_id = category_name_or_id
-            category_name = await self.category_name_from_id(int(category_name_or_id))
-        else:
-            # cat name specified
-            try:
-                category_name = await self.category_name_match(category_name_or_id)
-            except RuntimeError:
-                return await ctx.send(
-                    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:
-            self.playing_channels[channel.id] = {
-                "Start": datetime.datetime.utcnow(),
-                "Started": False,
-                "Players": {player.id: 0},
-                "Answers": {},
-                "Category": str(category_name),
-                "CategoryID": int(category_id),
-            }
-            return await ctx.send(
-                f"{player.display_name} is starting a quiz game!\n"
-                f"Category: `{category_name}`\n"
-                f"It will start in 30 seconds. Use `{ctx.prefix}quiz play` to join."
-            )
-
-        channelinfo = self.playing_channels[channel.id]
-        if player.id in channelinfo["Players"]:
-            await ctx.send("You are already in the game.")
-        elif channelinfo["Started"]:
-            await ctx.send("A quiz game is already underway.")
-        else:
-            channelinfo["Players"][player.id] = 0
-            await ctx.send(f"{player.display_name} joined the game.")
-
-    @quiz.command(name="categories")
-    async def quiz_cat(self, ctx):
-        """List quiz categories."""
-        async with self.session.get("https://opentdb.com/api_category.php") as response:
-            response_json = await response.json()
-            msg = f"[Category Name]{' ' * 24}[ID]\n"
-            for cat_dict in response_json["trivia_categories"]:
-                padding = 40 - len(cat_dict["name"])
-                msg += f"{cat_dict['name']}{' ' * padding}{cat_dict['id']}\n"
-        embed = discord.Embed(description=box(msg, lang="ini"))
-        await ctx.send(embed=embed)
-
-    @commands.guild_only()
-    @commands.group()
-    @checks.mod_or_permissions(manage_guild=True)
-    async def quizset(self, ctx):
-        """Quiz settings."""
-        if ctx.invoked_subcommand is None:
-            guild_data = await self.config.guild(ctx.guild).all()
-            msg = (
-                f"[Quiz Settings for {ctx.guild.name}]\n"
-                f"AFK questions before end: {guild_data['afk']}\n"
-                f"Credit multiplier:        {guild_data['multiplier']}x\n"
-                f"Number of questions:      {guild_data['questions']}\n"
-                f"Reveal correct answer:    {guild_data['show_answer']}\n"
-            )
-            await ctx.send(box(msg, lang="ini"))
-
-    @quizset.command(name="afk")
-    async def quizset_afk(self, ctx, questions: int):
-        """Set number of questions before the game ends due to non-answers."""
-        if 1 <= questions <= 10:
-            await self.config.guild(ctx.guild).afk.set(questions)
-            plural = "" if int(questions) == 1 else "s"
-            return await ctx.send(
-                f"{questions} question{plural} will be asked before the game times out. "
-                "A question will be counted in this afk count if 0 or 1 person answers. "
-                "2 or more answers on a question will not trigger this counter."
-            )
-        await ctx.send("Please use a number between 1 and 10. The default is 3.")
-
-    @quizset.command(name="show")
-    async def quizset_show(self, ctx):
-        """Toggle revealing the answers."""
-        show = await self.config.guild(ctx.guild).show_answer()
-        await self.config.guild(ctx.guild).show_answer.set(not show)
-        await ctx.send(f"Question answers will be revealed during the game: {not show}")
-
-    @quizset.command(name="questions")
-    async def quizset_questions(self, ctx, questions: int):
-        """Set number of questions per game."""
-        if 5 <= questions <= 50:
-            await self.config.guild(ctx.guild).questions.set(questions)
-            return await ctx.send(f"Number of questions per game: {questions}")
-        await ctx.send("Please use a number between 5 and 50. The default is 20.")
-
-    @check_global_setting_admin()
-    @quizset.command(name="multiplier")
-    async def quizset_multiplier(self, ctx, multiplier: int):
-        """
-        Set the credit multiplier.
-        The accepted range is 0 - 10000.
-        0 will turn credit gain off.
-        Credit gain will be based on the number of questions set and user speed.
-        1x = A small amount of credits like 1-10.
-        100x = A handful of credits: 100-500.
-        10000x = Quite a lot of credits, around 10k to 50k.
-		"""
-        if 0 <= multiplier <= 10000:
-            await self.config.guild(ctx.guild).multiplier.set(multiplier)
-            credits_name = await bank.get_currency_name(ctx.guild)
-            return await ctx.send(f"Credit multipilier: `{multiplier}x`")
-        await ctx.send("Please use a number between 0 and 10000. The default is 100.")
-
-    async def start_loop(self):
-        """Starts quiz games when the timeout period ends."""
-        try:
-            while True:
-                for channelid in list(self.playing_channels):
-                    channelinfo = self.playing_channels[channelid]
-                    since_start = (
-                        datetime.datetime.utcnow() - channelinfo["Start"]
-                    ).total_seconds()
-
-                    if since_start > 30 and not channelinfo["Started"]:
-                        channel = self.bot.get_channel(channelid)
-                        if len(channelinfo["Players"]) > 1:
-                            channelinfo["Started"] = True
-                            task = self.bot.loop.create_task(self.game(channel))
-                            self.game_tasks.append(task)
-                        else:
-                            await channel.send("Nobody else joined the quiz game.")
-                            self.playing_channels.pop(channelid)
-                await asyncio.sleep(2)
-        except Exception:
-            log.error("Error in Quiz start loop.", exc_info=True)
-
-    async def game(self, channel):
-        """Runs a quiz game on a channel."""
-        channelinfo = self.playing_channels[channel.id]
-        category = channelinfo["CategoryID"]
-        category_name = channelinfo["Category"]
-
-        try:
-            response = await self.get_questions(channel.guild, category=channelinfo["CategoryID"])
-        except RuntimeError:
-            await channel.send("An error occurred in retrieving questions. Please try again.")
-            self.playing_channels.pop(channel.id)
-            raise
-
-        # Introduction
-        intro = (
-            f"Welcome to the quiz game! Your category is `{category_name}`.\n"
-            "Remember to answer correctly as quickly as you can for more points.\n"
-            "You have 10 seconds per question: the timer is shown in reactions on each question.\n"
-            "The game will begin shortly."
-        )
-        await channel.send(intro)
-        await asyncio.sleep(4)
-
-        # Question and Answer
-        afk_questions = 0
-        for index, dictionary in enumerate(response["results"]):
-            answers = [dictionary["correct_answer"]] + dictionary["incorrect_answers"]
-
-            # Display question and countdown
-            if len(answers) == 2:  # true/false question
-                answers = ["True", "False", "", ""]
-            else:
-                answers = [html.unescape(answer) for answer in answers]
-                random.shuffle(answers)
-
-            message = ""
-            message += html.unescape(dictionary["question"]) + "\n"
-            message += f"A. {answers[0]}\n"
-            message += f"B. {answers[1]}\n"
-            message += f"C. {answers[2]}\n"
-            message += f"D. {answers[3]}\n"
-
-            message_obj = await channel.send(box(message))
-            await message_obj.add_reaction("0⃣")
-            channelinfo["Answers"].clear()  # clear the previous question's answers
-            start_time = time.perf_counter()
-
-            numbers = ["1⃣", "2⃣", "3⃣", "4⃣", "5⃣", "6⃣", "7⃣", "8⃣", "9⃣", "🔟"]
-            for i in range(10):
-                if len(channelinfo["Answers"]) == len(channelinfo["Players"]):
-                    break
-                await asyncio.sleep(1)
-                await message_obj.add_reaction(numbers[i])
-
-            # Organize answers
-            user_answers = channelinfo["Answers"]
-            # snapshot channelinfo["Answers"] at this point in time
-            # to ignore new answers that are added to it
-            answerdict = {["a", "b", "c", "d"][num]: answers[num] for num in range(4)}
-
-            # Check for AFK
-            if len(user_answers) < 2:
-                afk_questions += 1
-                afk_count = await self.config.guild(channel.guild).afk()
-                if afk_questions == int(afk_count):
-                    await channel.send("The game has been cancelled due to lack of participation.")
-                    self.playing_channels.pop(channel.id)
-                    return
-            else:
-                afk_questions = 0
-
-            # Find and display correct answer
-            correct_letter = ""
-            for letter, answer in answerdict.items():
-                if answer == html.unescape(dictionary["correct_answer"]):
-                    correct_letter = letter
-                    break
-            assert answerdict[correct_letter] == html.unescape(dictionary["correct_answer"])
-
-            if await self.config.guild(channel.guild).show_answer():
-                message = (
-                    f"Correct answer:```{correct_letter.upper()}. {answerdict[correct_letter]}```"
-                )
-                await channel.send(message)
-
-            # Assign scores
-            for playerid in user_answers:
-                if user_answers[playerid]["Choice"] == correct_letter:
-                    time_taken = user_answers[playerid]["Time"] - start_time
-                    assert time_taken > 0
-                    if time_taken < 1:
-                        channelinfo["Players"][playerid] += 1000
-                    else:
-                        # the 20 in the formula below is 2 * 10s (max answer time)
-                        channelinfo["Players"][playerid] += round(1000 * (1 - (time_taken / 20)))
-
-            # Display top 5 players and their points
-            message = self.scoreboard(channel)
-            await channel.send("Scoreboard:\n" + message)
-            await asyncio.sleep(4)
-
-            questions = await self.config.guild(channel.guild).questions()
-            if index < (int(questions) - 1):
-                await channel.send("Next question...")
-                await asyncio.sleep(1)
-
-        await self.end_game(channel)
-
-    async def end_game(self, channel):
-        """Ends a quiz game."""
-        # non-linear credit earning .0002x^{2.9} where x is score/100
-        channelinfo = self.playing_channels[channel.id]
-        idlist = sorted(
-            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!")
-
-        multiplier = await self.config.guild(channel.guild).multiplier()
-        if multiplier == 0:
-            self.playing_channels.pop(channel.id)
-            return
-
-        leaderboard = "\n"
-        max_credits = self.calculate_credits(channelinfo["Players"][idlist[0]])
-        end_len = len(str(max_credits)) + 1
-        rank_len = len(str(len(channelinfo["Players"])))
-        rank = 1
-
-        for playerid in idlist:
-            player = channel.guild.get_member(playerid)
-
-            if len(player.display_name) > 25 - rank_len - end_len:
-                name = player.display_name[: 22 - rank_len - end_len] + "..."
-            else:
-                name = player.display_name
-
-            leaderboard += str(rank)
-            leaderboard += " " * (1 + rank_len - len(str(rank)))
-            leaderboard += name
-            creds = self.calculate_credits(channelinfo["Players"][playerid]) * int(multiplier)
-            creds_str = str(creds)
-            leaderboard += " " * (26 - rank_len - 1 - len(name) - len(creds_str))
-            leaderboard += creds_str + "\n"
-
-            try:
-                await bank.deposit_credits(player, creds)
-            except BalanceTooHigh as e:
-                await bank.set_balance(player, e.max_balance)
-
-            rank += 1
-
-        await channel.send("Credits earned:\n" + box(leaderboard, lang="py"))
-        self.playing_channels.pop(channel.id)
-
-    def scoreboard(self, channel):
-        """Returns a scoreboard string to be sent to the text channel."""
-        channelinfo = self.playing_channels[channel.id]
-        scoreboard = "\n"
-        idlist = sorted(
-            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
-        for playerid in idlist[:5]:
-            player = channel.guild.get_member(playerid)
-            if len(player.display_name) > 24 - end_len:
-                name = player.display_name[: 21 - end_len] + "..."
-            else:
-                name = player.display_name
-            scoreboard += str(rank) + " " + name
-            score_str = str(channelinfo["Players"][playerid])
-            scoreboard += " " * (24 - len(name) - len(score_str))
-            scoreboard += score_str + "\n"
-            rank += 1
-        return box(scoreboard, lang="py")
-
-    def calculate_credits(self, score):
-        """Calculates credits earned from a score."""
-        adjusted = score / 100
-        if adjusted < 156.591:
-            result = 0.0002 * (adjusted ** 2.9)
-        else:
-            result = (0.6625 * math.exp(0.0411 * adjusted)) + 50
-        return round(result)
-
-    @commands.Cog.listener()
-    async def on_message_without_command(self, message):
-        if not message.guild:
-            return
-        authorid = message.author.id
-        channelid = message.channel.id
-        choice = message.content.lower()
-        if channelid in self.playing_channels:
-            channelinfo = self.playing_channels[channelid]
-            if (
-                authorid in channelinfo["Players"]
-                and authorid not in channelinfo["Answers"]
-                and choice in {"a", "b", "c", "d"}
-            ):
-                channelinfo["Answers"][authorid] = {"Choice": choice, "Time": time.perf_counter()}
-
-    # OpenTriviaDB API functions
-    async def get_questions(self, server, category=None, difficulty=None):
-        """Gets questions, resetting a token or getting a new one if necessary."""
-        questions = await self.config.guild(server).questions()
-        parameters = {"amount": questions}
-        if category:
-            parameters["category"] = category
-        if difficulty:
-            parameters["difficulty"] = difficulty
-        for _ in range(3):
-            parameters["token"] = await self.get_token(server)
-            async with self.session.get(
-                "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(
-                        "Question retrieval unsuccessful. Response code from OTDB: 1"
-                    )
-                elif response_code == 2:
-                    raise RuntimeError(
-                        "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")
-                    await self.config.guild(server).token.set(None)
-                elif response_code == 4:
-                    # Token empty. Reset it.
-                    log.debug("Quiz: Response code from OTDB: 4")
-                    await self.reset_token(server)
-        raise RuntimeError("Failed to retrieve questions.")
-
-    async def get_token(self, server):
-        """Gets the provided server's token, or generates
-        and saves one if one doesn't exist."""
-        token = await self.config.guild(server).token()
-        if not token:
-            async with self.session.get(
-                "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)
-        return token
-
-    async def reset_token(self, server):
-        """Resets the provided server's token."""
-        token = await self.config.guild(server).token()
-        async with self.session.get(
-            "https://opentdb.com/api_token.php", params={"command": "reset", "token": token}
-        ) as response:
-            response_code = (await response.json())["response_code"]
-            if response_code != 0:
-                raise RuntimeError(
-                    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(
-                "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:
-                    return category
-        raise RuntimeError("Failed to select a category.")
-
-    async def category_name_from_id(self, idnum):
-        """Finds a category's name from its number."""
-        async with self.session.get("https://opentdb.com/api_category.php") as response:
-            response_json = await response.json()
-            for cat_dict in response_json["trivia_categories"]:
-                if cat_dict["id"] == idnum:
-                    return cat_dict["name"]
-        raise RuntimeError("Failed to find category's name.")
-
-    async def category_name_match(self, name):
-        """Check if a category name exists."""
-        async with self.session.get("https://opentdb.com/api_category.php") as response:
-            response_json = await response.json()
-            for cat_dict in response_json["trivia_categories"]:
-                if cat_dict["name"].lower() == name.lower():
-                    return cat_dict["name"]
-        raise RuntimeError("Failed to find category's name.")
-
-    async def category_id_from_name(self, name):
-        """Finds a category's name from its number."""
-        async with self.session.get("https://opentdb.com/api_category.php") as response:
-            response_json = await response.json()
-            for cat_dict in response_json["trivia_categories"]:
-                if cat_dict["name"] == name:
-                    return cat_dict["id"]
-        raise RuntimeError("Failed to find category's id.")
-
-    def cog_unload(self):
-        self.bot.loop.create_task(self.session.close())
-        self.starter_task.cancel()
-        for task in self.game_tasks:
-            task.cancel()

radio/info.json

@@ -0,0 +1,7 @@
+{
+    "AUTHOR" : "Paddo, with edits by aikaterna",
+    "NAME" : "radio",
+    "SHORT" : "Plays http streams like icecast or mp3 streams.",
+    "DESCRIPTION" : "This cog can only be used with audio unloaded. To play m3u or pls files, extract the http stream url they contain and use that - this cog can remember urls for later playback.",
+    "TAGS": ["radio", "stream", "icecast"]
+}

radio/radio.py

@@ -0,0 +1,177 @@
+import os
+import discord
+import asyncio
+from discord.ext import commands
+from __main__ import send_cmd_help
+from cogs.utils.dataIO import dataIO
+
+
+class Radio:
+    def __init__(self, bot):
+        self.bot = bot
+        self.players = {}
+        self.memory_path = 'data/radio/memory.json'
+        self.memory = dataIO.load_json(self.memory_path)
+
+    @commands.group(pass_context=True, no_pm=True, name='radio')
+    async def _radio(self, ctx):
+        """Streaming audio commands."""
+        audio_cog = self.bot.get_cog('Audio')
+        if audio_cog:
+            return await self.bot.say("Please unload the audio cog before using this cog.")
+        if ctx.invoked_subcommand is None:
+            await send_cmd_help(ctx)
+
+    @_radio.command(pass_context=True, no_pm=True, name='stop')
+    async def _leave(self, ctx):
+        """Stops playback."""
+        server = ctx.message.server
+        voice_client = await self.voice_client(server)
+        await self.stop_playing(server)
+        if voice_client:
+            await voice_client.disconnect()
+
+    @_radio.command(no_pm=True, pass_context=True, name='play')
+    async def _play(self, ctx, url: str):
+        """Play a http stream."""
+        server = ctx.message.server
+        if server.id in self.players:
+            await self.stop_playing(server)
+        await self.play_stream(ctx, url)
+        await self.bot.say("Now playing: <{}>".format(url))
+
+    @_radio.command(no_pm=True, pass_context=True, name='list')
+    async def _list(self, ctx):
+        """List saved stream URLs."""
+        server = ctx.message.server
+        message_list = []
+        if server.id in self.memory:
+            for stream in self.memory[server.id]:
+                message = '{:<30}{}\n'.format(stream, self.memory[server.id][stream])
+                message_list.append(message)
+        sorted_list = sorted(message_list, key=str.lower)
+        msg = '```'
+        msg += '{:<30}{}\n\n'.format('NAME', 'URL')
+        for sorted_msg in sorted_list:
+            msg += sorted_msg
+        msg += '```'
+        await self.bot.say(msg)
+
+    @_radio.command(no_pm=True, pass_context=True, name='add')
+    async def _add(self, ctx, name: str, url: str):
+        """Add a url to save for radio playback."""
+        server = ctx.message.server
+        await self.add_to_memory(server, name, url)
+        await self.bot.say('Added to memory')
+
+    @_radio.command(no_pm=True, pass_context=True, name='load')
+    async def _load(self, ctx, name: str):
+        """Load a saved url for radio playback."""
+        server = ctx.message.server
+        if server.id in self.memory:
+            if name.lower() in self.memory[server.id]:
+                url = self.memory[server.id][name.lower()]
+                if server.id in self.players:
+                    await self.stop_playing(server)
+                await self.play_stream(ctx, url)
+                await self.bot.say("Now playing: <{}>".format(url))
+            else:
+                await self.bot.say('"{}" is not in memory.'.format(name.lower()))
+        else:
+            await self.bot.say('Nothing in memory yet')
+
+    @_radio.command(no_pm=True, pass_context=True, name='remove')
+    async def _remove(self, ctx, name: str):
+        """Remove a saved radio stream."""
+        server = ctx.message.server
+        await self.remove_from_memory(server, name)
+        await self.bot.say('Removed {} from memory.'.format(name))
+
+    async def save_memory(self):
+        dataIO.save_json(self.memory_path, self.memory)
+
+    async def add_to_memory(self, server, name, url):
+        if server.id not in self.memory:
+            self.memory[server.id] = {}
+        self.memory[server.id][name.lower()] = url
+        await self.save_memory()
+
+    async def remove_from_memory(self, server, name):
+        del self.memory[server.id][name.lower()]
+        await self.save_memory()
+
+    async def join_voice_channel(self, channel):
+        try:
+            await self.bot.join_voice_channel(channel)
+            return True
+        except discord.InvalidArgument:
+            await self.bot.say('You need to be in a voice channel yourself.')
+        except discord.Forbidden:
+            await self.bot.say('I don\'t have permissions to join this channel.')
+        return False
+
+    async def leave_voice_channel(self, server):
+        voice_client = await self.voice_client(server)
+        if server.id in self.players:
+            self.players[server.id].stop()
+            del self.players[server.id]
+            await self.stop_playing(server)
+        await voice_client.disconnect()
+
+    async def voice_connected(self, server):
+        return self.bot.is_voice_connected(server)
+
+    async def voice_client(self, server):
+        return self.bot.voice_client_in(server)
+
+    async def stop_playing(self, server):
+        if server.id in self.players:
+            self.players[server.id].stop()
+            del self.players[server.id]
+
+    async def start_playing(self, server, url):
+        if server.id not in self.players:
+            voice_client = await self.voice_client(server)
+            audio_player = voice_client.create_ffmpeg_player(url)
+            self.players[server.id] = audio_player
+            self.players[server.id].start()
+
+    async def play_stream(self, ctx, url):
+        server = ctx.message.server
+        channel = ctx.message.author.voice_channel
+        if not ctx.message.channel.is_private:
+            check = True
+            if not await self.voice_connected(server):
+                check = await self.join_voice_channel(channel)
+            if check:
+                await self.start_playing(server, url)
+
+    async def _playing_check(self):
+        while self == self.bot.get_cog('Radio'):
+            for player in self.players:
+                if not self.players[player].is_playing():
+                    server = self.bot.get_server(player)
+                    await self.leave_voice_channel(server)
+                    break
+            await asyncio.sleep(30)
+
+
+def check_folder():
+    if not os.path.exists('data/radio'):
+        print('Creating data/radio folder...')
+        os.makedirs('data/radio')
+
+
+def check_file():
+    if not dataIO.is_valid_json('data/radio/memory.json'):
+        print('Creating memory.json...')
+        dataIO.save_json('data/radio/memory.json', {})
+
+
+def setup(bot):
+    check_folder()
+    check_file()
+    cog = Radio(bot)
+    loop = asyncio.get_event_loop()
+    loop.create_task(cog._playing_check())
+    bot.add_cog(cog)

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

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

riot/info.json

@@ -0,0 +1,8 @@
+{
+    "AUTHOR" : "aikaterna",
+    "INSTALL_MSG" : "Thanks for installing riot.",
+    "NAME" : "Riot",
+    "SHORT" : "RIOT!",
+    "DESCRIPTION" : "Riot was a feature on the now-extinct Fredboat, requested by Mewleficent.",
+    "TAGS" : ["riot"]
+}

riot/riot.py

@@ -0,0 +1,17 @@
+import discord
+from discord.ext import commands
+
+
+class Riot:
+
+    def __init__(self, bot):
+        self.bot = bot
+
+    @commands.command(pass_context=True, no_pm=True)
+    async def riot(self, ctx, *, text: str):
+        """RIOT!"""
+        await self.bot.say('ヽ༼ຈل͜ຈ༽ﾉ **' + str(text) + '** ヽ༼ຈل͜ຈ༽ﾉ')
+
+
+def setup(bot):
+    bot.add_cog(Riot(bot))

rndstatus/__init__.py

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

rndstatus/info.json

@@ -1,13 +0,0 @@
-{
-	"author": [
-		"aikaterna"
-	],
-	"description": "Random statuses with an optional bot stats mode. Ported from Twentysix's v2 cog.",
-	"install_msg": "Thanks for installing, have fun.",
-	"min_bot_version": "3.3.6",
-	"short": "Random bot statuses",
-	"tags": [
-		"status"
-	],
-	"type": "COG"
-}

rndstatus/rndstatus.py

@@ -1,200 +0,0 @@
-import re
-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
-import time
-import contextlib
-import asyncio
-import logging
-
-
-log = logging.getLogger("red.aikaterna-cogs.rndstatus")
-
-
-class RndStatus(commands.Cog):
-    """Cycles random statuses or displays bot stats.
-    If a custom status is already set, it won't change it until
-    it's back to none. [p]set game"""
-
-    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": [
-                "her Turn()",
-                "Tomb Raider II",
-                "Transistor",
-                "NEO Scavenger",
-                "Python",
-                "with your heart.",
-            ],
-            "streamer": "rndstatusstreamer",
-            "type": 1,
-        }
-        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()
-    async def rndstatus(self, ctx):
-        """Rndstatus group commands."""
-        pass
-
-    @rndstatus.command(name="set")
-    async def _set(self, ctx, *statuses: str):
-        """Sets Red's random statuses.
-        Accepts multiple statuses.
-        Must be enclosed in double quotes in case of multiple words.
-        Example:
-        [p]rndstatus set \"Tomb Raider II\" \"Transistor\" \"with your heart.\"
-        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))
-        await self.config.statuses.set(list(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.
-        """
-
-        saved_streamer = await self.config.streamer()
-        if streamer is None:
-            return await ctx.send(f"Current Streamer: {saved_streamer}" )
-        await self.config.streamer.set(streamer)
-        await ctx.send(
-            "Done. Redo this command with no parameters to see the current streamer."
-        )
-
-    @rndstatus.command()
-    async def botstats(self, ctx, *statuses: str):
-        """Toggle for a bot stats status instead of random messages."""
-        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.bot.change_presence(activity=None)
-
-    @rndstatus.command()
-    async def delay(self, ctx, seconds: int):
-        """Sets interval of random status switch.
-        Must be 20 or superior."""
-        if seconds < 20:
-            seconds = 20
-        await self.config.delay.set(seconds)
-        await ctx.send(f"Interval set to {seconds} seconds.")
-
-    @rndstatus.command()
-    async def type(self, ctx, type: int):
-        """Define the rndstatus type.
-
-        Type list:
-        0 = Playing
-        1 = Streaming
-        2 = Listening
-        3 = Watching"""
-        if 0 <= type <= 3:
-            await self.config.type.set(type)
-            await ctx.send("Rndstatus type set.")
-        else:
-            await ctx.send("Type must be between 0 and 3.")
-
-    async def maybe_update_presence(self):
-        await self.bot.wait_until_ready()
-        pattern = re.compile(rf"<@!?{self.bot.user.id}>")
-        delay = 0
-        while True:
-            try:
-                cog_settings = await self.config.all()
-                guilds = self.bot.guilds
-                guild = next(g for g in guilds if not g.unavailable)
-                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))
-            
-
-    def random_status(self, guild, statuses):
-        try:
-            current = str(guild.me.activity.name)
-        except AttributeError:
-            current = None
-        new_statuses = [s for s in statuses if s != current]
-        if len(new_statuses) > 1:
-            return rndchoice(new_statuses)
-        elif len(new_statuses) == 1:
-            return new_statuses[0]
-        return current

seen/__init__.py

@@ -1,7 +0,0 @@
-from .seen import Seen
-
-
-async def setup(bot):
-    cog = Seen(bot)
-    await cog.initialize()
-    bot.add_cog(cog)

seen/info.json

@@ -1,12 +1,7 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Check when the user was last active on a server. Originally made by Paddo.",
-	"short": "Check when the user was last active on a server.",
-	"tags": [
-		"seen", 
-		"activity"
-	],
-	"type": "COG"
-}
+    "AUTHOR" : "Paddolicious#8880",
+    "NAME" : "Seen",
+    "SHORT" : "Check when the user was last active on a server.",
+    "DESCRIPTION" : "Check when the user was last active on a server.",
+    "TAGS": ["Seen", "member", "tools"]
+}

seen/seen.py

@@ -1,199 +1,119 @@
-import asyncio
-import contextlib
-import datetime
-from typing import Union
-
+from discord.ext import commands
+from cogs.utils.dataIO import dataIO
 import discord
-import time
-
-from redbot.core import Config, commands
-
-_SCHEMA_VERSION = 2
+import os
+import asyncio
+from datetime import datetime
 
 
-class Seen(commands.Cog):
-    """Shows last time a user was seen in chat."""
+DB_VERSION = 2
 
+
+class Seen:
+    '''Check when someone was last seen.'''
     def __init__(self, bot):
         self.bot = bot
-        self.config = Config.get_conf(self, 2784481001, force_registration=True)
-
-        default_global = dict(schema_version=1)
-        default_member = dict(seen=None)
-
-        self.config.register_global(**default_global)
-        self.config.register_member(**default_member)
-
-        self._cache = {}
-        self._task = self.bot.loop.create_task(self._save_to_config())
-
-    async def initialize(self):
-        asyncio.ensure_future(
-            self._migrate_config(
-                from_version=await self.config.schema_version(), to_version=_SCHEMA_VERSION
-            )
-        )
-
-    async def _migrate_config(self, from_version: int, to_version: int):
-        if from_version == to_version:
-            return
-        elif from_version < to_version:
-            all_guild_data = await self.config.all_members()
-            users_data = {}
-            for guild_id, guild_data in all_guild_data.items():
-                for user_id, user_data in guild_data.items():
-                    for _, v in user_data.items():
-                        if not v:
-                            v = None
-                        if user_id not in users_data:
-                            users_data[guild_id][user_id] = {"seen": v}
-                        else:
-                            if (v and not users_data[guild_id][user_id]["seen"]) or (
-                                v
-                                and users_data[guild_id][user_id]["seen"]
-                                and v > users_data[guild_id][user_id]["seen"]
-                            ):
-                                users_data[guild_id][user_id] = {"seen": v}
-
-            group = self.config._get_base_group(self.config.MEMBER)  # Bulk update to new scope
-            async with group.all() as new_data:
-                for guild_id, member_data in users_data.items():
-                    new_data[guild_id] = member_data
-
-            # new schema is now in place
-            await self.config.schema_version.set(_SCHEMA_VERSION)
-
-            # migration done, now let's delete all the old stuff
-            await self.config.clear_all_members()
-
-    @commands.guild_only()
-    @commands.command(name="seen")
-    @commands.bot_has_permissions(embed_links=True)
-    async def _seen(self, ctx, author: discord.Member):
-        """Shows last time a user was seen in chat."""
-        member_seen_config = await self.config.member(author).seen()
-        member_seen_cache = self._cache.get(author.guild.id, {}).get(author.id, None)
-
-        if not member_seen_cache and not member_seen_config:
-            embed = discord.Embed(
-                colour=discord.Color.red(), title="I haven't seen that user yet."
-            )
-            return await ctx.send(embed=embed)
-
-        if not member_seen_cache:
-            member_seen = member_seen_config
-        elif not member_seen_config:
-            member_seen = member_seen_cache
-        elif member_seen_cache > member_seen_config:
-            member_seen = member_seen_cache
-        elif member_seen_config > member_seen_cache:
-            member_seen = member_seen_config
-        else:
-            member_seen = member_seen_cache or member_seen_config
-
-        now = int(time.time())
-        time_elapsed = int(now - member_seen)
-        output = self._dynamic_time(time_elapsed)
-
-        if output[2] < 1:
-            ts = "just now"
-        else:
-            ts = ""
-            if output[0] == 1:
-                ts += "{} day, ".format(output[0])
-            elif output[0] > 1:
-                ts += "{} days, ".format(output[0])
-            if output[1] == 1:
-                ts += "{} hour, ".format(output[1])
-            elif output[1] > 1:
-                ts += "{} hours, ".format(output[1])
-            if output[2] == 1:
-                ts += "{} minute ago".format(output[2])
-            elif output[2] > 1:
-                ts += "{} minutes ago".format(output[2])
-        em = discord.Embed(colour=discord.Color.green())
-        avatar = author.avatar_url or author.default_avatar_url
-        em.set_author(name="{} was seen {}".format(author.display_name, ts), icon_url=avatar)
-        await ctx.send(embed=em)
-
-    @staticmethod
-    def _dynamic_time(time_elapsed):
-        m, s = divmod(time_elapsed, 60)
-        h, m = divmod(m, 60)
-        d, h = divmod(h, 24)
-        return d, h, m
-
-    @commands.Cog.listener()
-    async def on_message(self, message):
-        if getattr(message, "guild", None):
-            if message.guild.id not in self._cache:
-                self._cache[message.guild.id] = {}
-            self._cache[message.guild.id][message.author.id] = int(time.time())
-
-    @commands.Cog.listener()
-    async def on_typing(
-        self,
-        channel: discord.abc.Messageable,
-        user: Union[discord.User, discord.Member],
-        when: datetime.datetime,
-    ):
-        if getattr(user, "guild", None):
-            if user.guild.id not in self._cache:
-                self._cache[user.guild.id] = {}
-            self._cache[user.guild.id][user.id] = int(time.time())
-
-    @commands.Cog.listener()
-    async def on_message_edit(self, before: discord.Message, after: discord.Message):
-        if getattr(after, "guild", None):
-            if after.guild.id not in self._cache:
-                self._cache[after.guild.id] = {}
-            self._cache[after.guild.id][after.author.id] = int(time.time())
-
-    @commands.Cog.listener()
-    async def on_reaction_remove(
-        self, reaction: discord.Reaction, user: Union[discord.Member, discord.User]
-    ):
-        if getattr(user, "guild", None):
-            if user.guild.id not in self._cache:
-                self._cache[user.guild.id] = {}
-            self._cache[user.guild.id][user.id] = int(time.time())
-
-    @commands.Cog.listener()
-    async def on_reaction_add(
-        self, reaction: discord.Reaction, user: Union[discord.Member, discord.User]
-    ):
-        if getattr(user, "guild", None):
-            if user.guild.id not in self._cache:
-                self._cache[user.guild.id] = {}
-            self._cache[user.guild.id][user.id] = int(time.time())
-
-    def cog_unload(self):
-        self.bot.loop.create_task(self._clean_up())
-
-    async def _clean_up(self):
-        if self._task:
-            self._task.cancel()
-        if self._cache:
-            group = self.config._get_base_group(self.config.MEMBER)  # Bulk update to config
-            async with group.all() as new_data:
-                for guild_id, member_data in self._cache.items():
-                    if str(guild_id) not in new_data:
-                        new_data[str(guild_id)] = {}
-                    for member_id, seen in member_data.items():
-                        new_data[str(guild_id)][str(member_id)] = {"seen": seen}
-
-    async def _save_to_config(self):
-        await self.bot.wait_until_ready()
-        with contextlib.suppress(asyncio.CancelledError):
-            while True:
-                users_data = self._cache.copy()
-                self._cache = {}
-                group = self.config._get_base_group(self.config.MEMBER)  # Bulk update to config
-                async with group.all() as new_data:
-                    for guild_id, member_data in users_data.items():
-                        if str(guild_id) not in new_data:
-                            new_data[str(guild_id)] = {}
-                        for member_id, seen in member_data.items():
-                            new_data[str(guild_id)][str(member_id)] = {"seen": seen}
+        self.seen = dataIO.load_json('data/seen/seen.json')
+        self.new_data = False
 
+    async def data_writer(self):
+        while self == self.bot.get_cog('Seen'):
+            if self.new_data:
+                dataIO.save_json('data/seen/seen.json', self.seen)
+                self.new_data = False
                 await asyncio.sleep(60)
+            else:
+                await asyncio.sleep(30)
+
+    @commands.command(pass_context=True, no_pm=True, name='seen')
+    async def _seen(self, context, username: discord.Member):
+        '''seen <@username>'''
+        server = context.message.server
+        author = username
+        timestamp_now = context.message.timestamp
+        if server.id in self.seen:
+            if author.id in self.seen[server.id]:
+                data = self.seen[server.id][author.id]
+                timestamp_then = datetime.fromtimestamp(data['TIMESTAMP'])
+                timestamp = timestamp_now - timestamp_then
+                days = timestamp.days
+                seconds = timestamp.seconds
+                hours = seconds // 3600
+                seconds = seconds - (hours * 3600)
+                minutes = seconds // 60
+                if sum([days, hours, minutes]) < 1:
+                    ts = 'just now'
+                else:
+                    ts = ''
+                    if days == 1:
+                        ts += '{} day, '.format(days)
+                    elif days > 1:
+                        ts += '{} days, '.format(days)
+                    if hours == 1:
+                        ts += '{} hour, '.format(hours)
+                    elif hours > 1:
+                        ts += '{} hours, '.format(hours)
+                    if minutes == 1:
+                        ts += '{} minute ago'.format(minutes)
+                    elif minutes > 1:
+                        ts += '{} minutes ago'.format(minutes)
+                em = discord.Embed(color=discord.Color.green())
+                avatar = author.avatar_url if author.avatar else author.default_avatar_url
+                em.set_author(name='{} was seen {}'.format(author.display_name, ts), icon_url=avatar)
+                await self.bot.say(embed=em)
+            else:
+                message = 'I haven\'t seen {} yet.'.format(author.display_name)
+                await self.bot.say('{}'.format(message))
+        else:
+            message = 'I haven\'t seen {} yet.'.format(author.display_name)
+            await self.bot.say('{}'.format(message))
+
+    async def on_message(self, message):
+        if not message.channel.is_private and self.bot.user.id != message.author.id:
+            if not any(message.content.startswith(n) for n in self.bot.settings.prefixes):
+                server = message.server
+                author = message.author
+                ts = message.timestamp.timestamp()
+                data = {}
+                data['TIMESTAMP'] = ts
+                if server.id not in self.seen:
+                    self.seen[server.id] = {}
+                self.seen[server.id][author.id] = data
+                self.new_data = True
+
+
+def check_folder():
+    if not os.path.exists('data/seen'):
+        print('Creating data/seen folder...')
+        os.makedirs('data/seen')
+
+
+def check_file():
+    data = {}
+    data['db_version'] = DB_VERSION
+    f = 'data/seen/seen.json'
+    if not dataIO.is_valid_json(f):
+        print('Creating seen.json...')
+        dataIO.save_json(f, data)
+    else:
+        check = dataIO.load_json(f)
+        if 'db_version' in check:
+            if check['db_version'] < DB_VERSION:
+                data = {}
+                data['db_version'] = DB_VERSION
+                dataIO.save_json(f, data)
+                print('SEEN: Database version too old, resetting!')
+        else:
+            data = {}
+            data['db_version'] = DB_VERSION
+            dataIO.save_json(f, data)
+            print('SEEN: Database version too old, resetting!')
+
+
+def setup(bot):
+    check_folder()
+    check_file()
+    n = Seen(bot)
+    loop = asyncio.get_event_loop()
+    loop.create_task(n.data_writer())
+    bot.add_cog(n)

serverlimit/info.json

@@ -0,0 +1,8 @@
+{
+    "AUTHOR" : "aikaterna",
+    "INSTALL_MSG" : "No settings, when loaded the bot will leave servers with under 25 members on join.",
+    "NAME" : "serverlimit",
+    "SHORT" : "Serverlimit",
+    "DESCRIPTION" : "Limits the bot joining servers that have under 25 members.",
+    "TAGS": []
+}