[YouTube] Gotta pass that context on

just keep on movin on

README.md

@@ -1,42 +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 - Originally by Locastan. My version is a collaboration between TrustyJAID and myself. The repo can be found at: https://github.com/aikaterna/gobcog
+**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. Config stuff tacked on by me. Later iterations will include emoji recognizing and possibly link detection for these bad images.
+________________
 
-away - Originally by Paddo, written for v3 by Axas, final tests by aikaterna. Set and unset a user as being "away".
+Cogs for v2 Red-DiscordBot by Twentysix26.
 
-blurplefy - Make an avatar or an image upload blurple for Discord's 3rd anniversary.
+
+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.
 
-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 file on this repo for more information.
+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
 
-imgwelcome - The repo can be found at: https://github.com/aikaterna/imgwelcome
+hunting - By Paddolicious#8880. It hunts birds... and things that fly.
 
-inspirobot - Fetch "inspirational" messages from inspirobot.me with [p]inspireme.
+imgwelcome - Welcome users to your server with a customized image.
 
-leveler - A v3 port of Stevy's v2 leveler, originally by Fixator and modified by me. Add the repo at: https://github.com/aikaterna/Fixator10-Cogs
+modclean - Clean the last 100 entries in the mod-log of Discord invite names.
 
-nolinks - A very blunt hammer to remove anything that looks like a link. Roles can be whitelisted and it can watch multiple channels.
+otherbot - Have multiple Red instances and want to know when one goes offline? Edit this cog and load it on your watcher bot.
 
-otherbot - Alert a role when bot(s) go offline.
+post - Upload a saved audio playlist to the chat channel, or upload a cog. Owner only.
 
-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.
+pug - Warcraft pug checker. A port of PugBot's module: https://github.com/reznok/PugBot
 
-pingtime - Show all shards' pingtimes.
+radio - A hidden unpublished gem from Paddo, with a couple edits. Plays http audio streams like icecast and mp3 streams.
 
-retrosign - A v3 port of Anismash's retrosign cog: https://github.com/Anismash/Ani-Cogs/tree/master/retrosign
+riot - an old Fredboat command, requested by Mewleficent.
 
-rndstatus - A v3 port of Twentysix's rndstatus cog with a couple extra settings.
+seen - By Paddolicious#8880. Check when the user was last active on a server.
 
-timezone - A v3 port of Fishyfing's timezone cog with a few improvements.
+serverlimit - Limit the bot to joining servers with over 25 members.
 
-trickortreat - A trick or treat-based competitive candy eating game with a leaderboard and other fun commands like stealing candy from guildmates.
+wolfram - Paddolicious#8880's old wolfram cog.
 
-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.
+youtube - Paddolicious#8880's old youtube cog, backported from my v3 version.
 
-wolfram - A v3 port of Paddo's abandoned Wolfram Alpha cog.
-
-Are you looking for the v3 lavalink music cog? It's been added to Red v3 as the audio module. Install from develop and ask in the Red support server for help if you need it, or join my server. https://discord.gg/th6eS3T
+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,110 +0,0 @@
-from PIL import Image
-from io import BytesIO
-import aiohttp
-import discord
-
-from redbot.core import commands, checks, Config
-
-BaseCog = getattr(commands, "Cog", object)
-
-
-class AntiPhoneClapper(BaseCog):
-    """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. Gifs 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])
-
-    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}")
-                    print(f"Failed to delete message ({m.id}) that contained phone killing gif")
-                    return
-            else:
-                return
-
-    def __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,514 +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))")
-
-BaseCog = getattr(commands, "Cog", object)
+from .utils import checks
+from discord.ext import commands
+from cogs.utils.dataIO import dataIO
 
 
-class Away(BaseCog):
+class Away:
     """Le away cog"""
-
-    default_global_settings = {"ign_servers": []}
-    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_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="{} is currently away".format(author.display_name), icon_url=avatar)
-        elif state == "idle":
-            em = discord.Embed(description=message, color=color)
-            em.set_author(name="{} is currently idle".format(author.display_name), icon_url=avatar)
-        elif state == "dnd":
-            em = discord.Embed(description=message, color=color)
-            em.set_author(
-                name="{} is currently do not disturb".format(author.display_name), icon_url=avatar
-            )
-        elif state == "offline":
-            em = discord.Embed(description=message, color=color)
-            em.set_author(
-                name="{} is currently offline".format(author.display_name), 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 == "listening":
-            em = discord.Embed(color=author.activity.color)
-            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 {artist_title[:limit]}",
-                icon_url=avatar,
-            )
-            em.description = message + "\n" + self._draw_play(author.activity)
-            # em.set_footer(text=author.activity.duration)
-            em.set_thumbnail(url=author.activity.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,
-            )
-        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", "gaming"]:
-            em.set_image(url=link.group(0))
-        return em
-
-    async def find_user_mention(self, message):
-        """
-            Replaces user mentions with their username
-        """
-        print(message)
-        for word in message.split():
-            match = re.search(r"<@!?([0-9]+)>", word)
-            if match:
-                user = await self.bot.get_user_info(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 = "{} is currently away and has set the following message: `{}`".format(
-                author.display_name, message
-            )
-        elif state == "idle":
-            msg = "{} is currently away and has set the following message: `{}`".format(
-                author.display_name, message
-            )
-        elif state == "dnd":
-            msg = "{} is currently away and has set the following message: `{}`".format(
-                author.display_name, message
-            )
-        elif state == "offline":
-            msg = "{} is currently away and has set the following message: `{}`".format(
-                author.display_name, message
-            )
-        elif state == "gaming":
-            msg = "{} is currently playing {} and has set the following message: `{}`".format(
-                author.display_name, author.activity.name, message
-            )
-        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 = "{} is currently listening to {} and has set the following message: `{}`\n{}".format(
-                author.display_name, artist_title, message, currently_playing
-            )
-        elif state == "streaming":
-            msg = "{} is currently streaming at {} and has set the following message: `{}`".format(
-                author.display_name, author.activity.url, message
-            )
-        else:
-            msg = "{} is currently away".format(author.display_name)
-        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
-
-    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
-            away_msg = await self._away.user(author).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 message.channel.permissions_for(guild.me).embed_links:
-                    em = await self.make_embed_message(author, away_msg, "away")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                else:
-                    msg = await self.make_text_message(author, away_msg, "away")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            idle_msg = await self._away.user(author).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 message.channel.permissions_for(guild.me).embed_links:
-                    em = await self.make_embed_message(author, idle_msg, "idle")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                else:
-                    msg = await self.make_text_message(author, idle_msg, "idle")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            dnd_msg = await self._away.user(author).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 message.channel.permissions_for(guild.me).embed_links:
-                    em = await self.make_embed_message(author, dnd_msg, "dnd")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                else:
-                    msg = await self.make_text_message(author, dnd_msg, "dnd")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            offline_msg = await self._away.user(author).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 message.channel.permissions_for(guild.me).embed_links:
-                    em = await self.make_embed_message(author, offline_msg, "offline")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                else:
-                    msg = await self.make_text_message(author, offline_msg, "offline")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            streaming_msg = await self._away.user(author).STREAMING_MESSAGE()
-            if streaming_msg and type(author.activity) is discord.Streaming:
-                streaming_msg, delete_after = streaming_msg
-                if message.channel.permissions_for(guild.me).embed_links:
-                    em = await self.make_embed_message(author, streaming_msg, "streaming")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                else:
-                    msg = await self.make_text_message(author, streaming_msg, "streaming")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            listening_msg = await self._away.user(author).LISTENING_MESSAGE()
-            if listening_msg and type(author.activity) is discord.Spotify:
-                listening_msg, delete_after = listening_msg
-                if message.channel.permissions_for(guild.me).embed_links:
-                    em = await self.make_embed_message(author, listening_msg, "listening")
-                    await message.channel.send(embed=em, delete_after=delete_after)
-                else:
-                    msg = await self.make_text_message(author, listening_msg, "listening")
-                    await message.channel.send(msg, delete_after=delete_after)
-                continue
-            gaming_msgs = await self._away.user(author).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 message.channel.permissions_for(guild.me).embed_links:
-                            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
-                        else:
-                            msg = await self.make_text_message(author, game_msg, "gaming")
-                            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)
 
-    @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.
+def check_folder():
+    if not os.path.exists('data/away'):
+        print('Creating data/away folder...')
+        os.makedirs('data/away')
 
-        `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)
 
-    @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.
+def check_file():
+    f = 'data/away/away.json'
+    if not dataIO.is_valid_json(f):
+        dataIO.save_json(f, {})
+        print('Creating default away.json...')
 
-        `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
-        """
-        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 = "The bot will no longer reply for you when you're playing {}.".format(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 = "The bot will now reply for you when you're playing {}.".format(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(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,441 +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)
-
-
-BaseCog = getattr(commands, "Cog", object)
-
-class Blurplefy(BaseCog):
-    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", 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", 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", 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 4th Anniversary."""
-        embed = discord.Embed(name="", colour=0x7289da)
-        timeleft = (
-            datetime.datetime(2018, 5, 13)
-            + datetime.timedelta(hours=7)
-            - datetime.datetime.utcnow()
-        )
-        embed.set_author(name="Time left until Discord's 4th Anniversary")
-        if int(timeleft.total_seconds()) < 0:
-            timeleft = (
-                datetime.datetime(2019, 5, 13)
-                + datetime.timedelta(hours=7)
-                - datetime.datetime.utcnow()
-            )
-            embed.set_author(name="Time left until Discord's 4th 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 __unload(self):
-        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==5.2.0",
-		"python-resize-image"
-	],
-	"short": "Blurplefy a user profile picture or image.",
-	"tags": [
-		"blurple",
-        "image",
-        "profile"
-	],
-	"type": "COG"
-}

cah/__init__.py

@@ -1,8 +0,0 @@
-from redbot.core import commands, data_manager
-from .cah import CardsAgainstHumanity
-
-
-def setup(bot: commands.Bot):
-    n = CardsAgainstHumanity(bot)
-    data_manager.load_bundled_data(n, __file__)
-    bot.add_cog(n)

cah/info.json

@@ -0,0 +1,7 @@
+{
+    "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,6 +1,6 @@
-#  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
@@ -8,17 +8,13 @@ import heapq
 import os
 from io import BytesIO
 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
 
 
-BaseCog = getattr(commands, "Cog", object)
-
-class Chatchart(BaseCog):
+class ChatChart:
     """Show activity."""
 
     def __init__(self, bot):
@@ -32,112 +28,83 @@ class Chatchart(BaseCog):
             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)
-    async def chatchart(self, ctx, channel: 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.name) >= 20:
-                short_name = "{}...".format(msg.author.name[:20]).replace("$", "\$")
+                short_name = '{}...'.format(msg.author.name[:20]).replace("$", "\$")
             else:
                 short_name = msg.author.name.replace("$", "\$")
-            whole_name = "{}#{}".format(short_name, msg.author.discriminator)
+            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"]
+}

dungeon/__init__.py

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

dungeon/dungeon.py

@@ -1,482 +0,0 @@
-import asyncio
-import datetime
-import discord
-from redbot.core import Config, commands, checks, modlog
-from redbot.core.data_manager import cog_data_path
-
-
-BaseCog = getattr(commands, "Cog", object)
-
-class Dungeon(BaseCog):
-    """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,
-            "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:
-            async with self.bot.db.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()
-    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:
-            async with self.bot.db.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 ([p]dungeon announce)\n- The role you wish to award regular members when they join the server ([p]dungeon userrole)\n- The toggle for enabling the regular user role awarding ([p]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)
-
-    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()
-
-        if (since_join.days < join_days) or (profile_toggle and default_avatar):
-            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:
-                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:
-                            print(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:
-                        print(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:
-                        print(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 as e:
-                        print(
-                            f"dungeon.py error while autobanning user and attempting to create modlog entry: {e}\nIn guild: {member.guild.id}"
-                        )
-
-            if blacklist:
-                async with self.bot.db.blacklist() as blacklist_list:
-                    if member.id not in blacklist_list:
-                        blacklist_list.append(member.id)
-            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:
-                    print("dungeon.py: I need permissions to manage channels and manage roles.")
-                    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/hunting.py

@@ -0,0 +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 random
+import time
+import os
+
+# TODO
+# Show error when timing intervals are the same
+
+
+class Hunting:
+    def __init__(self, bot):
+        self.bot = bot
+        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._latest_message_check_message_limit = 5
+        self._latest_message_check_wait_limit = self.settings['hunt_interval_maximum'] * 2
+        self.next = None
+
+    async def _save_scores(self):
+        dataIO.save_json('data/hunting/scores.json', self.scores)
+
+    async def _save_subscriptions(self):
+        dataIO.save_json('data/hunting/subscriptions.json', self.subscriptions)
+
+    async def _save_settings(self):
+        dataIO.save_json('data/hunting/settings.json', self.settings)
+
+    @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)
+
+    @_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:
+            self.subscriptions[server.id] = channel.id
+            message = '**The hunt has started. Good luck to all.**'
+            await self._save_subscriptions()
+        await self.bot.say(message)
+
+    @_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:
+            del self.subscriptions[server.id]
+            message = '**The hunt has stopped.**'
+            await self._save_subscriptions()
+        await self.bot.say(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:
+            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)
+
+    @_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(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)
+
+    @_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):
+        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 self.bot.send_message(channel, '**It seems there are no hunters here. The hunt will be resumed when someone treads here again.**')
+        return False
+
+    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))
+
+
+def check_folder():
+    if not os.path.exists('data/hunting'):
+        print('Creating data/hunting folder...')
+        os.makedirs('data/hunting')
+
+
+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)
+
+    f = 'data/hunting/subscriptions.json'
+    if not dataIO.is_valid_json(f):
+        print('Creating empty subscriptions.json...')
+        dataIO.save_json(f, {})
+
+    f = 'data/hunting/scores.json'
+    if not dataIO.is_valid_json(f):
+        print('Creating empty scores.json...')
+        dataIO.save_json(f, {})
+
+
+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

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

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,29 +0,0 @@
-import aiohttp
-import discord
-from redbot.core import commands
-
-
-BaseCog = getattr(commands, "Cog", object)
-
-class Inspirobot(BaseCog):
-    """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 __unload(self):
-        self.session.close()

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

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,152 +0,0 @@
-import discord
-import re
-from redbot.core import Config, commands, checks
-
-
-BaseCog = getattr(commands, "Cog", object)
-
-class NoLinks(BaseCog):
-    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.")
-
-    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):
-        regex = 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})*)?"
-        )
-        if regex.match(url):
-            return True
-        else:
-            return False

otherbot/__init__.py

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

otherbot/info.json

@@ -1,15 +0,0 @@
-{
-	"author": [
-		"aikaterna"
-	],
-	"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,87 +1,17 @@
 import discord
-from redbot.core import commands, checks, Config
 
-
-BaseCog = getattr(commands, "Cog", object)
-
-
-class Otherbot(BaseCog):
+class OtherbotStatus:
     def __init__(self, bot):
         self.bot = bot
-        self.config = Config.get_conf(self, 2730321001, force_registration=True)
-
-        default_guild = {"ping": None, "reporting": None, "watching": []}
-
-        self.config.register_guild(**default_guild)
-
-    @commands.group()
-    @commands.guild_only()
-    @checks.admin_or_permissions(manage_roles=True)
-    async def otherbot(self, ctx):
-        """Otherbot configuration options."""
-        pass
-
-    @otherbot.command()
-    async def channel(self, ctx, channel: discord.TextChannel = None):
-        """Sets the channel to report in."""
-        await self.config.guild(ctx.guild).reporting.set(channel.id)
-        await ctx.send(f"Reporting channel set to: {channel.mention}.")
-
-    @otherbot.command()
-    async def pingrole(self, ctx, 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}.")
-
-    @otherbot.command()
-    @checks.admin_or_permissions(manage_roles=True)
-    async def remove(self, ctx, bot_user: discord.Member = None):
-        """Remove a bot from the watching list."""
-        async with self.config.guild(ctx.guild).watching() as watch_list:
-            watch_list.remove(bot_user.id)
-        await ctx.send(f"Not watching {bot_user.mention} any more.")
-
-    @otherbot.command()
-    @checks.admin_or_permissions(manage_roles=True)
-    async def watching(self, ctx, bot_user: discord.Member = None):
-        """Add a bot to watch. Leave blank to list existing bots on the list."""
-        data = await self.config.guild(ctx.guild).all()
-        msg = "```Watching these bots:\n"
-        if not data["watching"]:
-            msg += "None."
-        if not bot_user:
-            for saved_bot_id in data["watching"]:
-                bot_user = await self.bot.get_user_info(saved_bot_id)
-                if len(bot_user.name) > 16:
-                    bot_name = f"{bot_user.name:16}...#{bot_user.discriminator}"
-                else:
-                    bot_name = f"{bot_user.name}#{bot_user.discriminator}"
-                msg += f"{bot_name:24} ({bot_user.id})\n"
-            msg += "```"
-            return await ctx.send(msg)
-        if not bot_user.bot:
-            return await ctx.send("User is not a bot.")
-        async with self.config.guild(ctx.guild).watching() as watch_list:
-            watch_list.append(bot_user.id)
-        await ctx.send(f"Now watching: {bot_user.mention}.")
-        if not data["reporting"]:
-            await self.config.guild(ctx.guild).reporting.set(ctx.message.channel.id)
-            await ctx.send(
-                f"Reporting channel set to: {ctx.message.channel.mention}. Use `{ctx.prefix}otherbot channel` to change this."
-            )
 
     async def on_member_update(self, before, after):
-        data = await self.config.guild(after.guild).all()
-        if after.status == discord.Status.offline and (after.id in data["watching"]):
-            channel_object = self.bot.get_channel(data["reporting"])
-            if not data["ping"]:
-                await channel_object.send(f"{after.mention} is offline.")
-            else:
-                await channel_object.send(f'<@&{data["ping"]}>, {after.mention} is offline.')
+        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:
             pass
+
+
+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,84 +0,0 @@
-import discord
-from redbot.core import commands, checks
-from redbot.core.utils.chat_formatting import box, pagify
-import asyncio
-
-
-BaseCog = getattr(commands, "Cog", object)
-
-class PartyCrash(BaseCog):
-    """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)

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)

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)

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,83 +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
-
-
-BaseCog = getattr(commands, "Cog", object)
-
-class Retrosign(BaseCog):
-    """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(
-                "http://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 __unload(self):
-        self.session.detach()

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,7 +0,0 @@
-from .rndstatus import RndStatus
-
-
-def setup(bot):
-    n = RndStatus(bot)
-    bot.add_listener(n.switch_status, "on_message")
-    bot.add_cog(n)

rndstatus/info.json

@@ -1,12 +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.",
-	"short": "Random bot statuses",
-	"tags": [
-		"status"
-	],
-	"type": "COG"
-}

rndstatus/rndstatus.py

@@ -1,162 +0,0 @@
-import discord
-from redbot.core import Config, commands, checks
-from random import choice as rndchoice
-import time
-
-
-BaseCog = getattr(commands, "Cog", object)
-
-class RndStatus(BaseCog):
-    """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)
-
-        default_global = {
-            "botstats": False,
-            "delay": "300",
-            "statuses": [
-                "her Turn()",
-                "Tomb Raider II",
-                "Transistor",
-                "NEO Scavenger",
-                "Python",
-                "with your heart.",
-            ],
-            "type": "1",
-        }
-
-        self.config.register_global(**default_global)
-
-    @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()
-    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("Botstats toggle: {}.".format(not botstats))
-        if not botstats == 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 {str(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 switch_status(self, message):
-        try:
-            current_game = str(message.guild.me.activity.name)
-        except AttributeError:
-            current_game = None
-        statuses = await self.config.statuses()
-        botstats = await self.config.botstats()
-        prefix = await self.bot.db.prefix()
-
-        if botstats:
-            total_users = sum(len(s.members) for s in self.bot.guilds)
-            servers = str(len(self.bot.guilds))
-            botstatus = f"{prefix[0]}help | {total_users} users | {servers} servers"
-            if self.last_change == None:
-                type = await self.config.type()
-                await self.bot.change_presence(
-                    activity=discord.Activity(name=botstatus, type=type)
-                )
-                self.last_change = int(time.perf_counter())
-            if message.author.id == self.bot.user.id:
-                return
-            delay = await self.config.delay()
-            if abs(self.last_change - int(time.perf_counter())) < int(delay):
-                return
-            self.last_change = int(time.perf_counter())
-            if (current_game != str(botstatus)) or current_game == None:
-                type = await self.config.type()
-                return await self.bot.change_presence(
-                    activity=discord.Activity(name=botstatus, type=type)
-                )
-
-        if self.last_change == None:
-            self.last_change = int(time.perf_counter())
-            if len(statuses) > 0 and (current_game in statuses or current_game == None):
-                new_status = self.random_status(message, statuses)
-                type = await self.config.type()
-                await self.bot.change_presence(
-                    activity=discord.Activity(name=new_status, type=type)
-                )
-
-        if message.author.id != self.bot.user.id:
-            delay = await self.config.delay()
-            if abs(self.last_change - int(time.perf_counter())) >= int(delay):
-                self.last_change = int(time.perf_counter())
-                new_status = self.random_status(message, statuses)
-                if current_game != new_status:
-                    if current_game in statuses or current_game == None:
-                        type = await self.config.type()
-                        await self.bot.change_presence(
-                            activity=discord.Activity(name=new_status, type=type)
-                        )
-
-    def random_status(self, msg, statuses):
-        try:
-            current = str(msg.guild.me.activity.name)
-        except AttributeError:
-            current = None
-        try:
-            new = str(msg.guild.me.activity.name)
-        except AttributeError:
-            new = None
-        if len(statuses) > 1:
-            while current == new:
-                new = rndchoice(statuses)
-        elif len(statuses) == 1:
-            new = statuses[0]
-        else:
-            new = None
-        return new

seen/__init__.py

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

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,73 +1,119 @@
-import asyncio
+from discord.ext import commands
+from cogs.utils.dataIO import dataIO
 import discord
-import time
+import os
+import asyncio
 from datetime import datetime
-from redbot.core import Config, commands
 
 
-BaseCog = getattr(commands, "Cog", object)
+DB_VERSION = 2
 
-class Seen(BaseCog):
-    """Shows last time a user was seen in chat"""
+
+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)
+        self.seen = dataIO.load_json('data/seen/seen.json')
+        self.new_data = False
 
-        default_member = {"member_seen": []}
+    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)
 
-        self.config.register_member(**default_member)
-
-    @commands.guild_only()
-    @commands.command(name="seen")
-    async def _seen(self, ctx, author: discord.Member):
-        """Shows last time a user was seen in chat"""
-        member_seen = await self.config.member(author).member_seen()
-        now = int(time.time())
-        try:
-            time_elapsed = int(now - member_seen)
-        except TypeError:
-            embed = discord.Embed(
-                colour=discord.Color.red(), title="I haven't seen that user yet."
-            )
-            return await ctx.send(embed=embed)
-        output = self._dynamic_time(time_elapsed)
-        if output[2] < 1:
-            ts = "just now"
+    @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:
-            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 if author.avatar else author.default_avatar_url
-        em.set_author(name="{} was seen {}".format(author.display_name, ts), icon_url=avatar)
-        await ctx.send(embed=em)
-
-    def _dynamic_time(self, time_elapsed):
-        m, s = divmod(time_elapsed, 60)
-        h, m = divmod(m, 60)
-        d, h = divmod(h, 24)
-        return (d, h, m)
+            message = 'I haven\'t seen {} yet.'.format(author.display_name)
+            await self.bot.say('{}'.format(message))
 
     async def on_message(self, message):
-        if (
-            not isinstance(message.channel, discord.abc.PrivateChannel)
-            and self.bot.user.id != message.author.id
-        ):
-            prefixes = await self.bot.get_prefix(message)
-            if not any(message.content.startswith(n) for n in prefixes):
+        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 = int(time.time())
-                try:
-                    await self.config.member(author).member_seen.set(ts)
-                except AttributeError:
-                    pass
+                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": []
+}

serverlimit/serverlimit.py

@@ -0,0 +1,71 @@
+#  get_default_channel_or_other is from Squid's Admin cog:
+#  https://github.com/tekulvw/Squid-Plugins
+
+import discord
+import traceback
+
+
+class ServerLimit:
+    def __init__(self, bot):
+        self.bot = bot
+
+    async def _message(self, server):
+        server_owner = server.owner
+        notice_msg = "Hi, I tried to make an announcement in your "\
+        + "server, " + server.name + ", but I don't have "\
+        + "permissions to send messages in the default "\
+        + "channel there!"
+        await self.bot.send_message(server_owner, notice_msg)
+        await self.bot.leave_server(server)
+
+    async def on_server_join(self, server):
+        chan = self.get_default_channel_or_other(server,
+                                                 discord.ChannelType.text,
+                                                 send_messages=True)
+        me = server.me
+        server_owner = server.owner
+        msg = "I can only join servers which have more than 25 members. "\
+        + "Please try again later when the server is larger."
+        if len(server.members) <= 25:
+            if chan is not None:
+                if chan.permissions_for(me).send_messages:
+                    await self.bot.send_message(chan, msg)
+                    await self.bot.leave_server(server)
+                else:
+                    await self._message(server)
+                    await self.bot.send_message(server_owner, msg)
+            else:
+                await self._message(server)
+                await self.bot.send_message(server_owner, msg)
+
+    def get_default_channel_or_other(self, server,
+                                     ctype: discord.ChannelType=None,
+                                     **perms_required):
+
+        perms = discord.Permissions.none()
+        perms.update(**perms_required)
+        if ctype is None:
+            types = [discord.ChannelType.text, discord.ChannelType.voice]
+        elif ctype == discord.ChannelType.text:
+            types = [discord.ChannelType.text]
+        else:
+            types = [discord.ChannelType.voice]
+        try:
+            channel = server.default_channel
+        except Exception:
+            channel = None
+        if channel is not None:
+            if channel.permissions_for(server.me).is_superset(perms):
+                return channel
+
+        chan_list = [c for c in sorted(server.channels,
+                                       key=lambda ch: ch.position)
+                     if c.type in types]
+        for ch in chan_list:
+            if ch.permissions_for(server.me).is_superset(perms):
+                return ch
+        return None
+
+
+def setup(bot):
+    bot.add_cog(ServerLimit(bot))

timezone/__init__.py

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

timezone/info.json

@@ -1,16 +0,0 @@
-{
-	"author": [
-		"aikaterna",
-        "fishyfing"
-	],
-	"description": "Check timezones, user times, or times in specific places. Originally made by Fishyfing.",
-	"short": "Check times for users and places.",
-	"tags": [
-		"time", 
-		"timezone"
-	],
-	"requirements": [
-		"pytz"
-	],
-	"type": "COG"
-}

timezone/timezone.py

@@ -1,143 +0,0 @@
-import discord
-import pytz
-from datetime import datetime
-from pytz import all_timezones
-from pytz import country_timezones
-from typing import Optional
-from redbot.core import Config, commands, checks
-
-
-class Timezone(commands.Cog):
-    """Gets times across the world..."""
-
-    def __init__(self, bot):
-        self.bot = bot
-        self.config = Config.get_conf(self, 278049241001, force_registration=True)
-        default_user = {"usertime": None}
-        self.config.register_user(**default_user)
-
-    @commands.guild_only()
-    @commands.group()
-    async def time(self, ctx):
-        """
-            Checks the time.
-
-            For the list of supported timezones, see here:
-            https://en.wikipedia.org/wiki/List_of_tz_database_time_zones
-        """
-        pass
-
-    @time.command()
-    async def tz(self, ctx, *, tz: Optional[str] = None):
-        """Gets the time in any timezone."""
-        try:
-            if tz is None:
-                time = datetime.now()
-                fmt = "**%H:%M** %d-%B-%Y"
-                await ctx.send(f"Current system time: {time.strftime(fmt)}")
-            else:
-                if "'" in tz:
-                    tz = tz.replace("'", "")
-                if len(tz) > 4 and "/" not in tz:
-                    await ctx.send(
-                        "Error: Incorrect format. Use:\n **Continent/City** with correct capitals. "
-                        "e.g. `America/New_York`\n See the full list of supported timezones here:\n "
-                        "<https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
-                    )
-                else:
-                    fmt = "**%H:%M** %d-%B-%Y **%Z (UTC %z)**"
-                    time = datetime.now(pytz.timezone(tz.title()))
-                    await ctx.send(time.strftime(fmt))
-        except Exception as e:
-            await ctx.send(f"**Error:** {str(e)} is an unsupported timezone.")
-
-    @time.command()
-    async def iso(self, ctx, *, code=None):
-        """Looks up ISO3166 country codes and gives you a supported timezone."""
-        if code is None:
-            await ctx.send("That doesn't look like a country code!")
-        else:
-            exist = True if code in country_timezones else False
-            if exist is True:
-                tz = str(country_timezones(code))
-                msg = (
-                    f"Supported timezones for **{code}:**\n{tz[:-1][1:]}"
-                    f"\n**Use** `[p]time tz Continent/City` **to display the current time in that timezone.**"
-                )
-                await ctx.send(msg)
-            else:
-                await ctx.send(
-                    "That code isn't supported. For a full list, see here: "
-                    "<https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
-                )
-
-    @time.command()
-    async def me(self, ctx, *, tz=None):
-        """
-            Sets your timezone.
-            Usage: [p]time me Continent/City
-        """
-        if tz is None:
-            usertime = await self.config.user(ctx.message.author).usertime()
-            if not usertime:
-                await ctx.send(
-                    "You haven't set your timezone. Do `[p]time me Continent/City`: "
-                    "see <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
-                )
-            else:
-                time = datetime.now(pytz.timezone(usertime))
-                time = time.strftime("**%H:%M** %d-%B-%Y **%Z (UTC %z)**")
-                msg = f"Your current timezone is **{usertime}.**\n" f"The current time is: {time}"
-                await ctx.send(msg)
-        else:
-            exist = True if tz.title() in all_timezones else False
-            if exist:
-                if "'" in tz:
-                    tz = tz.replace("'", "")
-                await self.config.user(ctx.message.author).usertime.set(tz.title())
-                await ctx.send(f"Successfully set your timezone to **{tz.title()}**.")
-            else:
-                await ctx.send(
-                    "**Error:** Unrecognized timezone. Try `[p]time me Continent/City`: "
-                    "see <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
-                )
-
-    @time.command()
-    @checks.admin_or_permissions(manage_guild=True)
-    async def set(self, ctx, user: discord.Member, *, tz=None):
-        """Allows the mods to edit timezones."""
-        if not user:
-            user = ctx.message.author
-        if tz is None:
-            await ctx.send("That timezone is invalid.")
-            return
-        else:
-            exist = True if tz.title() in all_timezones else False
-            if exist:
-                if "'" in tz:
-                    tz = tz.replace("'", "")
-                await self.config.user(user).usertime.set(tz.title())
-                await ctx.send(f"Successfully set {user.name}'s timezone to **{tz.title()}**.")
-            else:
-                await ctx.send(
-                    "**Error:** Unrecognized timezone. Try `[p]time set @user Continent/City`: "
-                    "see <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
-                )
-
-    @time.command()
-    async def user(self, ctx, user: discord.Member = None):
-        """Shows the current time for user."""
-        if not user:
-            await ctx.send("That isn't a user!")
-        else:
-            usertime = await self.config.user(user).usertime()
-            if usertime:
-                time = datetime.now(pytz.timezone(usertime))
-                fmt = "**%H:%M** %d-%B-%Y **%Z (UTC %z)**"
-                time = time.strftime(fmt)
-                await ctx.send(
-                    f"{user.name}'s current timezone is: **{usertime}**\n"
-                    f"They current time is: {str(time)}"
-                )
-            else:
-                await ctx.send("That user hasn't set their timezone.")

tools/__init__.py

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

tools/converter.py

@@ -1,59 +0,0 @@
-"""
-Because discord.py rewrite doesn't come with a general channel converter anymore
-Written by sitryk
-"""
-import discord
-import re
-
-from discord.ext.commands import converter, BadArgument
-
-
-class GuildChannelConverter(converter.IDConverter, converter.Converter):
-    """
-    Check order is:
-
-    1. Text Channels
-    2. Voice Channels
-    3. Categories
-    """
-
-    async def convert(self, ctx, argument):
-        bot = ctx.bot
-        match = self._get_id_match(argument) or re.match(r"<#([0-9]+)>$", argument)
-        result = None
-        guild = ctx.guild
-
-        if match is None:
-            order = [
-                (discord.TextChannel, guild.text_channels),
-                (discord.VoiceChannel, guild.voice_channels),
-                (discord.CategoryChannel, guild.categories),
-            ]
-
-            # not a mention
-            for c_types in order:
-                if guild:
-                    result = discord.utils.get(c_types[1], name=argument)
-                    if result is not None:
-                        break
-                else:
-
-                    def check(c):
-                        return isinstance(c, c_types[0]) and c.name == argument
-
-                    result = discord.utils.find(check, bot.get_all_channels())
-                    if result is not None:
-                        break
-        else:
-            channel_id = int(match.group(1))
-            if guild:
-                result = guild.get_channel(channel_id)
-            else:
-                result = converter._get_from_guilds(bot, "get_channel", channel_id)
-
-        if not isinstance(
-            result, (discord.TextChannel, discord.VoiceChannel, discord.CategoryChannel)
-        ):
-            raise BadArgument('Channel "{}" not found.'.format(argument))
-
-        return result

tools/info.json

@@ -1,21 +1,9 @@
 {
-	"author": [
-		"aikaterna",
-        "sitryk"
-	],
-	"description": "Mod and admin tools.",
-    "install_msg": "Thanks for installing. Use `[p]help` Tools to get started.",
-    "min_python_version": [3, 6, 0],
-    "permissions" : [
-		"ban_members",
-		"manage_channels"
-	],
-	"requirements": [
-		"tabulate"
-	],
-	"short": "Mod and admin tools.",
-	"tags": [
-		"tools"
-	],
-	"type": "COG"
-}
+    "AUTHOR" : "aikaterna, Sitryk, and Axas",
+    "INSTALL_MSG" : "Thanks for installing.",
+    "NAME" : "tools",
+    "SHORT" : "A collection of tools for mods.",
+    "DESCRIPTION" : "A collection of channel, user, and server tools for mods.",
+    "REQUIREMENTS": ["tabulate"],
+    "TAGS": ["tools"]
+}

trickortreat/__init__.py

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

trickortreat/info.json

@@ -1,15 +0,0 @@
-{
-	"author": [
-		"aikaterna"
-	],
-	"description": "Trick or treating for your server.",
-    "install_msg": "Thanks for installing. Use `[p]help TrickOrTreat` to get started, specifically by toggling it on in your server and then setting active trick or treating channels.",
-    "min_python_version": [3, 6, 0],
-	"short": "Trick or treat.",
-	"tags": [
-		"trick or treat",
-        "candy",
-        "pick"
-	],
-	"type": "COG"
-}

trickortreat/trickortreat.py

@@ -1,529 +0,0 @@
-import asyncio
-import datetime
-import discord
-import random
-from redbot.core import commands, checks, Config, bank
-from redbot.core.utils.chat_formatting import box, pagify
-from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
-
-__version__ = "0.0.5"
-BaseCog = getattr(commands, "Cog", object)
-
-
-class TrickOrTreat(BaseCog):
-    def __init__(self, bot):
-        self.bot = bot
-        self.config = Config.get_conf(self, 2710311393, force_registration=True)
-
-        default_guild = {"cooldown": 300, "channel": [], "pick": 50, "toggle": False}
-
-        default_user = {
-            "candies": 0,
-            "eaten": 0,
-            "last_tot": "2018-01-01 00:00:00.000001",
-            "lollipops": 0,
-            "sickness": 0,
-            "stars": 0,
-        }
-
-        self.config.register_user(**default_user)
-        self.config.register_guild(**default_guild)
-
-    @commands.guild_only()
-    @commands.command()
-    async def eat(self, ctx, number: int = 1, candy_type=None):
-        """Eat some candy.
-        
-        Valid types: candies, lollipops, stars"""
-        userdata = await self.config.user(ctx.author).all()
-        pick = await self.config.guild(ctx.guild).pick()
-        if not candy_type:
-            candy_type = "candies"
-        if number <= 0:
-            number == 1
-        if candy_type in ["candies", "candy"]:
-            candy_type = "candies"
-        if candy_type in ["lollipops", "lollipop"]:
-            candy_type = "lollipops"
-        if candy_type in ["stars", "star"]:
-            candy_type = "stars"
-        candy_list = ["candies", "lollipops", "stars"]
-        if candy_type not in candy_list:
-            return await ctx.send(
-                "That's not a candy type! Use the inventory command to see what you have."
-            )
-        if userdata[candy_type] < number:
-            return await ctx.send(f"You don't have that many {candy_type}.")
-        if userdata[candy_type] == 0:
-            return await ctx.send(f"You contemplate the idea of eating {candy_type}.")
-
-        eat_phrase = [
-            "You leisurely enjoy",
-            "You take the time to savor",
-            "You eat",
-            "You scarf down",
-            "You sigh in contentment after eating",
-            "You gobble up",
-            "You make a meal of",
-            "You devour",
-        ]
-        if candy_type in ["candies", "candy"]:
-            if (userdata["sickness"] + number * 2) in range(70, 95):
-                await ctx.send("After all that candy, sugar doesn't sound so good.")
-                yuck = random.randint(1, 10)
-                if yuck == 10:
-                    await self.config.user(ctx.author).sickness.set(userdata["sickness"] + 25)
-                if yuck in range(1, 9):
-                    await self.config.user(ctx.author).sickness.set(
-                        userdata["sickness"] + (yuck * 2)
-                    )
-
-                if userdata["candies"] > 3 + number:
-                    lost_candy = userdata["candies"] - random.randint(1, 3) - number
-                else:
-                    lost_candy = userdata["candies"]
-
-                pick_now = await self.config.guild(ctx.guild).pick()
-                if lost_candy < 0:
-                    await self.config.user(ctx.author).candies.set(0)
-                    await self.config.guild(ctx.guild).pick.set(pick_now + lost_candy)
-                else:
-                    await self.config.user(ctx.author).candies.set(
-                        userdata["candies"] - lost_candy
-                    )
-                    await self.config.guild(ctx.guild).pick.set(pick_now + lost_candy)
-
-                await self.config.user(ctx.author).eaten.set(
-                    userdata["eaten"] + (userdata["candies"] - lost_candy)
-                )
-
-                return await ctx.send(
-                    f"You begin to think you don't need all this candy, maybe...\n*{lost_candy} candies are left behind*"
-                )
-
-            if (userdata["sickness"] + number) > 96:
-                await self.config.user(ctx.author).sickness.set(userdata["sickness"] + 30)
-                lost_candy = userdata["candies"] - random.randint(1, 5)
-                if lost_candy <= 0:
-                    await self.config.user(ctx.author).candies.set(0)
-                    message = await ctx.send("...")
-                    await asyncio.sleep(2)
-                    await message.edit(content="..........")
-                    await asyncio.sleep(2)
-                    return await message.edit(
-                        content="You feel absolutely disgusted. At least you don't have any candies left."
-                    )
-                await self.config.guild(ctx.guild).pick.set(pick + lost_candy)
-                await self.config.user(ctx.author).candies.set(0)
-                await self.config.user(ctx.author).eaten.set(
-                    userdata["eaten"] + (userdata["candies"] - lost_candy)
-                )
-                message = await ctx.send("...")
-                await asyncio.sleep(2)
-                await message.edit(content="..........")
-                await asyncio.sleep(2)
-                return await message.edit(
-                    content=f"You toss your candies on the ground in disgust.\n*{lost_candy} candies are left behind*"
-                )
-
-            pluralcandy = "candy" if number == 1 else "candies"
-            await ctx.send(f"{random.choice(eat_phrase)} {number} {pluralcandy}.")
-            await self.config.user(ctx.author).sickness.set(userdata["sickness"] + (number * 2))
-            await self.config.user(ctx.author).candies.set(userdata["candies"] - number)
-            await self.config.user(ctx.author).eaten.set(userdata["eaten"] + number)
-        if candy_type in ["lollipops", "lollipop"]:
-            pluralpop = "lollipop" if number == 1 else "lollipops"
-            await ctx.send(
-                f"{random.choice(eat_phrase)} {number} {pluralpop}. You feel slightly better!\n*Sickness has gone down by {number * 20}*"
-            )
-            new_sickness = userdata["sickness"] - (number * 20)
-            if new_sickness < 0:
-                new_sickness = 0
-            await self.config.user(ctx.author).sickness.set(new_sickness)
-            await self.config.user(ctx.author).lollipops.set(userdata["lollipops"] - number)
-            await self.config.user(ctx.author).eaten.set(userdata["eaten"] + number)
-        if candy_type in ["stars", "star"]:
-            pluralstar = "star" if number == 1 else "stars"
-            await ctx.send(
-                f"{random.choice(eat_phrase)} {number} {pluralstar}. You feel great!\n*Sickness has been reset*"
-            )
-            await self.config.user(ctx.author).sickness.set(0)
-            await self.config.user(ctx.author).stars.set(userdata["stars"] - number)
-            await self.config.user(ctx.author).eaten.set(userdata["eaten"] + number)
-
-    @commands.guild_only()
-    @checks.mod_or_permissions(administrator=True)
-    @commands.command()
-    async def balance(self, ctx):
-        """Check how many candies are 'on the ground' in the guild."""
-        pick = await self.config.guild(ctx.guild).pick()
-        await ctx.send(f"The guild is currently holding: {pick} \N{CANDY}")
-
-    @commands.guild_only()
-    @commands.command()
-    async def buy(self, ctx, pieces: int):
-        """Buy some candy. Prices could vary at any time."""
-        candy_now = await self.config.user(ctx.author).candies()
-        credits_name = await bank.get_currency_name(ctx.guild)
-        if pieces <= 0:
-            return await ctx.send("Not in this reality.")
-        candy_price = int(round(await bank.get_balance(ctx.author)) * 0.04) * pieces
-        if candy_price in range(0, 10):
-            candy_price = pieces * 10
-        try:
-            await bank.withdraw_credits(ctx.author, candy_price)
-        except ValueError:
-            return await ctx.send(f"Not enough {credits_name} ({candy_price} required).")
-        await self.config.user(ctx.author).candies.set(candy_now + pieces)
-        await ctx.send(f"Bought {pieces} candies with {candy_price} {credits_name}.")
-
-    @commands.guild_only()
-    @commands.command()
-    async def cboard(self, ctx):
-        """Show the candy eating leaderboard."""
-        userinfo = await self.config._all_from_scope(scope="USER")
-        if not userinfo:
-            return await ctx.send("No one has any candy.")
-        message = await ctx.send("Populating leaderboard...")
-        sorted_acc = sorted(userinfo.items(), key=lambda x: x[1]["eaten"], reverse=True)
-        msg = "{name:33}{score:19}\n".format(name="Name", score="Candies Eaten")
-        for i, account in enumerate(sorted_acc):
-            if account[1]["eaten"] == 0:
-                continue
-            user_idx = i + 1
-            user_obj = await self.bot.get_user_info(account[0])
-            user_name = f"{user_obj.name}#{user_obj.discriminator}"
-            if len(user_name) > 28:
-                user_name = f"{user_obj.name[:19]}...#{user_obj.discriminator}"
-            if user_obj == ctx.author:
-                name = f"{user_idx}. <<{user_name}>>"
-            else:
-                name = f"{user_idx}. {user_name}"
-            msg += f"{name:33}{account[1]['eaten']}\N{CANDY}\n"
-
-        page_list = []
-        for page in pagify(msg, delims=["\n"], page_length=1000):
-            embed = discord.Embed(
-                colour=await ctx.embed_colour(), description=(box(page, lang="md"))
-            )
-            page_list.append(embed)
-        await message.edit(content=box(f"\N{CANDY} Global Leaderboard \N{CANDY}", lang="prolog"))
-        await menu(ctx, page_list, DEFAULT_CONTROLS)
-
-    @commands.guild_only()
-    @commands.command()
-    async def cinventory(self, ctx):
-        """Check your inventory."""
-        userdata = await self.config.user(ctx.author).all()
-        msg = f"{ctx.author.mention}'s Candy Bag:\n{userdata['candies']} \N{CANDY}"
-        if userdata["lollipops"]:
-            msg += f"\n{userdata['lollipops']} \N{LOLLIPOP}"
-        if userdata["stars"]:
-            msg += f"\n{userdata['stars']} \N{WHITE MEDIUM STAR}"
-        if userdata["sickness"] in range(40, 54):
-            msg += "\n\n**Sickness is over 40/100**\n*You don't feel so good...*"
-        if userdata["sickness"] in range(55, 70):
-            msg += "\n\n**Sickness is over 55/100**\n*You don't feel so good...*"
-        if userdata["sickness"] in range(71, 84):
-            msg += "\n\n**Sickness is over 70/100**\n*You really don't feel so good...*"
-        if userdata["sickness"] in range(85, 100):
-            msg += "\n\n**Sickness is over 85/100**\n*The thought of more sugar makes you feel awful...*"
-        if userdata["sickness"] > 100:
-            msg += "\n\n**Sickness is over 100/100**\n*Better wait a while for more candy...*"
-        await ctx.send(msg)
-
-    @commands.guild_only()
-    @checks.mod_or_permissions(administrator=True)
-    @commands.command()
-    async def cooldown(self, ctx, cooldown_time: int = 0):
-        """Set the cooldown time for trick or treating on the server."""
-        cooldown = await self.config.guild(ctx.guild).cooldown()
-        if not cooldown_time:
-            await self.config.guild(ctx.guild).cooldown.set(300)
-            await ctx.send("Trick or treating cooldown time reset to 5m.")
-        else:
-            await self.config.guild(ctx.guild).cooldown.set(cooldown_time)
-            await ctx.send(f"Trick or treating cooldown time set to {cooldown_time}s.")
-
-    @commands.guild_only()
-    @commands.cooldown(1, 600, discord.ext.commands.BucketType.user)
-    @commands.command()
-    async def pickup(self, ctx):
-        """Pick up some candy, if there is any."""
-        candies = await self.config.user(ctx.author).candies()
-        to_pick = await self.config.guild(ctx.guild).pick()
-        chance = random.randint(1, 100)
-        found = round((chance / 100) * to_pick)
-        await self.config.user(ctx.author).candies.set(candies + found)
-        await self.config.guild(ctx.guild).pick.set(to_pick - found)
-        message = await ctx.send("You start searching the area for candy...")
-        await asyncio.sleep(3)
-        await message.edit(content=f"You found {found} \N{CANDY}!")
-
-    @commands.guild_only()
-    @commands.cooldown(1, 600, discord.ext.commands.BucketType.user)
-    @commands.command()
-    async def steal(self, ctx, user: discord.Member = None):
-        """Steal some candy."""
-        guild_users = [m.id for m in ctx.guild.members if m is not m.bot and not m == ctx.author]
-        candy_users = await self.config._all_from_scope(scope="USER")
-        valid_user = list(set(guild_users) & set(candy_users))
-        if not user:
-            picked_user = self.bot.get_user(random.choice(valid_user))
-        elif user == ctx.author or user == user.bot:
-            picked_user = self.bot.get_user(random.choice(valid_user))
-        elif user != ctx.author or user != user.bot:
-            picked_user = user
-        else:
-            picked_user = self.bot.get_user(random.choice(valid_user))
-        picked_candy_now = await self.config.user(picked_user).candies()
-        if picked_candy_now == 0:
-            chance = random.randint(1, 25)
-            if chance in range(21, 25):
-                new_picked_user = self.bot.get_user(random.choice(valid_user))
-                new_picked_candy_now = await self.config.user(new_picked_user).candies()
-                if chance in range(24, 25):
-                    if new_picked_candy_now == 0:
-                        message = await ctx.send("You see an unsuspecting guildmate...")
-                        await asyncio.sleep(random.randint(3, 6))
-                        return await message.edit(
-                            content=f"There was nothing in {picked_user.name}#{picked_user.discriminator}'s pockets, so you picked {new_picked_user.name}#{new_picked_user.discriminator}'s pockets but they had no candy either!"
-                        )
-                else:
-                    message = await ctx.send("You see an unsuspecting guildmate...")
-                    await asyncio.sleep(random.randint(3, 6))
-                    return await message.edit(
-                        content=f"There was nothing in {picked_user.name}#{picked_user.discriminator}'s pockets, so you looked around again... you saw {new_picked_user.name}#{new_picked_user.discriminator} in the distance, but you didn't think you could catch up..."
-                    )
-            if chance in range(10, 20):
-                message = await ctx.send("You start sneaking around in the shadows...")
-                await asyncio.sleep(random.randint(3, 6))
-                return await message.edit(
-                    content=f"You snuck up on {picked_user.name}#{picked_user.discriminator} and tried picking their pockets but there was nothing there!"
-                )
-            else:
-                message = await ctx.send("You start looking around for a target...")
-                await asyncio.sleep(random.randint(3, 6))
-                return await message.edit(
-                    content="You snuck around for a while but didn't find anything."
-                )
-        user_candy_now = await self.config.user(ctx.author).candies()
-        multip = random.randint(1, 100) / 100
-        if multip > 0.7:
-            multip = 0.7
-        pieces = round(picked_candy_now * multip)
-        if pieces <= 0:
-            message = await ctx.send("You stealthily move over to an unsuspecting person...")
-            await asyncio.sleep(4)
-            return await message.edit(
-                content="You found someone to pickpocket, but they had nothing but pocket lint."
-            )
-        chance = random.randint(1, 25)
-        sneak_phrases = [
-            "You look around furtively...",
-            "You glance around slowly, looking for your target...",
-            "You see someone with a full candy bag...",
-        ]
-        if chance <= 10:
-            message = await ctx.send("You creep closer to the target...")
-            await asyncio.sleep(random.randint(3, 5))
-            return await message.edit(
-                content="You snuck around for a while but didn't find anything."
-            )
-        if chance > 18:
-            await self.config.user(picked_user).candies.set(picked_candy_now - pieces)
-            await self.config.user(ctx.author).candies.set(user_candy_now + pieces)
-            message = await ctx.send(random.choice(sneak_phrases))
-            await asyncio.sleep(4)
-            await message.edit(content="There seems to be an unsuspecting victim in the corner...")
-            await asyncio.sleep(4)
-            return await message.edit(
-                content=f"You stole {pieces} \N{CANDY} from {picked_user.name}#{picked_user.discriminator}!"
-            )
-        if chance in range(11, 17):
-            await self.config.user(picked_user).candies.set(picked_candy_now - round(pieces / 2))
-            await self.config.user(ctx.author).candies.set(user_candy_now + round(pieces / 2))
-            message = await ctx.send(random.choice(sneak_phrases))
-            await asyncio.sleep(4)
-            await message.edit(content="There seems to be an unsuspecting victim in the corner...")
-            await asyncio.sleep(4)
-            return await message.edit(
-                content=f"You stole {round(pieces/2)} \N{CANDY} from {picked_user.name}#{picked_user.discriminator}!"
-            )
-        else:
-            message = await ctx.send(random.choice(sneak_phrases))
-            await asyncio.sleep(4)
-            noise_msg = [
-                "You hear a sound behind you! When you turn back, your target is gone.",
-                "You look away for a moment and your target has vanished.",
-                "Something flashes in your peripheral vision, and as you turn to look, your target gets away...",
-            ]
-            await message.edit(content=random.choice(noise_msg))
-
-    @commands.guild_only()
-    @checks.mod_or_permissions(administrator=True)
-    @commands.group()
-    async def totchannel(self, ctx):
-        """Channel management for Trick or Treat."""
-        if ctx.invoked_subcommand is not None or isinstance(
-            ctx.invoked_subcommand, commands.Group
-        ):
-            return
-        channel_list = await self.config.guild(ctx.guild).channel()
-        channel_msg = "Trick or Treat Channels:\n"
-        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))
-
-    @commands.guild_only()
-    @totchannel.command()
-    async def add(self, ctx, channel: discord.TextChannel):
-        """Add a text channel for Trick or Treating."""
-        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 Trick or Treat channels.")
-        else:
-            await ctx.send(f"{channel.mention} is already in the list of Trick or Treat channels.")
-
-    @commands.guild_only()
-    @totchannel.command()
-    async def remove(self, ctx, channel: discord.TextChannel):
-        """Remove a text channel from Trick or Treating."""
-        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 whitelist.")
-        await self.config.guild(ctx.guild).channel.set(channel_list)
-        await ctx.send(f"{channel.mention} removed from the list of Trick or Treat channels.")
-
-    @commands.guild_only()
-    @checks.mod_or_permissions(administrator=True)
-    @commands.command()
-    async def tottoggle(self, ctx):
-        """Toggle trick or treating on the whole server."""
-        toggle = await self.config.guild(ctx.guild).toggle()
-        msg = f"Trick or Treating active: {not toggle}.\n"
-        channel_list = await self.config.guild(ctx.guild).channel()
-        if not channel_list:
-            channel_list.append(ctx.message.channel.id)
-            await self.config.guild(ctx.guild).channel.set(channel_list)
-            msg += f"Trick or Treating channel added: {ctx.message.channel.mention}"
-        await self.config.guild(ctx.guild).toggle.set(not toggle)
-        await ctx.send(msg)
-
-    @commands.guild_only()
-    @commands.command()
-    async def totversion(self, ctx):
-        """Trick or Treat version."""
-        await ctx.send(
-            f"Trick or Treat, version {__version__}\n\n*0.0.5 updates:*\n**Save values before waiting on messages:\nQuick commands will not overwrite other values**\n\n*0.0.4 updates:*\n**+2% star chance on trick or treat (6% total)\n+5% lollipop chance on trick or treat (25% total)\nMore RP messages\nFix for steal mechanic freezing\n**"
-        )
-
-    async def on_message(self, message):
-        if isinstance(message.channel, discord.abc.PrivateChannel):
-            return
-        if message.author.bot:
-            return
-        content = (message.content).lower()
-
-        chance = random.randint(1, 12)
-        if chance % 4 == 0:
-            sickness_now = await self.config.user(message.author).sickness()
-            sick_chance = random.randint(1, 12)
-            if sick_chance % 3 == 0:
-                new_sickness = sickness_now - sick_chance
-                if new_sickness < 0:
-                    new_sickness = 0
-                await self.config.user(message.author).sickness.set(new_sickness)
-
-        if "trick or treat" not in content:
-            return
-        toggle = await self.config.guild(message.guild).toggle()
-        if not toggle:
-            return
-        channel = await self.config.guild(message.guild).channel()
-        if message.channel.id not in channel:
-            return
-        userdata = await self.config.user(message.author).all()
-
-        last_time = datetime.datetime.strptime(str(userdata["last_tot"]), "%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()
-        ):
-            messages = [
-                "The thought of candy right now doesn't really sound like a good idea.",
-                "All the lights on this street are dark...",
-                "It's starting to get late.",
-                "The wind howls through the trees. Does it seem darker all of a sudden?",
-                "You start to walk the long distance to the next house...",
-                "You take a moment to count your candy before moving on.",
-                "The house you were approaching just turned the light off.",
-                "The wind starts to pick up as you look for the next house...",
-            ]
-            return await message.channel.send(random.choice(messages))
-
-        candy = random.randint(1, 25)
-        lollipop = random.randint(0, 100)
-        star = random.randint(0, 100)
-
-        await self.config.user(message.author).candies.set(userdata["candies"] + candy)
-        if lollipop > 75:
-            await self.config.user(message.author).lollipops.set(userdata["lollipops"] + 1)
-        if star > 94:
-            await self.config.user(message.author).stars.set(userdata["stars"] + 1)
-
-        walking_messages = [
-            "*You hear footsteps...*",
-            "*You're left alone with your thoughts as you wait for the door to open...*",
-            "*The wind howls through the trees...*",
-            "*Does it feel colder out here all of a sudden?*",
-            "*Somewhere inside the house, you hear wood creaking...*",
-            "*You walk up the path to the door and knock...*",
-            "*You knock on the door...*",
-            "*There's a movement in the shadows by the side of the house...*",
-        ]
-        bot_talking = await message.channel.send(random.choice(walking_messages))
-        await asyncio.sleep(random.randint(5, 8))
-        door_messages = [
-            "*The door slowly opens...*",
-            "*The ancient wooden door starts to open...*",
-            "*A light turns on overhead...*",
-            "*You hear a scuffling noise...*",
-            "*There's someone talking inside...*",
-            "*The wind whips around your feet...*",
-            "*A crow caws ominously...*",
-            "*You hear an owl hooting in the distance...*",
-        ]
-        await bot_talking.edit(content=random.choice(door_messages))
-        await asyncio.sleep(random.randint(5, 8))
-        greet_messages = [
-            "Oh, hello. What a cute costume. Here, have some candy.",
-            "Look at that costume. Here you go.",
-            "Out this late at night?",
-            "Here's a little something for you.",
-            "The peppermint ones are my favorite.",
-            "Come back again later if you see the light on still.",
-            "Go ahead, take a few.",
-            "Here you go.",
-            "Aww, look at you. Here, take this.",
-            "Don't eat all those at once!",
-            "Well, I think this is the last of it. Go ahead and take it.",
-            "*I hear the next door neighbors have some pretty good candy too, this year.*",
-        ]
-        await bot_talking.edit(content=random.choice(greet_messages))
-        await asyncio.sleep(2)
-        win_message = f"{message.author.mention}\nYou received:\n{candy}\N{CANDY}"
-        if lollipop > 75:
-            win_message += "\n**BONUS**: 1 \N{LOLLIPOP}"
-        if star > 94:
-            win_message += "\n**BONUS**: 1 \N{WHITE MEDIUM STAR}"
-
-        await message.channel.send(win_message)
-        await self.config.user(message.author).last_tot.set(str(now))

wolfram/__init__.py

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

wolfram/info.json

@@ -1,12 +1,7 @@
 {
-	"author": [
-		"aikaterna"
-	],
-	"description": "Query Wolfram|Alpha for answers. Requires a free API key. Originally by Paddo.",
-    "install_msg": "Thanks for installing, have fun.",
-	"short": "Query Wolfram|Alpha for answers.",
-	"tags": [
-		"wolfram"
-	],
-	"type": "COG"
-}
+    "AUTHOR" : "Paddolicious#8880",
+    "NAME" : "wolfram",
+    "SHORT" : "Query Wolfram|Alpha.",
+    "DESCRIPTION" : "A cog to query Wolfram|Alpha.",
+    "TAGS": ["wolfram"]
+}

wolfram/wolfram.py

@@ -1,38 +1,35 @@
-import aiohttp
 import os
-from redbot.core import Config, commands, checks
-from redbot.core.utils.chat_formatting import box
+import aiohttp
+from discord.ext import commands
 import xml.etree.ElementTree as ET
+from cogs.utils.dataIO import dataIO
+from .utils import checks
+from .utils.chat_formatting import escape_mass_mentions
+from .utils.chat_formatting import box
+from __main__ import send_cmd_help
 
 
-BaseCog = getattr(commands, "Cog", object)
-
-
-class Wolfram(BaseCog):
-    """Ask Wolfram Alpha any question."""
-
+class Wolfram:
     def __init__(self, bot):
         self.bot = bot
-        self.session = aiohttp.ClientSession()
-
-        default_global = {"WOLFRAM_API_KEY": None}
-
-        self.config = Config.get_conf(self, 2788801004)
-        self.config.register_guild(**default_global)
-
-    @commands.command(name="wolfram", aliases=["ask"])
-    async def _wolfram(self, ctx, *question: str):
-        """Ask Wolfram Alpha any question."""
-
-        api_key = await self.config.WOLFRAM_API_KEY()
+        self.settings = dataIO.load_json("data/wolfram/settings.json")
 
+    @commands.command(pass_context=True, name="wolfram", aliases=["ask"])
+    async def _wolfram(self, ctx, *arguments: str):
+        """
+        Ask Wolfram Alpha any question
+        """
+        api_key = self.settings["WOLFRAM_API_KEY"]
         if api_key:
             url = "http://api.wolframalpha.com/v2/query?"
-            query = " ".join(question)
+            query = " ".join(arguments)
             payload = {"input": query, "appid": api_key}
-            headers = {"user-agent": "Red-cog/2.0.0"}
-            async with self.session.get(url, params=payload, headers=headers) as r:
+            headers = {"user-agent": "Red-cog/1.0.0"}
+            conn = aiohttp.TCPConnector(verify_ssl=False)
+            session = aiohttp.ClientSession(connector=conn)
+            async with session.get(url, params=payload, headers=headers) as r:
                 result = await r.text()
+            session.close()
             root = ET.fromstring(result)
             a = []
             for pt in root.findall(".//plaintext"):
@@ -43,17 +40,43 @@ class Wolfram(BaseCog):
             else:
                 message = "\n".join(a[0:3])
         else:
-            message = "No API key set for Wolfram Alpha. Get one at http://products.wolframalpha.com/api/"
-        await ctx.send(box(message))
+            message = (
+                "No API key set for Wolfram Alpha. Get one at http://products.wolframalpha.com/api/"
+            )
+        message = escape_mass_mentions(message)
+        await self.bot.say(box(message))
 
+    @commands.command(pass_context=True, name="setwolframapi", aliases=["setwolfram"])
     @checks.is_owner()
-    @commands.command(name="setwolframapi", aliases=["setwolfram"])
     async def _setwolframapi(self, ctx, key: str):
-        """Set the api-key."""
-
+        """
+        Set the api-key
+        """
         if key:
-            await self.config.WOLFRAM_API_KEY.set(key)
-            await ctx.send("Key set.")
+            self.settings["WOLFRAM_API_KEY"] = key
+            dataIO.save_json("data/wolfram/settings.json", self.settings)
+            await self.bot.say("Key set.")
+        else:
+            await send_cmd_help(ctx)
 
-    def __unload(self):
-        self.bot.loop.create_task(self.session.close())
+
+def check_folder():
+    if not os.path.exists("data/wolfram"):
+        print("Creating data/wolfram folder...")
+        os.makedirs("data/wolfram")
+
+
+def check_file():
+    data = {}
+    data["WOLFRAM_API_KEY"] = False
+    f = "data/wolfram/settings.json"
+    if not dataIO.is_valid_json(f):
+        print("Creating default settings.json...")
+        dataIO.save_json(f, data)
+
+
+def setup(bot):
+    check_folder()
+    check_file()
+    n = Wolfram(bot)
+    bot.add_cog(n)

youtube/info.json

@@ -0,0 +1,7 @@
+{
+    "AUTHOR" : "Paddolicious#8880 and aikaterna#1393",
+    "NAME" : "youtube",
+    "SHORT" : "Look up videos on YouTube.",
+    "DESCRIPTION" : "Look up videos on YouTube.",
+    "TAGS": ["youtube"]
+}

youtube/youtube.py

@@ -0,0 +1,41 @@
+from discord.ext import commands
+import aiohttp
+import re
+
+
+class YouTube:
+    """Le YouTube Cog"""
+    def __init__(self, bot):
+        self.bot = bot
+        self.session = aiohttp.ClientSession()
+
+    async def _youtube_results(self, query: str):
+        try:
+            headers = {"user-agent": "Red-cog/2.0"}
+            async with self.session.get("https://www.youtube.com/results", params={"search_query": query}, headers=headers) as r:
+                result = await r.text()
+            yt_find = re.findall(r"{\"videoId\":\"(.{11})", result)
+            url_list = []
+            for track in yt_find:
+                url = "https://www.youtube.com/watch?v={}".format(track)
+                if url not in url_list:
+                    url_list.append(url)
+
+        except Exception as e:
+            url_list = ["Something went terribly wrong! [{}]".format(e)]
+
+        return url_list
+
+    @commands.command(pass_context=True)
+    async def youtube(self, ctx, *, query: str):
+        """Search on Youtube."""
+        result = await self._youtube_results(query)
+        if result:
+            await self.bot.say(result[0])
+        else:
+            await self.bot.say("Nothing found. Try again later.")
+
+
+def setup(bot):
+    n = YouTube(bot)
+    bot.add_cog(n)