[Away] Add link to spotify song in listening status (#143)

Certain edge cases, e.g. two duplicate statuses, would cause random_status (which never yields) to loop either forever or for a long time.
This removes the while loop entirely.

README.md

@@ -1,13 +1,13 @@
 # aikaterna-cogs
 v3 Cogs for Red-DiscordBot by Twentysix26.
 
-adventure - Originally by Locastan. My version is a collaboration between TrustyJAID and myself. The repo can be found at: https://github.com/aikaterna/gobcog
+adventure - Original concept & cog by locastan. My version is a collaboration between TrustyJAID, Draper, and myself and is now markedly different than locastan's version. The repo can be found on my repo page here on github.
 
-antiphoneclapper - Detects and removes bad GIFs posted in chat that have malformed frames. Thanks to Sitryk for all of the code that actually mattered for detection in this cog. Config stuff tacked on by me. Later iterations will include emoji recognizing and possibly link detection for these bad images.
+antiphoneclapper - Detects and removes bad GIFs posted in chat that have malformed frames. Thanks to Sitryk for all of the code that actually mattered for detection in this cog.
 
-away - Originally by Paddo, written for v3 by Axas, final tests by aikaterna, and large improvements by TrustyJAID. Set and unset a user as being "away".
+away - Originally by Paddo, written for v3 by Axas, final tests by aikaterna, and large improvements by TrustyJAID. Set and unset a user as being "away", or other statuses.
 
-blurplefy - Make an avatar or an image upload blurple for Discord's 3rd anniversary.
+blurplefy - Make an avatar or an image upload blurple for Discord's anniversaries.
 
 cah - Cards Against Humanity, played in DM's. This can rate limit large bots via the sheer number of messages sent. Install and use with caution on larger bots.
 
@@ -15,15 +15,21 @@ chatchart - Generates a pie chart to display chat activity over the last 5000 me
 
 dadjokes - Another UltimatePancake cog. Get some dad jokes on command.
 
-dictonary - I stole this from UltimatePancake's v2 cogs, defines words via a dictonary. Only the "define" command for now until the dependency owner updates their files with a pending PR.
+dictonary - Define words and look up antonyms and synonyms. Originally by UltimatePancake.
 
-dungeon - New users with new accounts will be shuffled off to a locked channel on-join to help mitigate raiders. Please see the dungeon_readme.md file on this repo for more information.
+dungeon - New users with new accounts will be shuffled off to a locked channel on-join to help mitigate raiders. Please see the [dungeon_readme.md](https://github.com/aikaterna/aikaterna-cogs/blob/v3/dungeon_readme.md) file on this repo for more information.
 
-imgwelcome - The repo can be found at: https://github.com/aikaterna/imgwelcome
+hunting - A long overdue port of Paddo's v2 hunting game to v3.
+
+icyparser - Show icecast/shoutcast stream information. An audio addon cog to show the current stream info, or provide a url yourself.
+
+imgwelcome - Welcome users to your server(s) with an image. The repo can be found on my repo page here on github.
 
 inspirobot - Fetch "inspirational" messages from inspirobot.me with [p]inspireme.
 
-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
+invites - Display invites that are available on the server and the information those invites contain. The bot must have the administrator permission granted on the guild to be able to use this cog.
+
+luigipoker - Play the Luigi Poker minigame from New Super Mario Brothers. Ported from the v2 version written by themario30.
 
 noflippedtables - A v3 port of irdumb's v2 cog with a little extra surprise included. Unflip all the tables.
 
@@ -39,9 +45,11 @@ pressf - A port/rewrite of NekoTony's v2 pressf cog. Pay your respects by pressi
 
 pupper - A cog for Ryan5374. A pet that comes around on an on_message listener and waits for someone to pet it (react with a standard wave emoji), and rewards with credits. Many attributes are configurable.
 
+quiz - A kahoot-like trivia game. Originally by Keane for Red v2.
+
 region - A command to change the voice region of a server. Requires the guild admin or mod role or guild administrator.
 
-retrosign - A v3 port of Anismash's retrosign cog: https://github.com/Anismash/Ani-Cogs/tree/master/retrosign
+retrosign - A v3 port of Anismash's retrosign cog.
 
 rndstatus - A v3 port of Twentysix's rndstatus cog with a couple extra settings.
 
@@ -53,8 +61,10 @@ trickortreat - A trick or treat-based competitive candy eating game with a leade
 
 tools - A collection of mod and admin tools, ported from my v2 version. Sitryk is responsible for a lot of the code in tools... thanks for the help with this cog.
 
+warcraftlogs - Fetch player info/metrics from the WarcraftLogs API for World of Warcraft Classic. Does not provide stats for non-Classic characters.
+
 wolfram - A v3 port of Paddo's abandoned Wolfram Alpha cog.
 
 youtube - A v3 port of Paddo's youtube search cog for v2.
 
-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
+Support for these cogs is via opened issues on the appropriate repo or in the Red - Cog Support server at https://discord.gg/KcAbsvD, in the support-aikaterna-cogs channel.

antiphoneclapper/antiphoneclapper.py

@@ -2,19 +2,15 @@ from PIL import Image
 from io import BytesIO
 import aiohttp
 import discord
+import logging
 
 from redbot.core import commands, checks, Config
 
-BaseCog = getattr(commands, "Cog", object)
 
-listener = getattr(commands.Cog, "listener", None)  # Trusty + Sinbad
-if listener is None:
-
-    def listener(name=None):
-        return lambda x: x
+log = logging.getLogger("red.aikaterna.antiphoneclapper")
 
 
-class AntiPhoneClapper(BaseCog):
+class AntiPhoneClapper(commands.Cog):
     """This cog deletes bad GIFs that will crash phone clients."""
 
     def __init__(self, bot):
@@ -35,7 +31,10 @@ class AntiPhoneClapper(BaseCog):
 
     @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."""
+        """
+        Add a channel to watch. 
+        Gif attachments that break mobile clients will be removed in these channels.
+        """
         channel_list = await self.config.guild(ctx.guild).watching()
         if channel.id not in channel_list:
             channel_list.append(channel.id)
@@ -73,7 +72,7 @@ class AntiPhoneClapper(BaseCog):
             tile_sizes.append(im.tile[0][1][2:])
         return any([x[0] > limit[0] or x[1] > limit[1] for x in tile_sizes])
 
-    @listener()
+    @commands.Cog.listener()
     async def on_message(self, m):
         if not m.attachments:
             return
@@ -108,7 +107,7 @@ class AntiPhoneClapper(BaseCog):
                     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")
+                    log.debug(f"Failed to delete message ({m.id}) that contained phone killing gif")
                     return
             else:
                 return

away/away.py

@@ -6,19 +6,12 @@ import re
 
 IMAGE_LINKS = re.compile(r"(http[s]?:\/\/[^\"\']*\.(?:png|jpg|jpeg|gif|png))")
 
-BaseCog = getattr(commands, "Cog", object)
 
-listener = getattr(commands.Cog, "listener", None)  # Trusty + Sinbad
-if listener is None:
-
-    def listener(name=None):
-        return lambda x: x
-
-
-class Away(BaseCog):
+class Away(commands.Cog):
     """Le away cog"""
 
     default_global_settings = {"ign_servers": []}
+    default_guild_settings = {"TEXT_ONLY": False}
     default_user_settings = {
         "MESSAGE": False,
         "IDLE_MESSAGE": False,
@@ -33,6 +26,7 @@ class Away(BaseCog):
         self.bot = bot
         self._away = Config.get_conf(self, 8423491260, force_registration=True)
         self._away.register_global(**self.default_global_settings)
+        self._away.register_guild(**self.default_guild_settings)
         self._away.register_user(**self.default_user_settings)
 
     def _draw_play(self, song):
@@ -69,20 +63,18 @@ class Away(BaseCog):
                 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)
+            em.set_author(name=f"{author.display_name} is currently away", icon_url=avatar)
         elif state == "idle":
             em = discord.Embed(description=message, color=color)
-            em.set_author(name="{} is currently idle".format(author.display_name), icon_url=avatar)
+            em.set_author(name=f"{author.display_name} is currently idle", icon_url=avatar)
         elif state == "dnd":
             em = discord.Embed(description=message, color=color)
             em.set_author(
-                name="{} is currently do not disturb".format(author.display_name), icon_url=avatar
+                name=f"{author.display_name} is currently do not disturb", icon_url=avatar
             )
         elif state == "offline":
             em = discord.Embed(description=message, color=color)
-            em.set_author(
-                name="{} is currently offline".format(author.display_name), icon_url=avatar
-            )
+            em.set_author(name=f"{author.display_name} is currently offline", icon_url=avatar)
         elif state == "gaming":
             em = discord.Embed(description=message, color=color)
             em.set_author(
@@ -93,8 +85,20 @@ class Away(BaseCog):
             thumbnail = getattr(author.activity, "large_image_url", None)
             if thumbnail:
                 em.set_thumbnail(url=thumbnail)
+        elif state == "gamingcustom":
+            status = [c for c in author.activities if c.type == discord.ActivityType.playing]
+            em = discord.Embed(description=message, color=color)
+            em.set_author(
+                name=f"{author.display_name} is currently playing {status[0].name}",
+                icon_url=avatar,
+            )
+            em.title = getattr(status[0], "details", None)
+            thumbnail = getattr(status[0], "large_image_url", None)
+            if thumbnail:
+                em.set_thumbnail(url=thumbnail)
         elif state == "listening":
             em = discord.Embed(color=author.activity.color)
+            url = f"https://open.spotify.com/track/{author.activity.track_id}"
             artist_title = f"{author.activity.title} by " + ", ".join(
                 a for a in author.activity.artists
             )
@@ -102,12 +106,34 @@ class Away(BaseCog):
                 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]}",
+                name=f"{author.display_name} is currently listening to",
                 icon_url=avatar,
+                url=url,
             )
-            em.description = message + "\n" + self._draw_play(author.activity)
-            # em.set_footer(text=author.activity.duration)
+            em.description = (
+                f"{message}\n "
+                f"[{artist_title}]({url})\n"
+                f"{self._draw_play(author.activity)}"
+            )
+
             em.set_thumbnail(url=author.activity.album_cover_url)
+        elif state == "listeningcustom":
+            activity = [c for c in author.activities if c.type == discord.ActivityType.listening]
+            em = discord.Embed(color=activity[0].color)
+            url = f"https://open.spotify.com/track/{activity[0].track_id}"
+            artist_title = f"{activity[0].title} by " + ", ".join(a for a in activity[0].artists)
+            limit = 256 - (len(author.display_name) + 27)
+            em.set_author(
+                name=f"{author.display_name} is currently listening to",
+                icon_url=avatar,
+                url=url
+            )
+            em.description = (
+                f"{message}\n "
+                f"[{artist_title}]({url})\n"
+                f"{self._draw_play(activity[0])}"
+            )
+            em.set_thumbnail(url=activity[0].album_cover_url)
         elif state == "streaming":
             color = int("6441A4", 16)
             em = discord.Embed(color=color)
@@ -117,10 +143,20 @@ class Away(BaseCog):
                 name=f"{author.display_name} is currently streaming {author.activity.name}",
                 icon_url=avatar,
             )
+        elif state == "streamingcustom":
+            activity = [c for c in author.activities if c.type == discord.ActivityType.streaming]
+            color = int("6441A4", 16)
+            em = discord.Embed(color=color)
+            em.description = message + "\n" + activity[0].url
+            em.title = getattr(author.activity, "details", None)
+            em.set_author(
+                name=f"{author.display_name} is currently streaming {activity[0].name}",
+                icon_url=avatar,
+            )
         else:
             em = discord.Embed(color=color)
             em.set_author(name="{} is currently away".format(author.display_name), icon_url=avatar)
-        if link and state not in ["listening", "gaming"]:
+        if link and state not in ["listening", "listeningcustom", "gaming"]:
             em.set_image(url=link.group(0))
         return em
 
@@ -128,7 +164,6 @@ class Away(BaseCog):
         """
             Replaces user mentions with their username
         """
-        print(message)
         for word in message.split():
             match = re.search(r"<@!?([0-9]+)>", word)
             if match:
@@ -141,40 +176,44 @@ class Away(BaseCog):
             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
-            )
+            msg = f"{author.display_name} is currently away"
         elif state == "idle":
-            msg = "{} is currently away and has set the following message: `{}`".format(
-                author.display_name, message
-            )
+            msg = f"{author.display_name} is currently idle"
         elif state == "dnd":
-            msg = "{} is currently away and has set the following message: `{}`".format(
-                author.display_name, message
-            )
+            msg = f"{author.display_name} is currently do not disturb"
         elif state == "offline":
-            msg = "{} is currently away and has set the following message: `{}`".format(
-                author.display_name, message
-            )
+            msg = f"{author.display_name} is currently offline"
         elif state == "gaming":
-            msg = "{} is currently playing {} and has set the following message: `{}`".format(
-                author.display_name, author.activity.name, message
-            )
+            msg = f"{author.display_name} is currently playing {author.activity.name}"
+        elif state == "gamingcustom":
+            status = [c for c in author.activities if c.type == discord.ActivityType.playing]
+            msg = f"{author.display_name} is currently playing {status[0].name}"
         elif state == "listening":
             artist_title = f"{author.activity.title} by " + ", ".join(
                 a for a in author.activity.artists
             )
             currently_playing = self._draw_play(author.activity)
-            msg = "{} is currently listening to {} and has set the following message: `{}`\n{}".format(
-                author.display_name, artist_title, message, currently_playing
-            )
+            msg = f"{author.display_name} is currently listening to {artist_title}\n{currently_playing}"
+        elif state == "listeningcustom":
+            status = [c for c in author.activities if c.type == discord.ActivityType.listening]
+            artist_title = f"{status[0].title} by " + ", ".join(a for a in status[0].artists)
+            currently_playing = self._draw_play(status[0])
+            msg = f"{author.display_name} is currently listening to {artist_title}\n{currently_playing}"
         elif state == "streaming":
-            msg = "{} is currently streaming at {} and has set the following message: `{}`".format(
-                author.display_name, author.activity.url, message
-            )
+            msg = f"{author.display_name} is currently streaming at {author.activity.url}"
+        elif state == "streamingcustom":
+            status = [c for c in author.activities if c.type == discord.ActivityType.streaming]
+            msg = f"{author.display_name} is currently streaming at {status[0].url}"
         else:
-            msg = "{} is currently away".format(author.display_name)
+            msg = f"{author.display_name} is currently away"
+
+        if message != " " and state != "listeningcustom":
+            msg += f" and has set the following message: `{message}`"
+        elif message != " " and state == "listeningcustom":
+            msg += f"\n\nCustom message: `{message}`"
+
         return msg
 
     async def is_mod_or_admin(self, member: discord.Member):
@@ -189,7 +228,7 @@ class Away(BaseCog):
             return True
         return False
 
-    @listener()
+    @commands.Cog.listener()
     async def on_message(self, message):
         tmp = {}
         guild = message.guild
@@ -206,92 +245,141 @@ class Away(BaseCog):
         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()
+            user_data = await self._away.user(author).all()
+            text_only = await self._away.guild(guild).TEXT_ONLY()
+            embed_links = message.channel.permissions_for(guild.me).embed_links
+
+            away_msg = user_data["MESSAGE"]
             if away_msg:
                 if type(away_msg) in [tuple, list]:
                     # This is just to keep backwards compatibility
                     away_msg, delete_after = away_msg
                 else:
                     delete_after = None
-                if message.channel.permissions_for(guild.me).embed_links:
+                if embed_links and not text_only:
                     em = await self.make_embed_message(author, away_msg, "away")
                     await message.channel.send(embed=em, delete_after=delete_after)
-                else:
+                elif (embed_links and text_only) or not embed_links:
                     msg = await self.make_text_message(author, away_msg, "away")
                     await message.channel.send(msg, delete_after=delete_after)
                 continue
-            idle_msg = await self._away.user(author).IDLE_MESSAGE()
+            idle_msg = user_data["IDLE_MESSAGE"]
             if idle_msg and author.status == discord.Status.idle:
                 if type(idle_msg) in [tuple, list]:
                     idle_msg, delete_after = idle_msg
                 else:
                     delete_after = None
-                if message.channel.permissions_for(guild.me).embed_links:
+                if embed_links and not text_only:
                     em = await self.make_embed_message(author, idle_msg, "idle")
                     await message.channel.send(embed=em, delete_after=delete_after)
-                else:
+                elif (embed_links and text_only) or not embed_links:
                     msg = await self.make_text_message(author, idle_msg, "idle")
                     await message.channel.send(msg, delete_after=delete_after)
                 continue
-            dnd_msg = await self._away.user(author).DND_MESSAGE()
+            dnd_msg = user_data["DND_MESSAGE"]
             if dnd_msg and author.status == discord.Status.dnd:
                 if type(dnd_msg) in [tuple, list]:
                     dnd_msg, delete_after = dnd_msg
                 else:
                     delete_after = None
-                if message.channel.permissions_for(guild.me).embed_links:
+                if embed_links and not text_only:
                     em = await self.make_embed_message(author, dnd_msg, "dnd")
                     await message.channel.send(embed=em, delete_after=delete_after)
-                else:
+                elif (embed_links and text_only) or not embed_links:
                     msg = await self.make_text_message(author, dnd_msg, "dnd")
                     await message.channel.send(msg, delete_after=delete_after)
                 continue
-            offline_msg = await self._away.user(author).OFFLINE_MESSAGE()
+            offline_msg = user_data["OFFLINE_MESSAGE"]
             if offline_msg and author.status == discord.Status.offline:
                 if type(offline_msg) in [tuple, list]:
                     offline_msg, delete_after = offline_msg
                 else:
                     delete_after = None
-                if message.channel.permissions_for(guild.me).embed_links:
+                if embed_links and not text_only:
                     em = await self.make_embed_message(author, offline_msg, "offline")
                     await message.channel.send(embed=em, delete_after=delete_after)
-                else:
+                elif (embed_links and text_only) or not embed_links:
                     msg = await self.make_text_message(author, offline_msg, "offline")
                     await message.channel.send(msg, delete_after=delete_after)
                 continue
-            streaming_msg = await self._away.user(author).STREAMING_MESSAGE()
+            streaming_msg = user_data["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:
+                if embed_links and not text_only:
                     em = await self.make_embed_message(author, streaming_msg, "streaming")
                     await message.channel.send(embed=em, delete_after=delete_after)
-                else:
+                elif (embed_links and text_only) or not embed_links:
                     msg = await self.make_text_message(author, streaming_msg, "streaming")
                     await message.channel.send(msg, delete_after=delete_after)
                 continue
-            listening_msg = await self._away.user(author).LISTENING_MESSAGE()
+            if streaming_msg and type(author.activity) is discord.CustomActivity:
+                stream_status = [
+                    c for c in author.activities if c.type == discord.ActivityType.streaming
+                ]
+                if not stream_status:
+                    continue
+                streaming_msg, delete_after = streaming_msg
+                if embed_links and not text_only:
+                    em = await self.make_embed_message(author, streaming_msg, "streamingcustom")
+                    await message.channel.send(embed=em, delete_after=delete_after)
+                elif (embed_links and text_only) or not embed_links:
+                    msg = await self.make_text_message(author, streaming_msg, "streamingcustom")
+                    await message.channel.send(msg, delete_after=delete_after)
+                continue
+            listening_msg = user_data["LISTENING_MESSAGE"]
             if listening_msg and type(author.activity) is discord.Spotify:
                 listening_msg, delete_after = listening_msg
-                if message.channel.permissions_for(guild.me).embed_links:
+                if embed_links and not text_only:
                     em = await self.make_embed_message(author, listening_msg, "listening")
                     await message.channel.send(embed=em, delete_after=delete_after)
-                else:
+                elif (embed_links and text_only) or not embed_links:
                     msg = await self.make_text_message(author, listening_msg, "listening")
                     await message.channel.send(msg, delete_after=delete_after)
                 continue
-            gaming_msgs = await self._away.user(author).GAME_MESSAGE()
+            if listening_msg and type(author.activity) is discord.CustomActivity:
+                listening_status = [
+                    c for c in author.activities if c.type == discord.ActivityType.listening
+                ]
+                if not listening_status:
+                    continue
+                listening_msg, delete_after = listening_msg
+                if embed_links and not text_only:
+                    em = await self.make_embed_message(author, listening_msg, "listeningcustom")
+                    await message.channel.send(embed=em, delete_after=delete_after)
+                elif (embed_links and text_only) or not embed_links:
+                    msg = await self.make_text_message(author, listening_msg, "listeningcustom")
+                    await message.channel.send(msg, delete_after=delete_after)
+                continue
+            gaming_msgs = user_data["GAME_MESSAGE"]
             if gaming_msgs and type(author.activity) in [discord.Game, discord.Activity]:
                 for game in gaming_msgs:
                     if game in author.activity.name.lower():
                         game_msg, delete_after = gaming_msgs[game]
-                        if message.channel.permissions_for(guild.me).embed_links:
+                        if embed_links and not text_only:
                             em = await self.make_embed_message(author, game_msg, "gaming")
                             await message.channel.send(embed=em, delete_after=delete_after)
                             break  # Let's not accidentally post more than one
-                        else:
+                        elif (embed_links and text_only) or not embed_links:
                             msg = await self.make_text_message(author, game_msg, "gaming")
                             await message.channel.send(msg, delete_after=delete_after)
                             break
+            if gaming_msgs and type(author.activity) is discord.CustomActivity:
+                game_status = [
+                    c for c in author.activities if c.type == discord.ActivityType.playing
+                ]
+                if not game_status:
+                    continue
+                for game in gaming_msgs:
+                    if game in game_status[0].name.lower():
+                        game_msg, delete_after = gaming_msgs[game]
+                        if embed_links and not text_only:
+                            em = await self.make_embed_message(author, game_msg, "gamingcustom")
+                            await message.channel.send(embed=em, delete_after=delete_after)
+                            break  # Let's not accidentally post more than one
+                        elif (embed_links and text_only) or not embed_links:
+                            msg = await self.make_text_message(author, game_msg, "gamingcustom")
+                            await message.channel.send(msg, delete_after=delete_after)
+                            break
 
     @commands.command(name="away")
     async def away_(self, ctx, delete_after: Optional[int] = None, *, message: str = None):
@@ -318,7 +406,7 @@ class Away(BaseCog):
     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
         """
@@ -339,7 +427,7 @@ class Away(BaseCog):
     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
         """
@@ -424,24 +512,26 @@ class Away(BaseCog):
     ):
         """
         Set an automatic reply when you're playing a specified game.
-        
+
         `game` The game you would like automatic responses for
         `delete_after` Optional seconds to delete the automatic reply
         `message` The custom message to display when you're mentioned
+
+        Use "double quotes" around a game's name if it is more than one word.
         """
         author = ctx.message.author
         mess = await self._away.user(author).GAME_MESSAGE()
         if game.lower() in mess:
             del mess[game.lower()]
             await self._away.user(author).GAME_MESSAGE.set(mess)
-            msg = "The bot will no longer reply for you when you're playing {}.".format(game)
+            msg = f"The bot will no longer reply for you when you're playing {game}."
         else:
             if message is None:
                 mess[game.lower()] = (" ", delete_after)
             else:
                 mess[game.lower()] = (message, delete_after)
             await self._away.user(author).GAME_MESSAGE.set(mess)
-            msg = "The bot will now reply for you when you're playing {}.".format(game)
+            msg = f"The bot will now reply for you when you're playing {game}."
         await ctx.send(msg)
 
     @commands.command(name="toggleaway")
@@ -449,7 +539,7 @@ class Away(BaseCog):
     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
@@ -465,6 +555,22 @@ class Away(BaseCog):
             message = "Ignoring this guild."
         await ctx.send(message)
 
+    @commands.command()
+    @checks.admin_or_permissions(administrator=True)
+    async def awaytextonly(self, ctx):
+        """
+        Toggle forcing the guild's away messages to be text only.
+
+        This overrides the embed_links check this cog uses for message sending.
+        """
+        text_only = await self._away.guild(ctx.guild).TEXT_ONLY()
+        if text_only:
+            message = "Away messages will now be embedded or text only based on the bot's permissions for embed links."
+        else:
+            message = "Away messages are now forced to be text only, regardless of the bot's permissions for embed links."
+        await self._away.guild(ctx.guild).TEXT_ONLY.set(not text_only)
+        await ctx.send(message)
+
     @commands.command(name="awaysettings", aliases=["awayset"])
     async def away_settings(self, ctx):
         """View your current away settings"""

blurplefy/blurplefy.py

@@ -396,21 +396,21 @@ class Blurplefy(commands.Cog):
 
     @commands.command()
     async def countdown(self, ctx):
-        """Countdown to Discord's 5th Anniversary."""
+        """Countdown to Discord's 6th Anniversary."""
         embed = discord.Embed(name="", colour=0x7289da)
         timeleft = (
-            datetime.datetime(2019, 5, 13)
+            datetime.datetime(2020, 5, 13)
             + datetime.timedelta(hours=7)
             - datetime.datetime.utcnow()
         )
-        embed.set_author(name="Time left until Discord's 5th Anniversary")
+        embed.set_author(name="Time left until Discord's 6th Anniversary")
         if int(timeleft.total_seconds()) < 0:
             timeleft = (
-                datetime.datetime(2020, 5, 13)
+                datetime.datetime(2021, 5, 13)
                 + datetime.timedelta(hours=7)
                 - datetime.datetime.utcnow()
             )
-            embed.set_author(name="Time left until Discord's 5th Anniversary")
+            embed.set_author(name="Time left until Discord's 6th Anniversary")
         embed.add_field(
             name="Countdown to midnight, May 13, California time (UTC-7):",
             value=("{}".format(self._dynamic_time(int(timeleft.total_seconds())))),

blurplefy/info.json

@@ -9,7 +9,7 @@
 		"manage_roles"
 	],
 	"requirements": [
-		"pillow==5.2.0",
+		"pillow",
 		"python-resize-image"
 	],
 	"short": "Blurplefy a user profile picture or image.",
@@ -19,4 +19,4 @@
         "profile"
 	],
 	"type": "COG"
-}
+}

chatchart/chatchart.py

@@ -7,6 +7,7 @@ import discord
 import heapq
 import os
 from io import BytesIO
+from typing import Optional
 import matplotlib
 
 matplotlib.use("agg")
@@ -16,9 +17,7 @@ plt.switch_backend("agg")
 from redbot.core import commands
 
 
-BaseCog = getattr(commands, "Cog", object)
-
-class Chatchart(BaseCog):
+class Chatchart(commands.Cog):
     """Show activity."""
 
     def __init__(self, bot):
@@ -81,7 +80,8 @@ class Chatchart(BaseCog):
     @commands.guild_only()
     @commands.command()
     @commands.cooldown(1, 10, commands.BucketType.channel)
-    async def chatchart(self, ctx, channel: discord.TextChannel = None, messages=5000):
+    @commands.max_concurrency(1, commands.BucketType.channel)
+    async def chatchart(self, ctx, channel: Optional[discord.TextChannel] = None, messages=5000):
         """
         Generates a pie chart, representing the last 5000 messages in the specified channel.
         """
@@ -104,10 +104,10 @@ class Chatchart(BaseCog):
         msg_data = {"total count": 0, "users": {}}
 
         for msg in history:
-            if len(msg.author.name) >= 20:
-                short_name = "{}...".format(msg.author.name[:20]).replace("$", "\$")
+            if len(msg.author.display_name) >= 20:
+                short_name = "{}...".format(msg.author.display_name[:20]).replace("$", "\\$")
             else:
-                short_name = msg.author.name.replace("$", "\$")
+                short_name = msg.author.display_name.replace("$", "\\$")
             whole_name = "{}#{}".format(short_name, msg.author.discriminator)
             if msg.author.bot:
                 pass

dictionary/dictionary.py

@@ -1,9 +1,13 @@
 import aiohttp
 from bs4 import BeautifulSoup
+import logging
 import re
 from redbot.core import commands
 
 
+log = logging.getLogger("red.aikaterna.dictionary")
+
+
 class Dictionary(commands.Cog):
     """Word, yo
     Parts of this cog are adapted from the PyDictionary library."""
@@ -19,9 +23,9 @@ class Dictionary(commands.Cog):
         try:
             async with self.session.request("GET", url) as response:
                 return BeautifulSoup(await response.text(), "html.parser")
-        except Exception as e:
-            print(e)
-            return
+        except Exception:
+            log.error("Error fetching dictionary.py related webpage", exc_info=True)
+            return None
 
     @commands.command()
     async def antonym(self, ctx, *, word: str):
@@ -37,7 +41,9 @@ class Dictionary(commands.Cog):
 
     async def _antonym(self, ctx, word):
         data = await self._get_soup_object(f"http://www.thesaurus.com/browse/{word}")
-        section = data.find_all("ul", {"class": "css-1lc0dpe et6tpn80"})
+        if not data:
+            return await ctx.send("Error fetching data.")
+        section = data.find_all("ul", {"class": "css-1ytlws2 et6tpn80"})
         try:
             section[1]
         except IndexError:
@@ -74,10 +80,12 @@ class Dictionary(commands.Cog):
         await search_msg.edit(content=str_buffer)
 
     async def _definition(self, ctx, word):
-        html = await self._get_soup_object(f"http://wordnetweb.princeton.edu/perl/webwn?s={word}")
-        types = html.findAll("h3")
+        data = await self._get_soup_object(f"http://wordnetweb.princeton.edu/perl/webwn?s={word}")
+        if not data:
+            return await ctx.send("Error fetching data.")
+        types = data.findAll("h3")
         length = len(types)
-        lists = html.findAll("ul")
+        lists = data.findAll("ul")
         out = {}
         if not lists:
             return
@@ -95,7 +103,9 @@ class Dictionary(commands.Cog):
 
     async def _synonym(self, ctx, word):
         data = await self._get_soup_object(f"http://www.thesaurus.com/browse/{word}")
-        section = data.find_all("ul", {"class": "css-1lc0dpe et6tpn80"})
+        if not data:
+            return await ctx.send("Error fetching data.")
+        section = data.find_all("ul", {"class": "css-1ytlws2 et6tpn80"})
         try:
             section[1]
         except IndexError:

dungeon/dungeon.py

@@ -1,7 +1,12 @@
 import asyncio
 import datetime
 import discord
+import logging
 from redbot.core import Config, commands, checks, modlog
+from redbot.core.utils.chat_formatting import box, pagify
+
+
+log = logging.getLogger("red.aikaterna.dungeon")
 
 
 class Dungeon(commands.Cog):
@@ -16,6 +21,7 @@ class Dungeon(commands.Cog):
             "auto_ban": False,
             "auto_ban_message": None,
             "auto_blacklist": False,
+            "bypass": [],
             "dm_message": None,
             "dm_toggle": False,
             "dungeon_channel": None,
@@ -41,7 +47,10 @@ class Dungeon(commands.Cog):
         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 you are reading this to learn, DON'T do this, there will be a real way
+            # to interact with bot-owned data without touching config directly at some
+            # point in the future after Red 3.2
+            async with self.bot._config.blacklist() as blacklist_list:
                 if user.id not in blacklist_list:
                     blacklist_list.append(user.id)
 
@@ -65,9 +74,7 @@ class Dungeon(commands.Cog):
             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."
-        )
+        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)
@@ -113,6 +120,35 @@ class Dungeon(commands.Cog):
         await self.config.guild(ctx.guild).auto_blacklist.set(not auto_blacklist)
         await ctx.send(f"Auto-blacklisting dungeon users from the bot: {not auto_blacklist}.")
 
+    @dungeon.command()
+    @commands.cooldown(1, 5, discord.ext.commands.BucketType.guild)
+    async def bypass(self, ctx, user_id: int):
+        """Add a user ID to the bypass list - user will be able to join without restrictions."""
+        if not 17 <= len(str(user_id)) >= 18:
+            return await ctx.send("This doesn't look like a Discord user id.")
+        bypass_ids = await self.config.guild(ctx.guild).bypass()
+        if user_id in bypass_ids:
+            return await ctx.send(f"**{user_id}** is already in the list of bypassed users.")
+        bypass_ids.append(user_id)
+        await self.config.guild(ctx.guild).bypass.set(bypass_ids)
+        bypassed_user = await self.bot.fetch_user(user_id)
+        await ctx.send(
+            f"**{bypassed_user}** ({user_id}) has been added to the bypass list. The next time they attempt to join this server, they will bypass any Dungeon restrictions."
+        )
+
+    @dungeon.command()
+    @commands.cooldown(1, 5, discord.ext.commands.BucketType.guild)
+    async def bypasslist(self, ctx):
+        """Show the current bypass list."""
+        bypass_ids = await self.config.guild(ctx.guild).bypass()
+        msg = "[Bypassed IDs]\n"
+        if not bypass_ids:
+            msg += "None."
+        for id in bypass_ids:
+            msg += f"{id}\n"
+        for page in pagify(msg, delims=["\n"], page_length=1000):
+            await ctx.send(box(msg, lang="ini"))
+
     @dungeon.command()
     async def channel(self, ctx, channel: discord.TextChannel):
         """Sets the text channel to use for the dungeon."""
@@ -172,7 +208,7 @@ class Dungeon(commands.Cog):
         await ctx.send(f"Default profile pic flagging: {not profile_toggle}.")
 
     @dungeon.command()
-    async def userrole(self, ctx, role_name: discord.Role = None):
+    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)
@@ -203,7 +239,10 @@ class Dungeon(commands.Cog):
         dm_message = data["dm_message"]
 
         if blacklist:
-            async with self.bot.db.blacklist() as blacklist_list:
+            # if you are reading this to learn, DON'T do this, there will be a real way
+            # to interact with bot-owned data without touching config directly at some
+            # point in the future after Red 3.2
+            async with self.bot._config.blacklist() as blacklist_list:
                 if user.id in blacklist_list:
                     blacklist_list.remove(user.id)
 
@@ -235,9 +274,7 @@ class Dungeon(commands.Cog):
             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."
-        )
+        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:
@@ -285,7 +322,7 @@ class Dungeon(commands.Cog):
             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)"
+                f"Done.\nDungeon channel created: {dungeon_channel.mention}\nDungeon role created: {dungeon_role.name}\n\nPlease set these items manually:\n- The announce channel for reporting new users that are moved to the dungeon ({ctx.prefix}dungeon announce)\n- The role you wish to award regular members when they join the server ({ctx.prefix}dungeon userrole)\n- The toggle for enabling the regular user role awarding ({ctx.prefix}dungeon usertoggle)"
             )
 
         except discord.Forbidden:
@@ -363,16 +400,38 @@ class Dungeon(commands.Cog):
         auto_ban = await self.config.guild(member.guild).auto_ban()
         auto_ban_msg = await self.config.guild(member.guild).auto_ban_message()
         mod_log = await self.config.guild(member.guild).mod_log()
+        bypassed_ids = await self.config.guild(member.guild).bypass()
+
+        if member.id in bypassed_ids:
+            bypassed_ids.remove(member.id)
+            await self.config.guild(member.guild).bypass.set(bypassed_ids)
+            user_role_id = await self.config.guild(member.guild).user_role()
+            user_role_obj = discord.utils.get(member.guild.roles, id=user_role_id)
+            try:
+                await member.add_roles(
+                    user_role_obj,
+                    reason="User has bypassed Dungeon checks. Assigning member role.",
+                )
+            except discord.Forbidden:
+                pass
+            except AttributeError:
+                pass
+            bypass_msg = f"**{member}** ({member.id}) was in the bypass list for **{member.guild.name}** ({member.guild.id}). They were allowed to join without Dungeon checks and I have assigned them the Member role specified in the settings, if any."
+            if announce_channel:
+                await channel_object.send(bypass_msg)
+            else:
+                log.debug(f"dungeon.py: {bypass_msg}")
+            return
 
         if (since_join.days < join_days) or (profile_toggle and default_avatar):
+            banned = False
             blacklist = await self.config.guild(member.guild).auto_blacklist()
             dungeon_role_id = await self.config.guild(member.guild).dungeon_role()
             dungeon_role_obj = discord.utils.get(member.guild.roles, id=dungeon_role_id)
-            perm_msg = (
-                f"dungeon.py: Unable to auto-ban user, permissions needed and no announce channel set. Guild: {member.guild.id}"
-            )
+            perm_msg = f"dungeon.py: Unable to auto-ban user, permissions needed and no announce channel set. Guild: {member.guild.id}"
 
             if auto_ban:
+                banned = True
                 if auto_ban_msg:
                     try:
                         await member.send(auto_ban_msg)
@@ -382,7 +441,7 @@ class Dungeon(commands.Cog):
                                 f"I couldn't DM {member} ({member.id}) to let them know they've been banned, they've blocked me."
                             )
                         else:
-                            print(perm_msg)
+                            log.debug(perm_msg)
                             return
                 try:
                     await member.guild.ban(
@@ -394,17 +453,15 @@ class Dungeon(commands.Cog):
                             f"I tried to auto-ban someone ({member}, {member.id}) but I don't have ban permissions."
                         )
                     else:
-                        print(perm_msg)
+                        log.debug(perm_msg)
                         return
 
                 if not mod_log:
                     if announce_channel:
-                        msg = (
-                            f"Auto-banned new user: \n**{member}** ({member.id})\n{self._dynamic_time(int(since_join.total_seconds()))} old account"
-                        )
+                        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)
+                        log.debug(perm_msg)
                         return
                 else:
                     try:
@@ -418,15 +475,21 @@ class Dungeon(commands.Cog):
                             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}"
+                    except RuntimeError:
+                        log.error(
+                            f"dungeon.py error while autobanning user and attempting to create modlog entry in guild: {member.guild.id}",
+                            exc_info=True,
                         )
 
             if blacklist:
-                async with self.bot.db.blacklist() as blacklist_list:
+                # if you are reading this to learn, DON'T do this, there will be a real way
+                # to interact with bot-owned data without touching config directly at some
+                # point in the future after Red 3.2
+                async with self.bot._config.blacklist() as blacklist_list:
                     if member.id not in blacklist_list:
                         blacklist_list.append(member.id)
+            if banned:
+                return
             try:
                 if since_join.days < join_days:
                     reason = "Adding dungeon role, new account."
@@ -439,12 +502,12 @@ class Dungeon(commands.Cog):
                         "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.")
+                    log.info(
+                        f"dungeon.py: I need permissions to manage channels and manage roles in {member.guild.name} ({member.guild.id})."
+                    )
                     return
 
-            msg = (
-                f"Auto-banished new user: \n**{member}** ({member.id})\n{self._dynamic_time(int(since_join.total_seconds()))} old account"
-            )
+            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)

hunting/__init__.py

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

hunting/hunting.py

@@ -0,0 +1,398 @@
+import asyncio
+import discord
+import datetime
+import itertools
+import math
+import random
+import time
+
+from redbot.core import checks, commands, Config
+from redbot.core.utils.chat_formatting import bold, box, humanize_list, humanize_number, pagify
+from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
+
+
+__version__ = "3.1.3"
+
+
+class Hunting(commands.Cog):
+    """Hunting, it hunts birds and things that fly."""
+
+    def __init__(self, bot):
+        self.bot = bot
+        self.config = Config.get_conf(self, 2784481002, force_registration=True)
+
+        self.animals = {
+            "dove": ":dove: **_Coo!_**",
+            "penguin": ":penguin: **_Noot!_**",
+            "chicken": ":chicken: **_Bah-gawk!_**",
+            "duck": ":duck: **_Quack!_**",
+        }
+        self.in_game = []
+        self.paused_games = []
+        self.next_bang = {}
+        self.game_tasks = []
+
+        default_guild = {
+            "hunt_interval_minimum": 900,
+            "hunt_interval_maximum": 3600,
+            "wait_for_bang_timeout": 20,
+            "channels": [],
+            "bang_time": False,
+            "bang_words": True,
+        }
+        default_user = {"score": {}, "total": 0}
+        self.config.register_user(**default_user)
+        self.config.register_guild(**default_guild)
+
+    @commands.guild_only()
+    @commands.group()
+    async def hunting(self, ctx):
+        """Hunting, it hunts birds and things that fly."""
+        if ctx.invoked_subcommand is None:
+            guild_data = await self.config.guild(ctx.guild).all()
+            if not guild_data["channels"]:
+                channel_names = ["No channels set."]
+            else:
+                channel_names = []
+                for channel_id in guild_data["channels"]:
+                    channel_obj = self.bot.get_channel(channel_id)
+                    channel_names.append(channel_obj.name)
+
+            hunting_mode = "Words" if guild_data["bang_words"] else "Reactions"
+            reaction_time = "On" if guild_data["bang_time"] else "Off"
+
+            msg = f"[Hunting in]:                 {humanize_list(channel_names)}\n"
+            msg += f"[Bang timeout]:               {guild_data['wait_for_bang_timeout']} seconds\n"
+            msg += f"[Hunt interval minimum]:      {guild_data['hunt_interval_minimum']} seconds\n"
+            msg += f"[Hunt interval maximum]:      {guild_data['hunt_interval_maximum']} seconds\n"
+            msg += f"[Hunting mode]:               {hunting_mode}\n"
+            msg += f"[Bang response time message]: {reaction_time}\n"
+
+            for page in pagify(msg, delims=["\n"]):
+                await ctx.send(box(page, lang="ini"))
+
+    @hunting.command()
+    async def leaderboard(self, ctx, global_leaderboard=False):
+        """
+        This will show the top 50 hunters for the server.
+        Use True for the global_leaderboard variable to show the global leaderboard.
+        """
+        userinfo = await self.config._all_from_scope(scope="USER")
+        if not userinfo:
+            return await ctx.send(bold("Please shoot something before you can brag about it."))
+
+        async with ctx.typing():
+            sorted_acc = sorted(userinfo.items(), key=lambda x: (x[1]["total"]), reverse=True)[:50]
+
+        if not hasattr(ctx.guild, "members"):
+            global_leaderboard = True
+
+        pound_len = len(str(len(sorted_acc)))
+        score_len = 10
+        header = "{score:{score_len}}{name:2}\n".format(
+            score="# Birds Shot",
+            score_len=score_len + 5,
+            name="Name"
+            if not str(ctx.author.mobile_status) in ["online", "idle", "dnd"]
+            else "Name",
+        )
+        temp_msg = header
+        for account in sorted_acc:
+            if account[1]["total"] == 0:
+                continue
+            if global_leaderboard or (account[0] in [member.id for member in ctx.guild.members]):
+                user_obj = self.bot.get_user(account[0]) or account[0]
+            else:
+                continue
+            if isinstance(user_obj, discord.User) and len(str(user_obj)) > 28:
+                user_name = f"{user_obj.name[:19]}...#{user_obj.discriminator}"
+            else:
+                user_name = str(user_obj)
+            if user_obj == ctx.author:
+                temp_msg += f"{humanize_number(account[1]['total']) + '   ': <{score_len + 4}} <<{user_name}>>\n"
+            else:
+                temp_msg += f"{humanize_number(account[1]['total']) + '   ': <{score_len + 4}} {user_name}\n"
+
+        page_list = []
+        pages = 1
+        for page in pagify(temp_msg, delims=["\n"], page_length=800):
+            if global_leaderboard:
+                title = "Global Hunting Leaderboard"
+            else:
+                title = f"Hunting Leaderboard For {ctx.guild.name}"
+            embed = discord.Embed(
+                colour=await ctx.bot.get_embed_color(location=ctx.channel),
+                description=box(title, lang="prolog") + (box(page, lang="md")),
+            )
+            embed.set_footer(
+                text=f"Page {humanize_number(pages)}/{humanize_number(math.ceil(len(temp_msg) / 800))}"
+            )
+            pages += 1
+            page_list.append(embed)
+        if len(page_list) == 1:
+            await ctx.send(embed=page_list[0])
+        else:
+            await menu(ctx, page_list, DEFAULT_CONTROLS)
+
+    @checks.mod_or_permissions(manage_guild=True)
+    @hunting.command()
+    async def bangtime(self, ctx):
+        """Toggle displaying the bang response time from users."""
+        toggle = await self.config.guild(ctx.guild).bang_time()
+        await self.config.guild(ctx.guild).bang_time.set(not toggle)
+        toggle_text = "will not" if toggle else "will"
+        await ctx.send(f"Bang reaction time {toggle_text} be shown.\n")
+
+    @checks.mod_or_permissions(manage_guild=True)
+    @hunting.command()
+    async def mode(self, ctx):
+        """Toggle whether the bot listens for 'bang' or a reaction."""
+        toggle = await self.config.guild(ctx.guild).bang_words()
+        await self.config.guild(ctx.guild).bang_words.set(not toggle)
+        toggle_text = "Use the reaction" if toggle else "Type 'bang'"
+        await ctx.send(f"{toggle_text} to react to the bang message when it appears.\n")
+
+    @checks.mod_or_permissions(manage_guild=True)
+    @hunting.command()
+    async def next(self, ctx):
+        """When will the next occurrence happen?"""
+        try:
+            self.next_bang[ctx.guild.id]
+            time = abs(datetime.datetime.utcnow() - self.next_bang[ctx.guild.id])
+            total_seconds = int(time.total_seconds())
+            hours, remainder = divmod(total_seconds, 60 * 60)
+            minutes, seconds = divmod(remainder, 60)
+            message = f"The next occurrence will be in {hours} hours and {minutes} minutes."
+        except KeyError:
+            message = "There is currently no hunt."
+        await ctx.send(bold(message))
+
+    @hunting.command(name="score")
+    async def score(self, ctx, member: discord.Member = None):
+        """This will show the score of a hunter."""
+        if not member:
+            member = ctx.author
+        score = await self.config.user(member).score()
+        total = 0
+        kill_list = []
+        if not score:
+            message = "Please shoot something before you can brag about it."
+
+        for animal in score.items():
+            total = total + animal[1]
+            if animal[1] == 1 or animal[0][-1] == "s":
+                kill_list.append(f"{animal[1]} {animal[0].capitalize()}")
+            else:
+                kill_list.append(f"{animal[1]} {animal[0].capitalize()}s")
+            message = f"{member.name} shot a total of {total} animals ({humanize_list(kill_list)})"
+        await ctx.send(bold(message))
+
+    @checks.mod_or_permissions(manage_guild=True)
+    @hunting.command()
+    async def start(self, ctx, channel: discord.TextChannel = None):
+        """Start the hunt."""
+        if not channel:
+            channel = ctx.channel
+
+        if not channel.permissions_for(ctx.guild.me).send_messages:
+            return await ctx.send(bold("I can't send messages in that channel!"))
+
+        channel_list = await self.config.guild(ctx.guild).channels()
+        if channel.id in channel_list:
+            message = f"We're already hunting in {channel.mention}!"
+        else:
+            channel_list.append(channel.id)
+            message = f"The hunt has started in {channel.mention}. Good luck to all."
+            await self.config.guild(ctx.guild).channels.set(channel_list)
+
+        await ctx.send(bold(message))
+
+    @checks.mod_or_permissions(manage_guild=True)
+    @hunting.command()
+    async def stop(self, ctx, channel: discord.TextChannel = None):
+        """Stop the hunt."""
+        if not channel:
+            channel = ctx.channel
+        channel_list = await self.config.guild(ctx.guild).channels()
+
+        if channel.id not in channel_list:
+            message = f"We're not hunting in {channel.mention}!"
+        else:
+            channel_list.remove(channel.id)
+            message = f"The hunt has stopped in {channel.mention}."
+            await self.config.guild(ctx.guild).channels.set(channel_list)
+
+        await ctx.send(bold(message))
+
+    @checks.mod_or_permissions(manage_guild=True)
+    @hunting.command()
+    async def timing(self, ctx, interval_min: int, interval_max: int, bang_timeout: int):
+        """
+        Change the hunting timing.
+        
+        `interval_min` = Minimum time in seconds for a new bird. (120s min)
+        `interval_max` = Maximum time in seconds for a new bird. (240s min)
+        `bang_timeout` = Time in seconds for users to shoot a bird before it flies away. (10s min)
+        """
+        message = ""
+        if interval_min > interval_max:
+            return await ctx.send("`interval_min` needs to be lower than `interval_max`.")
+        if interval_min < 0 and interval_max < 0 and bang_timeout < 0:
+            return await ctx.send("Please no negative numbers!")
+        if interval_min < 120:
+            interval_min = 120
+            message += "Minimum interval set to minimum of 120s.\n"
+        if interval_max < 240:
+            interval_max = 240
+            message += "Maximum interval set to minimum of 240s.\n"
+        if bang_timeout < 10:
+            bang_timeout = 10
+            message += "Bang timeout set to minimum of 10s.\n"
+
+        await self.config.guild(ctx.guild).hunt_interval_minimum.set(interval_min)
+        await self.config.guild(ctx.guild).hunt_interval_maximum.set(interval_max)
+        await self.config.guild(ctx.guild).wait_for_bang_timeout.set(bang_timeout)
+        message += f"Timing has been set:\nMin time {interval_min}s\nMax time {interval_max}s\nBang timeout {bang_timeout}s"
+        await ctx.send(bold(message))
+
+    @hunting.command()
+    async def version(self, ctx):
+        """Show the cog version."""
+        await ctx.send(f"Hunting version {__version__}.")
+
+    async def _add_score(self, guild, author, avian):
+        user_data = await self.config.user(author).all()
+        try:
+            user_data["score"][avian] += 1
+        except KeyError:
+            user_data["score"][avian] = 1
+        user_data["total"] += 1
+        await self.config.user(author).set_raw(value=user_data)
+
+    async def _latest_message_check(self, channel):
+        hunt_int_max = await self.config.guild(channel.guild).hunt_interval_maximum()
+        async for message in channel.history(limit=5):
+            delta = datetime.datetime.utcnow() - message.created_at
+            if delta.total_seconds() < hunt_int_max * 2 and message.author.id != self.bot.user.id:
+                if channel.id in self.paused_games:
+                    self.paused_games.remove(channel.id)
+                return True
+        if channel.id not in self.paused_games:
+            self.paused_games.append(channel.id)
+            await channel.send(
+                bold(
+                    "It seems there are no hunters here. The hunt will be resumed when someone treads here again."
+                )
+            )
+        return False
+
+    def _next_sorter(self, guild_id, value):
+        try:
+            self.next_bang[guild_id]
+        except KeyError:
+            self.next_bang[guild_id] = value
+
+    async def _wait_for_bang(self, guild, channel):
+        animal = random.choice(list(self.animals.keys()))
+        animal_message = await channel.send(self.animals[animal])
+        now = time.time()
+        timeout = await self.config.guild(guild).wait_for_bang_timeout()
+
+        shooting_type = await self.config.guild(guild).bang_words()
+        if shooting_type:
+
+            def check(message):
+                if guild != message.guild:
+                    return False
+                if channel != message.channel:
+                    return False
+                return (
+                    message.content.lower().split(" ")[0] == "bang" if message.content else False
+                )
+
+            try:
+                bang_msg = await self.bot.wait_for("message", check=check, timeout=timeout)
+            except asyncio.TimeoutError:
+                self.in_game.remove(channel.id)
+                return await channel.send(f"The {animal} got away!")
+            author = bang_msg.author
+
+        else:
+            emoji = "\N{COLLISION SYMBOL}"
+            await animal_message.add_reaction(emoji)
+
+            def check(reaction, user):
+                if user.bot:
+                    return False
+                if guild != reaction.message.guild:
+                    return False
+                if channel != reaction.message.channel:
+                    return False
+                return user and str(reaction.emoji) == "💥"
+
+            try:
+                await self.bot.wait_for("reaction_add", check=check, timeout=timeout)
+            except asyncio.TimeoutError:
+                self.in_game.remove(channel.id)
+                return await channel.send(f"The {animal} got away!")
+
+            message_with_reacts = await animal_message.channel.fetch_message(animal_message.id)
+            reacts = message_with_reacts.reactions[0]
+            async for user in reacts.users():
+                if user.bot:
+                    continue
+                author = user
+                break
+
+        bang_now = time.time()
+        time_for_bang = "{:.3f}".format(bang_now - now)
+        bangtime = (
+            "" if not await self.config.guild(guild).bang_time() else f" in {time_for_bang}s"
+        )
+
+        if random.randrange(0, 17) > 1:
+            await self._add_score(guild, author, animal)
+            msg = f"{author.display_name} shot a {animal}{bangtime}!"
+        else:
+            msg = f"{author.display_name} missed the shot and the {animal} got away!"
+
+        self.in_game.remove(channel.id)
+        await channel.send(bold(msg))
+
+    @commands.Cog.listener()
+    async def on_message(self, message):
+        if not message.guild:
+            return
+        if message.author.bot:
+            return
+        if not message.channel.permissions_for(message.guild.me).send_messages:
+            return
+        if message.channel.id in self.in_game:
+            return
+        channel_list = await self.config.guild(message.guild).channels()
+        if not channel_list:
+            return
+        if message.channel.id not in channel_list:
+            return
+
+        if await self._latest_message_check(message.channel):
+            self.in_game.append(message.channel.id)
+
+        guild_data = await self.config.guild(message.guild).all()
+        wait_time = random.randrange(
+            guild_data["hunt_interval_minimum"], guild_data["hunt_interval_maximum"]
+        )
+        self.next_bang[message.guild.id] = datetime.datetime.fromtimestamp(
+            int(time.mktime(datetime.datetime.utcnow().timetuple())) + wait_time
+        )
+        await asyncio.sleep(wait_time)
+        task = self.bot.loop.create_task(self._wait_for_bang(message.guild, message.channel))
+        self.game_tasks.append(task)
+        try:
+            del self.next_bang[message.guild.id]
+        except KeyError:
+            pass
+
+    def cog_unload(self):
+        for task in self.game_tasks:
+            task.cancel()

hunting/info.json

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

icyparser/__init__.py

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

icyparser/icyparser.py

@@ -0,0 +1,77 @@
+import aiohttp
+import discord
+import lavalink
+import struct
+import re
+from redbot.core import commands
+
+
+class IcyParser(commands.Cog):
+    def __init__(self, bot):
+        self.bot = bot
+        self.session = aiohttp.ClientSession()
+
+    async def _icyparser(self, url: str):
+        try:
+            async with self.session.get(url, headers={"Icy-MetaData": "1"}) as resp:
+                metaint = int(resp.headers["icy-metaint"])
+                for _ in range(5):
+                    await resp.content.readexactly(metaint)
+                    metadata_length = struct.unpack("B", await resp.content.readexactly(1))[0] * 16
+                    metadata = await resp.content.readexactly(metadata_length)
+                    m = re.search(br"StreamTitle='([^']*)';", metadata.rstrip(b"\0"))
+                    if m:
+                        title = m.group(1)
+                        if title:
+                            title = title.decode("utf-8", errors="replace")
+                    else:
+                        title = None
+                    image = False
+                    t = re.search(br"StreamUrl='([^']*)';", metadata.rstrip(b"\0"))
+                    if t:
+                        streamurl = t.group(1)
+                        if streamurl:
+                            streamurl = streamurl.decode("utf-8", errors="replace")
+                            image_ext = ["webp", "png", "jpg", "gif"]
+                            if streamurl.split(".")[-1] in image_ext:
+                                image = True
+                    else:
+                        streamurl = None
+
+                    return title, streamurl, image
+
+        except (KeyError, aiohttp.client_exceptions.ClientConnectionError):
+            return None, None, None
+
+    def cog_unload(self):
+        self.bot.loop.create_task(self.session.close())
+
+    @commands.command(aliases=["icynp"])
+    async def icyparser(self, ctx, url=None):
+        """Show Icecast or Shoutcast stream information, if any."""
+        if not url:
+            audiocog = self.bot.get_cog("Audio")
+            if not audiocog:
+                return await ctx.send("Audio is not loaded.")
+            try:
+                player = lavalink.get_player(ctx.guild.id)
+            except KeyError:
+                return await ctx.send("The bot is not playing any music.")
+            if not player.current:
+                return await ctx.send("The bot is not playing any music.")
+            if not player.current.is_stream:
+                return await ctx.send("The bot is not playing a stream.")
+            icy = await self._icyparser(player.current.uri)
+        else:
+            icy = await self._icyparser(url)
+        if not icy[0]:
+            return await ctx.send(
+                f"Can't read the stream information for <{player.current.uri if not url else url}>, it may not be an Icecast or Shoutcast radio station or there may be no stream information available."
+            )
+        song = f"**[{icy[0]}]({player.current.uri if not url else url})**\n"
+        embed = discord.Embed(
+            colour=await ctx.embed_colour(), title="Now Playing", description=song
+        )
+        if icy[2]:
+            embed.set_thumbnail(url=icy[1])
+        await ctx.send(embed=embed)

icyparser/info.json

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

info.json

@@ -1,7 +1,7 @@
 {
-    "author" : "aikaterna (aikaterna#1393)",
+    "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."
-}
+}

invites/__init__.py

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

invites/info.json

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

invites/invites.py

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

luigipoker/__init__.py

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

luigipoker/info.json

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

luigipoker/luigipoker.py

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

nolinks/nolinks.py

@@ -2,16 +2,11 @@ import discord
 import re
 from redbot.core import Config, commands, checks
 
+LINKS = re.compile(
+            "(([\w]+:)?//)?(([\d\w]|%[a-fA-f\d]{2,2})+(:([\d\w]|%[a-fA-f\d]{2,2})+)?@)?([\d\w][-\d\w]{0,253}[\d\w]\.)+[\w]{2,63}(:[\d]+)?(/([-+_~.\d\w]|%[a-fA-f\d]{2,2})*)*(\?(&?([-+_~.\d\w]|%[a-fA-f\d]{2,2})=?)*)?(#([-+_~.\d\w]|%[a-fA-f\d]{2,2})*)?"
+        )
 
-BaseCog = getattr(commands, "Cog", object)
-
-listener = getattr(commands.Cog, "listener", None)  # Trusty + Sinbad
-if listener is None:
-
-    def listener(name=None):
-        return lambda x: x
-
-class NoLinks(BaseCog):
+class NoLinks(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
         self.config = Config.get_conf(self, 2740131001, force_registration=True)
@@ -110,7 +105,7 @@ class NoLinks(BaseCog):
         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.")
 
-    @listener()
+    @commands.Cog.listener()
     async def on_message(self, message):
         if isinstance(message.channel, discord.abc.PrivateChannel):
             return
@@ -150,10 +145,4 @@ class NoLinks(BaseCog):
 
     @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
+        return LINKS.match(url)

otherbot/__init__.py

@@ -1,5 +1,7 @@
 from .otherbot import Otherbot
 
 
-def setup(bot):
-    bot.add_cog(Otherbot(bot))
+async def setup(bot):
+    cog = Otherbot(bot)
+    await cog.generate_cache()
+    bot.add_cog(cog)

otherbot/info.json

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

otherbot/otherbot.py

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

partycrash/partycrash.py

@@ -4,9 +4,7 @@ from redbot.core.utils.chat_formatting import box, pagify
 import asyncio
 
 
-BaseCog = getattr(commands, "Cog", object)
-
-class PartyCrash(BaseCog):
+class PartyCrash(commands.Cog):
     """Partycrash inspired by v2 Admin by Will
        Does not generate invites, only lists existing invites."""
 

pupper/pupper.py

@@ -1,9 +1,14 @@
 import asyncio
 import datetime
 import discord
+import logging
 import random
 from redbot.core import commands, checks, Config, bank
-from redbot.core.utils.chat_formatting import box, humanize_list
+from redbot.core.errors import BalanceTooHigh
+from redbot.core.utils.chat_formatting import box, humanize_list, pagify
+
+
+log = logging.getLogger("red.aikaterna.pupper")
 
 
 class Pupper(commands.Cog):
@@ -20,6 +25,7 @@ class Pupper(commands.Cog):
             "hello_msg": "Hi! Can someone pet me?",
             "last_pet": "2019-08-01 00:00:00.000001",
             "toggle": False,
+            "delete_after": 10,
         }
 
         self.config.register_guild(**default_guild)
@@ -29,14 +35,59 @@ class Pupper(commands.Cog):
     @commands.group()
     async def pets(self, ctx):
         """Manage your pet."""
-        pass
+        if ctx.invoked_subcommand is None:
+            guild_data = await self.config.guild(ctx.guild).all()
+            if not guild_data["channel"]:
+                channel_names = ["No channels set."]
+            else:
+                channel_names = []
+                for channel_id in guild_data["channel"]:
+                    channel_obj = self.bot.get_channel(channel_id)
+                    channel_names.append(channel_obj.name)
+
+            space = "\N{EN SPACE}"
+            toggle = "Active" if guild_data["toggle"] else "Inactive"
+            delete_after = (
+                "No deletion" if not guild_data["delete_after"] else guild_data["delete_after"]
+            )
+
+            msg = f"[Channels]:       {humanize_list(channel_names)}\n"
+            msg += f"[Cooldown]:       {guild_data['cooldown']} seconds\n"
+            msg += f"[Credit range]:   {guild_data['credits'][0]} - {guild_data['credits'][1]} credits\n"
+            msg += f"[Delete after]:   {delete_after}\n"
+            msg += f"[Toggle]:         {toggle}\n"
+            msg += f"{space}\n"
+            msg += f"[Hello message]:  {guild_data['hello_msg']}\n"
+            msg += f"[Thanks message]: {guild_data['borf_msg']}\n"
+
+            for page in pagify(msg, delims=["\n"]):
+                await ctx.send(box(page, lang="ini"))
 
     @pets.command()
     async def toggle(self, ctx):
         """Toggle pets on the server."""
         toggle = await self.config.guild(ctx.guild).toggle()
-        msg = f"Pets active: {not toggle}.\n"
         await self.config.guild(ctx.guild).toggle.set(not toggle)
+        await ctx.send(f"The pet is now {'' if not toggle else 'in'}active.")
+
+    @pets.command()
+    async def delete(self, ctx, amount: int = 0):
+        """
+        Set how long to wait before deleting the thanks message.
+        To leave the thanks message with no deletion, use 0 as the amount.
+        10 is the default.
+        Max is 5 minutes (300).
+		"""
+        if amount < 0:
+            return await ctx.send("Use a positive number.")
+        if 1 <= amount <= 5:
+            return await ctx.send("Use a slightly larger number, greater than 5.")
+        if amount > 300:
+            return await ctx.send("Use a smaller number, less than or equal to 300.")
+
+        set_amount = None if amount == 0 else amount
+        await self.config.guild(ctx.guild).delete_after.set(set_amount)
+        msg = f"Timer set to {amount}." if set_amount else "Delete timer has been turned off."
         await ctx.send(msg)
 
     @pets.command()
@@ -95,13 +146,13 @@ class Pupper(commands.Cog):
         """Channel management for pet appearance."""
         await ctx.send_help()
         channel_list = await self.config.guild(ctx.guild).channel()
-        channel_msg = "Petting Channels:\n"
+        channel_msg = "[Petting Channels]:\n"
         if not channel_list:
             channel_msg += "None."
         for chan in channel_list:
             channel_obj = self.bot.get_channel(chan)
             channel_msg += f"{channel_obj.name}\n"
-        await ctx.send(box(channel_msg))
+        await ctx.send(box(channel_msg, lang="ini"))
 
     @channel.command()
     async def add(self, ctx, channel: discord.TextChannel):
@@ -172,54 +223,68 @@ class Pupper(commands.Cog):
 
     @commands.Cog.listener()
     async def on_message(self, message):
-        if isinstance(message.channel, discord.abc.PrivateChannel):
-            return
-        if message.author.bot:
-            return
-        guild_data = await self.config.guild(message.guild).all()
-        if not guild_data["toggle"]:
-            return
-        if not guild_data["channel"]:
-            return
-        self.pets.setdefault(message.guild.id, False)
-        if self.pets[message.guild.id]:
-            return
+        try:
+            if isinstance(message.channel, discord.abc.PrivateChannel):
+                return
+            if message.author.bot:
+                return
+            guild_data = await self.config.guild(message.guild).all()
+            if not guild_data["toggle"]:
+                return
+            if not guild_data["channel"]:
+                return
+            self.pets.setdefault(message.guild.id, False)
+            if self.pets[message.guild.id]:
+                return
 
-        last_time = datetime.datetime.strptime(str(guild_data["last_pet"]), "%Y-%m-%d %H:%M:%S.%f")
-        now = datetime.datetime.now(datetime.timezone.utc)
-        now = now.replace(tzinfo=None)
-        if (
-            int((now - last_time).total_seconds())
-            > await self.config.guild(message.guild).cooldown()
-        ):
-            self._pet_lock(message.guild.id, True)
-            rando_channel = random.choice(guild_data["channel"])
-            await asyncio.sleep(random.randint(60, 480))
-            rando_channel_obj = self.bot.get_channel(rando_channel)
-            borf_msg = await rando_channel_obj.send(guild_data["hello_msg"])
-            pets = "👋"
-            pets_action = {"veryfastpats": "👋"}
+            last_time = datetime.datetime.strptime(
+                str(guild_data["last_pet"]), "%Y-%m-%d %H:%M:%S.%f"
+            )
+            now = datetime.datetime.now(datetime.timezone.utc)
+            now = now.replace(tzinfo=None)
+            if (
+                int((now - last_time).total_seconds())
+                > await self.config.guild(message.guild).cooldown()
+            ):
+                self._pet_lock(message.guild.id, True)
+                rando_channel = random.choice(guild_data["channel"])
+                await asyncio.sleep(random.randint(60, 480))
+                rando_channel_obj = self.bot.get_channel(rando_channel)
+                borf_msg = await rando_channel_obj.send(guild_data["hello_msg"])
+                pets = "👋"
+                pets_action = {"veryfastpats": "👋"}
 
-            def check(r, u):
-                return r.message.id == borf_msg.id and any(e in str(r.emoji) for e in pets)
+                def check(r, u):
+                    return r.message.id == borf_msg.id and any(e in str(r.emoji) for e in pets)
 
-            try:
-                r, u = await self.bot.wait_for("reaction_add", check=check, timeout=300.0)
-            except asyncio.TimeoutError:
-                return await borf_msg.delete()
+                try:
+                    r, u = await self.bot.wait_for("reaction_add", check=check, timeout=300.0)
+                except asyncio.TimeoutError:
+                    return await borf_msg.delete()
 
-            reacts = {v: k for k, v in pets_action.items()}
-            react = reacts[r.emoji]
-            if react == "veryfastpats":
-                await borf_msg.delete()
-                deposit = random.randint(guild_data["credits"][0], guild_data["credits"][1])
-                await bank.deposit_credits(u, deposit)
-                credits_name = await bank.get_currency_name(message.guild)
-                await rando_channel_obj.send(
-                    content=f"{guild_data['borf_msg']} (`+{deposit}` {credits_name})",
-                    delete_after=10,
-                )
-            else:
-                pass
-            self._pet_lock(message.guild.id, False)
-            await self.config.guild(message.guild).last_pet.set(str(now))
+                reacts = {v: k for k, v in pets_action.items()}
+                react = reacts[r.emoji]
+                if react == "veryfastpats":
+                    await borf_msg.delete()
+                    deposit = random.randint(guild_data["credits"][0], guild_data["credits"][1])
+                    try:
+                        large_bank = False
+                        await bank.deposit_credits(u, deposit)
+                    except BalanceTooHigh as e:
+                        large_bank = True
+                        await bank.set_balance(u, e.max_balance)
+                    credits_name = await bank.get_currency_name(message.guild)
+                    msg = (
+                        f"{guild_data['borf_msg']} (`+{deposit}` {credits_name})"
+                        if not large_bank
+                        else guild_data["borf_msg"]
+                    )
+                    await rando_channel_obj.send(
+                        content=msg, delete_after=guild_data["delete_after"]
+                    )
+                else:
+                    pass
+                self._pet_lock(message.guild.id, False)
+                await self.config.guild(message.guild).last_pet.set(str(now))
+        except Exception:
+            log.error("Error in pupper loop.", exc_info=True)

quiz/__init__.py

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

quiz/info.json

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

quiz/quiz.py

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

rndstatus/info.json

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

rndstatus/rndstatus.py

@@ -1,12 +1,20 @@
+import re
 import discord
 from redbot.core import Config, commands, checks
+from redbot.core.utils import AsyncIter
 from random import choice as rndchoice
+from collections import defaultdict, Counter, Sequence
 import time
+import contextlib
+import asyncio
+import logging
+
+
+log = logging.getLogger("red.aikaterna-cogs.rndstatus")
 
 
 class RndStatus(commands.Cog):
     """Cycles random statuses or displays bot stats.
-
     If a custom status is already set, it won't change it until
     it's back to none. [p]set game"""
 
@@ -14,10 +22,14 @@ class RndStatus(commands.Cog):
         self.bot = bot
         self.last_change = None
         self.config = Config.get_conf(self, 2752521001, force_registration=True)
+        self._user_count = 0
+
+        self.user_task = asyncio.create_task(self._get_user_count())
+        self.presence_task = asyncio.create_task(self.maybe_update_presence())
 
         default_global = {
             "botstats": False,
-            "delay": "300",
+            "delay": 300,
             "statuses": [
                 "her Turn()",
                 "Tomb Raider II",
@@ -31,6 +43,24 @@ class RndStatus(commands.Cog):
         }
         self.config.register_global(**default_global)
 
+    def cog_unload(self):
+        self.user_task.cancel()
+        self.presence_task.cancel()
+
+    async def _get_user_count(self):
+        await self.bot.wait_until_ready()
+        with contextlib.suppress(asyncio.CancelledError):
+            self._user_count = len(self.bot.users)
+            while True:
+                temp_data = defaultdict(set)
+                async for s in AsyncIter(self.bot.guilds):
+                    if s.unavailable:
+                        continue
+                    async for m in AsyncIter(s.members):
+                        temp_data["Unique Users"].add(m.id)
+                self._user_count = len(temp_data["Unique Users"])
+                await asyncio.sleep(30)
+
     @commands.group(autohelp=True)
     @commands.guild_only()
     @checks.is_owner()
@@ -41,7 +71,6 @@ class RndStatus(commands.Cog):
     @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:
@@ -59,10 +88,10 @@ class RndStatus(commands.Cog):
     async def _streamer(self, ctx: commands.Context, *, streamer=None):
         """Set the streamer needed for streaming statuses.
         """
-        
+
         saved_streamer = await self.config.streamer()
-        if streamer == None:
-            return await ctx.send("Current Streamer: " + saved_streamer)
+        if streamer is None:
+            return await ctx.send(f"Current Streamer: {saved_streamer}" )
         await self.config.streamer.set(streamer)
         await ctx.send(
             "Done. Redo this command with no parameters to see the current streamer."
@@ -73,24 +102,23 @@ class RndStatus(commands.Cog):
         """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 ctx.send(f"Botstats toggle: {not botstats}.")
+        if botstats is not False:
             await self.bot.change_presence(activity=None)
 
     @rndstatus.command()
     async def delay(self, ctx, seconds: int):
         """Sets interval of random status switch.
-
         Must be 20 or superior."""
         if seconds < 20:
             seconds = 20
         await self.config.delay.set(seconds)
-        await ctx.send(f"Interval set to {str(seconds)} seconds.")
+        await ctx.send(f"Interval set to {seconds} seconds.")
 
     @rndstatus.command()
     async def type(self, ctx, type: int):
         """Define the rndstatus type.
-        
+
         Type list:
         0 = Playing
         1 = Streaming
@@ -102,94 +130,71 @@ class RndStatus(commands.Cog):
         else:
             await ctx.send("Type must be between 0 and 3.")
 
-    @commands.Cog.listener()
-    async def on_message(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()
-        streamer = await self.config.streamer()
-        url = "https://www.twitch.tv/" + streamer
+    async def maybe_update_presence(self):
+        await self.bot.wait_until_ready()
+        pattern = re.compile(rf"<@!?{self.bot.user.id}>")
+        delay = 0
+        while True:
+            try:
+                cog_settings = await self.config.all()
+                guilds = self.bot.guilds
+                guild = next(g for g in guilds if not g.unavailable)
+                try:
+                    current_game = str(guild.me.activity.name)
+                except AttributeError:
+                    current_game = None
+                statuses = cog_settings["statuses"]
+                botstats = cog_settings["botstats"]
+                streamer = cog_settings["streamer"]
+                _type = cog_settings["type"]
+                delay = cog_settings["delay"]
 
-        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()
-                if type == 1:
-                    await self.bot.change_presence(
-                        activity=discord.Streaming(name=botstatus, url=url)
-                    )
-                else:
-                    await self.bot.change_presence(
-                        activity=discord.Activity(name=botstatus, type=type)
-                    )
-                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
-            if (current_game != str(botstatus)) or current_game == None:
-                type = await self.config.type()
-                if type == 1:
-                    return await self.bot.change_presence(
-                        activity=discord.Streaming(name=botstatus, url=url)
-                    )
-                else:
-                    return await self.bot.change_presence(
-                        activity=discord.Activity(name=botstatus, type=type)
-                    )
+                url = f"https://www.twitch.tv/{streamer}"
+                prefix = await self.bot.get_valid_prefixes()
 
-        if self.last_change == None:
-            if len(statuses) > 0 and (current_game in statuses or current_game == None):
-                new_status = self.random_status(message, statuses)
-                self.last_change = int(time.perf_counter())
-                type = await self.config.type()
-                if type == 1:
-                    await self.bot.change_presence(
-                        activity=discord.Streaming(name=new_status, url=url)
-                    )
-                else:
-                    await self.bot.change_presence(
-                        activity=discord.Activity(name=new_status, type=type)
-                    )
-
-        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()
-                        if type == 1:
+                if botstats:
+                    me = self.bot.user
+                    clean_prefix = pattern.sub(f"@{me.name}", prefix[0])
+                    total_users = self._user_count
+                    servers = str(len(self.bot.guilds))
+                    botstatus = f"{clean_prefix}help | {total_users} users | {servers} servers"
+                    if (current_game != str(botstatus)) or current_game is None:
+                        if _type == 1:
                             await self.bot.change_presence(
-                                activity=discord.Streaming(name=new_status, url=url)
+                                activity=discord.Streaming(name=botstatus, url=url)
                             )
                         else:
                             await self.bot.change_presence(
-                                activity=discord.Activity(name=new_status, type=type)
+                                activity=discord.Activity(name=botstatus, type=_type)
                             )
+                else:
+                    if len(statuses) > 0:
+                        new_status = self.random_status(guild, statuses)
+                        if current_game != new_status:
+                            if (current_game != new_status) or current_game is None:
+                                if _type == 1:
+                                    await self.bot.change_presence(
+                                        activity=discord.Streaming(name=new_status, url=url)
+                                    )
+                                else:
+                                    await self.bot.change_presence(
+                                        activity=discord.Activity(name=new_status, type=_type)
+                                    )
+            except asyncio.CancelledError:
+                break
+            except Exception as e:
+                log.exception(e, exc_info=e)
+            await asyncio.sleep(int(delay))
+            
 
-    def random_status(self, msg, statuses):
+    def random_status(self, guild, statuses):
         try:
-            current = str(msg.guild.me.activity.name)
+            current = str(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
+        new_statuses = [s for s in statuses if s != current]
+        if len(new_statuses) > 1:
+            return rndchoice(new_statuses)
+        elif len(new_statuses) == 1:
+            return new_statuses[0]
+        return current

snacktime/phrases.py

@@ -4,8 +4,8 @@ FRIENDS = {
     "Mr Pickles": "(=｀ェ´=) <",
     "Satin": "▼・ᴥ・▼ <",
     "Thunky": "ᘛ⁐̤ᕐᐷ <",
-    "Jingle": "꒰∗´꒳`꒱ <",
-    "FluffButt": "/ᐠ｡ꞈ｡ᐟ\ <",
+    "Jingle": "꒰∗'꒳'꒱ <",
+    "FluffButt": r"/ᐠ｡ꞈ｡ᐟ\ <",
     "Staplefoot": "(￣(エ)￣) <",
 }
 
@@ -33,12 +33,17 @@ SNACKBURR_PHRASES = {
         "Hey check out this sweet stach o' snacks I found! Who wants a cut?",
         "Who's ready to gobble down some snacks!?",
         "So who's gonna help me eat all these snacks? :3",
+        "Eyoooooooo I haz snacks! Yall wanna munch???",
     ],
     "OUT": [
         "I'm out of snacks! I'll be back with more soon.",
         "I'm out of snacks :( I'll be back soon with more!",
         "Aight, I gotta head out! I'll be back with more, don worry :3",
         "Alright, I gotta get back to my errands. I'll see you guys soon!",
+        "Uh okays, imma get back to my errands cuz outta snacks!",
+        "Yall are cool but i gotta get back to my errands. I'll visit again soon!",
+        "Errands call! Thanks for the help with eating all these snacks, I'll come again :3",
+        "I have to go back do my stuffs, but as soon as I get more snacks imma come and share!!!",
     ],
     "LONELY": ["I guess you guys don't like snacktimes.. I'll stop comin around."],
     "NO_TAKERS": [
@@ -47,6 +52,12 @@ SNACKBURR_PHRASES = {
         "I don't see anybody.. <.< ... >.> ... All the snacks for me!!",
         "I guess nobody wants snacks huh.. Well, I'll come back later",
         "I guess i'll just come back later..",
+        "Well. Since yall dun want snacks imma eat them all!!!",
+        "Where is everyone, I brought so many snacks...",
+        "I did offer to share, but I guess you dun want. Oh well, I'll come back later :3",
+        "Whoa... you dun wanna have any snacks?!",
+        "I'll just eat all those snacks by myself then!",
+        ":3 okay, catch yall lata",
     ],
     "GIVE": [
         "Here ya go, {0}, here's {1} pb!",
@@ -56,6 +67,14 @@ SNACKBURR_PHRASES = {
         "Ok {0}, here's {1} pb for you. Anyone else want some?",
         "Alllright, {1} pb for {0}!",
         "Hold your horses {0}! Alright, {1} pb for you :)",
+        "Woooooooooo hey {0}, here have {1} pb!",
+        "Here's {1} pb for {0} :3",
+        "Heyheyehy hiya {0}! Here's {1} pb for you!",
+        "Oh hiya {0} :) imma give you {1} pb now!",
+        "Heyyyyyyyyyyy {0}, I brought you {1} pb :)",
+        "Oh you wanna munchies? I have munchies for you, {0}! Have {1} pb :)",
+        "{1} pb for {0}!!!",
+        "{0} {0} {0}! Grab {1} pb!",
     ],
     "LAST_SECOND": [
         "Fine fine, {0}, I'll give you {1} of my on-the-road pb.. Cya!",
@@ -65,6 +84,45 @@ SNACKBURR_PHRASES = {
         "Don't be greedy now! you already got some pb {0}!",
         "You already got your snacks {0}!",
         "Come on {0}, you already got your snacks! We gotta make sure there's some for errbody!",
+        "But! {0} you already had a bunch of snacks!",
+        "Hey {0}, there must be snacks for others too!!",
+        "Donot be like that, {0}, I wanna give snacks to errybody!",
+        "Aw but {0}, we gonna run outta snacks if I give you again :(",
+        "Let's make a deal, remind me when I come back from my errands next time, {0} :3",
+        "Next time I'm comin 'round imma give you again, {0}",
+        "I alredy handed you snacks {0}...",
+        "But... but... you... you had your snacks {0} ._.",
+        "I wanna give snacks to errybody! You can't have them all, {0}!",
+        "You already munched on some snacks, {0}!",
+        "Did you already gobble down yours, {0}? Gotta leave some for the others!",
+    ],
+    "EAT_BEFORE": [
+        "monstrously",
+        "shyly",
+        "earnestly",
+        "eagerly",
+        "enthusiastically",
+        "ravenously",
+        "delicately",
+        "daintily",
+    ],
+    "EAT_AFTER": [
+        "gobbles up",
+        "pigs out on",
+        "wolfs down",
+        "chows down",
+        "munches on",
+        "chugs",
+        "puts away",
+        "ravages",
+        "siphons into their mouth",
+        "disposes of",
+        "swallows",
+        "chomps",
+        "consumes",
+        "demolishes",
+        "partakes of",
+        "ingests",
     ],
     "ENABLE": [
         "Oh you guys want snacks?! Aight, I'll come around every so often to hand some out!"

snacktime/snacktime.py

@@ -5,6 +5,7 @@ from random import randint
 from random import choice as randchoice
 
 from redbot.core import bank, checks, commands, Config
+from redbot.core.errors import BalanceTooHigh
 from redbot.core.utils.chat_formatting import box, humanize_list, pagify
 
 from .phrases import FRIENDS, SNACKBURR_PHRASES
@@ -48,14 +49,23 @@ class Snacktime(commands.Cog):
         self.config.register_guild(**default_guild)
         self.config.register_channel(**default_channel)
 
-    async def persona_choice(self, msg):
-        invite_friends = await self.config.guild(msg.guild).FRIENDS()
+    async def persona_choice(self, ctx: None, message: None):
+        if ctx:
+            invite_friends = await self.config.guild(ctx.guild).FRIENDS()
+        else:
+            invite_friends = await self.config.guild(message.guild).FRIENDS()
         personas = FRIENDS
         if not invite_friends:
-            return "Snackburr"
+            return "Snackburr" if message else "ʕ •ᴥ•ʔ <"
         elif invite_friends is True:
-            del personas["Snackburr"]
-        return randchoice(list(personas.keys()))
+            try:
+                del personas["Snackburr"]
+            except KeyError:
+                pass
+        if message:
+            return randchoice(list(personas.keys()))
+        else:
+            return randchoice(list(personas.values()))
 
     async def get_response(self, msg, phrase_type):
         scid = f"{msg.guild.id}-{msg.channel.id}"
@@ -64,6 +74,29 @@ class Snacktime(commands.Cog):
         phrase = randchoice(SNACKBURR_PHRASES[phrase_type])
         return f"`{persona_phrase} {phrase}`"
 
+    @commands.cooldown(1, 1, commands.BucketType.channel)
+    @commands.guild_only()
+    @commands.command()
+    async def eat(self, ctx, amount: int):
+        """
+        all this talk about pb is makin me hungry.
+
+        how bout you guys?
+        """
+        persona = await self.persona_choice(ctx=ctx, message=None)
+        if amount < 0:
+            return await ctx.send(f"`{persona} Woah slow down!`")
+        if amount > await bank.get_balance(ctx.author):
+            return await ctx.send(f"`{persona} You don't got that much pb!.. don't look at me..`")
+
+        await bank.withdraw_credits(ctx.author, amount)
+
+        first_phrase = randchoice(SNACKBURR_PHRASES["EAT_BEFORE"])
+        second_phrase = randchoice(SNACKBURR_PHRASES["EAT_AFTER"])
+        await ctx.send(
+            f"`{persona} {ctx.author.display_name} {first_phrase} {second_phrase} {amount} whole pb jars!`"
+        )
+
     @commands.guild_only()
     @commands.group()
     @checks.mod_or_permissions(manage_guild=True)
@@ -225,7 +258,7 @@ class Snacktime(commands.Cog):
                 return
             else:
                 phrases = [
-                    "Don't look at me. I donno where snackburr's at ¯\_(ツ)_/¯",
+                    r"Don't look at me. I donno where snackburr's at ¯\_(ツ)_/¯",
                     "I hear snackburr likes parties. *wink wink",
                     "I hear snackburr is attracted to channels with active conversations",
                     "If you party, snackburr will come! 〈( ^o^)ノ",
@@ -253,7 +286,7 @@ class Snacktime(commands.Cog):
         scid = f"{message.guild.id}-{message.channel.id}"
         if self.acceptInput.get(scid, False):
             return
-        self.channel_persona[scid] = await self.persona_choice(message)
+        self.channel_persona[scid] = await self.persona_choice(ctx=None, message=message)
         await message.channel.send(await self.get_response(message, "SNACKTIME"))
 
         self.acceptInput[scid] = True
@@ -439,10 +472,14 @@ class Snacktime(commands.Cog):
                                 resp = await self.get_response(message, "LAST_SECOND")
                                 resp = resp.format(message.author.name, snackAmt)
                                 await message.channel.send(resp)
-                            await bank.deposit_credits(message.author, snackAmt)
-                        except:
+                            try:
+                                await bank.deposit_credits(message.author, snackAmt)
+                            except BalanceTooHigh as b:
+                                await bank.set_balance(message.author, b.max_balance)
+                        except Exception as e:
                             log.info(
-                                f"Snacktime: Failed to send pb message. {message.author.name} didn't get pb"
+                                f"Failed to send pb message. {message.author.name} didn't get pb\n",
+                                exc_info=True,
                             )
 
                 else:

timezone/timezone.py

@@ -1,7 +1,7 @@
 import discord
 import pytz
 from datetime import datetime
-from pytz import all_timezones
+from pytz import common_timezones
 from pytz import country_timezones
 from typing import Optional
 from redbot.core import Config, commands, checks
@@ -45,8 +45,11 @@ class Timezone(commands.Cog):
                         "<https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
                     )
                 else:
+                    tz = tz.title() if '/' in tz else tz.upper()
+                    if tz not in common_timezones:
+                        raise Exception(tz)
                     fmt = "**%H:%M** %d-%B-%Y **%Z (UTC %z)**"
-                    time = datetime.now(pytz.timezone(tz.title()))
+                    time = datetime.now(pytz.timezone(tz))
                     await ctx.send(time.strftime(fmt))
         except Exception as e:
             await ctx.send(f"**Error:** {str(e)} is an unsupported timezone.")
@@ -62,13 +65,13 @@ class Timezone(commands.Cog):
                 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.**"
+                    f"\n**Use** `{ctx.prefix}time tz Continent/City` **to display the current time in that timezone.**"
                 )
                 await ctx.send(msg)
             else:
                 await ctx.send(
                     "That code isn't supported. For a full list, see here: "
-                    "<https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
+                    "<https://en.wikipedia.org/wiki/List_of_ISO_3166_country_codes>"
                 )
 
     @time.command()
@@ -81,7 +84,7 @@ class Timezone(commands.Cog):
             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`: "
+                    f"You haven't set your timezone. Do `{ctx.prefix}time me Continent/City`: "
                     "see <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
                 )
             else:
@@ -90,7 +93,7 @@ class Timezone(commands.Cog):
                 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
+            exist = True if tz.title() in common_timezones else False
             if exist:
                 if "'" in tz:
                     tz = tz.replace("'", "")
@@ -98,7 +101,7 @@ class Timezone(commands.Cog):
                 await ctx.send(f"Successfully set your timezone to **{tz.title()}**.")
             else:
                 await ctx.send(
-                    "**Error:** Unrecognized timezone. Try `[p]time me Continent/City`: "
+                    f"**Error:** Unrecognized timezone. Try `{ctx.prefix}time me Continent/City`: "
                     "see <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
                 )
 
@@ -112,7 +115,7 @@ class Timezone(commands.Cog):
             await ctx.send("That timezone is invalid.")
             return
         else:
-            exist = True if tz.title() in all_timezones else False
+            exist = True if tz.title() in common_timezones else False
             if exist:
                 if "'" in tz:
                     tz = tz.replace("'", "")
@@ -120,7 +123,7 @@ class Timezone(commands.Cog):
                 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`: "
+                    f"**Error:** Unrecognized timezone. Try `{ctx.prefix}time set @user Continent/City`: "
                     "see <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
                 )
 
@@ -141,3 +144,36 @@ class Timezone(commands.Cog):
                 )
             else:
                 await ctx.send("That user hasn't set their timezone.")
+
+    @time.command()
+    async def compare(self, ctx, user: discord.Member = None):
+        """Compare your saved timezone with another user's timezone."""
+        if not user:
+            return await ctx.send_help()
+
+        usertime = await self.config.user(ctx.message.author).usertime()
+        othertime = await self.config.user(user).usertime()
+
+        if not usertime:
+            return await ctx.send(
+                f"You haven't set your timezone. Do `{ctx.prefix}time me Continent/City`: "
+                "see <https://en.wikipedia.org/wiki/List_of_tz_database_time_zones>"
+            )
+        if not othertime:
+            return await ctx.send(f"That user's timezone isn't set yet.")
+
+        user_now = datetime.now(pytz.timezone(usertime))
+        user_diff = user_now.utcoffset().total_seconds() / 60 / 60
+        other_now = datetime.now(pytz.timezone(othertime))
+        other_diff = other_now.utcoffset().total_seconds() / 60 / 60
+        time_diff = int(abs(user_diff - other_diff))
+        fmt = "**%H:%M %Z (UTC %z)**"
+        other_time = other_now.strftime(fmt)
+        plural = "" if time_diff == 1 else "s"
+        time_amt = "the same time zone as you" if time_diff == 0 else f"{time_diff} hour{plural}"
+        position = "ahead of" if user_diff < other_diff else "behind"
+        position_text = "" if time_diff == 0 else f" {position} you"
+
+        await ctx.send(
+            f"{user.display_name}'s time is {other_time} which is {time_amt}{position_text}."
+        )

tools/info.json

@@ -5,7 +5,7 @@
 	],
 	"description": "Mod and admin tools.",
     "install_msg": "Thanks for installing. Use `[p]help` Tools to get started.",
-    "min_python_version": [3, 6, 0],
+    "min_python_version": [3, 8, 0],
     "permissions" : [
 		"ban_members",
 		"manage_channels"

tools/tools.py

@@ -2,16 +2,22 @@ import asyncio
 import datetime
 import discord
 import inspect
+import logging
 import random
+import re
 import os
 import time
 from redbot.core import Config, checks, commands
 from redbot.core.utils import chat_formatting as cf
-from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
+from redbot.core.utils.common_filters import filter_invites
+from redbot.core.utils.menus import menu, DEFAULT_CONTROLS, close_menu
 from tabulate import tabulate
 from contextlib import suppress as sps
 
 
+log = logging.getLogger("red.aikaterna.tools")
+
+
 class Tools(commands.Cog):
     """Mod and Admin tools."""
 
@@ -21,10 +27,10 @@ class Tools(commands.Cog):
     async def _Tools__error(self, ctx, error):
         if error.__cause__:
             cause = error.__cause__
-            print(f"Tools Cog :: Error Occured ::\n{error}\n{cause}\n")
+            log.info(f"Tools Cog :: Error Occured ::\n{error}\n{cause}\n")
         else:
             cause = error
-            print(f"Tools Cog :: Error Occured :: \n{cause}\n")
+            log.info(f"Tools Cog :: Error Occured :: \n{cause}\n")
 
     @commands.guild_only()
     @checks.mod_or_permissions(manage_channels=True)
@@ -274,7 +280,13 @@ class Tools(commands.Cog):
         """Check members in the role specified."""
         guild = ctx.guild
         await ctx.trigger_typing()
-        role = discord.utils.find(lambda r: r.name.lower() == rolename.lower(), guild.roles)
+        if rolename.startswith("<@&"):
+            role_id = int(re.search(r"<@&(.{18})>$", rolename)[1])
+            role = discord.utils.get(ctx.guild.roles, id=role_id)
+        elif len(rolename) in [17, 18] and rolename.isdigit():
+            role = discord.utils.get(ctx.guild.roles, id=int(rolename))
+        else:
+            role = discord.utils.find(lambda r: r.name.lower() == rolename.lower(), guild.roles)
 
         if role is None:
             roles = []
@@ -285,84 +297,105 @@ class Tools(commands.Cog):
             if len(roles) == 1:
                 role = roles[0]
             elif len(roles) < 1:
-                await ctx.send("No roles were found")
+                await ctx.send("No roles were found.")
                 return
             else:
-                msg = "**Roles found with** {} **in the name.**\n\n".format(rolename)
+                msg = (
+                    f"**{len(roles)} roles found with** `{rolename}` **in the name.**\n"
+                    f"Type the number of the role you wish to see.\n\n"
+                )
                 tbul8 = []
                 for num, role in enumerate(roles):
                     tbul8.append([num + 1, role.name])
                 m1 = await ctx.send(msg + tabulate(tbul8, tablefmt="plain"))
 
                 def check(m):
-                    if (m.author == author) and (m.channel == ctx.channel):
+                    if (m.author == ctx.author) and (m.channel == ctx.channel):
                         return True
 
-                response = await self.bot.wait_for("message", check=check, timeout=25)
-                if response is None:
+                try:
+                    response = await self.bot.wait_for("message", check=check, timeout=25)
+                except asyncio.TimeoutError:
                     await m1.delete()
                     return
-                elif not response.content.isdigit():
+                if not response.content.isdigit():
                     await m1.delete()
                     return
                 else:
                     response = int(response.content)
 
                 if response not in range(0, len(roles) + 1):
-                    return
+                    return await ctx.send("Cancelled.")
                 elif response == 0:
-                    await ctx.send("Cancelled.")
-                    return
+                    return await ctx.send("Cancelled.")
                 else:
                     role = roles[response - 1]
 
-        if role is not None and len([m for m in guild.members if role in m.roles]) < 50:
-            awaiter = await ctx.send(
-                embed=discord.Embed(
-                    description="Getting member names...", colour=await ctx.embed_colour()
-                )
+        awaiter = await ctx.send(
+            embed=discord.Embed(
+                description="Getting member names...", colour=await ctx.embed_colour()
             )
-            await asyncio.sleep(1.5)  # taking time to retrieve the names
-            member = discord.Embed(
-                description="**{1} users found in the {0} role.**\n".format(
+        )
+        await asyncio.sleep(1.5)  # taking time to retrieve the names
+        users_in_role = "\n".join(
+            sorted(m.display_name for m in guild.members if role in m.roles)
+        )
+        if len(users_in_role) == 0:
+            embed = discord.Embed(
+                description=cf.bold(f"0 users found in the {role.name} role."), colour=await ctx.embed_colour()
+            )
+            await awaiter.edit(embed=embed)
+            return
+        try:
+            await awaiter.delete()
+        except discord.NotFound:
+            pass
+        embed_list = []
+        for page in cf.pagify(users_in_role, delims=["\n"], page_length=200):
+            embed = discord.Embed(
+                description=cf.bold("{1} users found in the {0} role.\n").format(
                     role.name, len([m for m in guild.members if role in m.roles])
                 ),
                 colour=await ctx.embed_colour(),
             )
-            if len([m for m in guild.members if role in m.roles]) != 0:
-                member.add_field(
-                    name="Users",
-                    value="\n".join(m.display_name for m in guild.members if role in m.roles),
-                )
-            await awaiter.edit(embed=member)
-
-        elif len([m for m in guild.members if role in m.roles]) > 50:
-            awaiter = await ctx.send(
-                embed=discord.Embed(
-                    description="Getting member names...", colour=await ctx.embed_colour()
-                )
-            )
-            await asyncio.sleep(1.5)
-            await awaiter.edit(
-                embed=discord.Embed(
-                    description="List is too long for **{0}** role, **{1}** members found.\n".format(
-                        role.name, len([m.mention for m in guild.members if role in m.roles])
-                    ),
-                    colour=await ctx.embed_colour(),
-                )
-            )
+            embed.add_field(name="Users", value=page)
+            embed_list.append(embed)
+        final_embed_list = []
+        for i, embed in enumerate(embed_list):
+            embed.set_footer(text=f"Page {i + 1}/{len(embed_list)}")
+            final_embed_list.append(embed)
+        if len(embed_list) == 1:
+            close_control = {"\N{CROSS MARK}": close_menu}
+            await menu(ctx, final_embed_list, close_control)
         else:
+            await menu(ctx, final_embed_list, DEFAULT_CONTROLS)
+
+    @commands.guild_only()
+    @commands.command()
+    async def joined(self, ctx, user: discord.Member = None):
+        """Show when a user joined the guild."""
+        if not user:
+            user = ctx.author
+        if user.joined_at:
+            user_joined = user.joined_at.strftime("%d %b %Y %H:%M")
+            since_joined = (ctx.message.created_at - user.joined_at).days
+            joined_on = f"{user_joined} ({since_joined} days ago)"
+        else:
+            joined_on = "a mysterious date that not even Discord knows."
+
+        if ctx.channel.permissions_for(ctx.guild.me).embed_links:
             embed = discord.Embed(
-                description="Role was not found.", colour=await ctx.embed_colour()
+                description=f"{user.mention} joined this guild on {joined_on}.",
+                color=await ctx.embed_colour(),
             )
-            await awaiter.edit(embed=embed)
+            await ctx.send(embed=embed)
+        else:
+            await ctx.send(f"{user.display_name} joined this guild on {joined_on}.")
 
     @commands.command(name="listguilds", aliases=["listservers", "guildlist", "serverlist"])
     @checks.mod_or_permissions()
     async def listguilds(self, ctx):
-        """
-        List the guilds|servers the bot is in
-        """
+        """List the guilds|servers the bot is in."""
         asciidoc = lambda m: "```asciidoc\n{}\n```".format(m)
         guilds = sorted(self.bot.guilds, key=lambda g: -g.member_count)
         header = ("```\n" "The bot is in the following {} server{}:\n" "```").format(
@@ -373,7 +406,10 @@ class Tools(commands.Cog):
         form = "{gid} :: {mems:0{zpadding}} :: {name}"
         all_forms = [
             form.format(
-                gid=g.id, mems=g.member_count, name=cf.escape(g.name), zpadding=max_zpadding
+                gid=g.id, 
+                mems=g.member_count, 
+                name=filter_invites(cf.escape(g.name)), 
+                zpadding=max_zpadding
             )
             for g in guilds
         ]
@@ -425,7 +461,7 @@ class Tools(commands.Cog):
         header = "{:>33}\n{}\n\n".format(head1, "-" * 57)
 
         user_body = (
-            " {mem}\n"
+            " {mem} ({memid})\n"
             " {spcs}Joined Guild:    {sp1}{join}\n"
             " {spcs}Account Created: {sp2}{created}\n\n"
         )
@@ -451,6 +487,7 @@ class Tools(commands.Cog):
 
             disp += user_body.format(
                 mem=member.display_name,
+                memid=member.id,
                 join=self._dynamic_time(member.joined_at),
                 created=self._dynamic_time(member.created_at),
                 spcs=smspc,
@@ -499,7 +536,7 @@ class Tools(commands.Cog):
 
     @commands.guild_only()
     @commands.command()
-    async def rinfo(self, ctx, *, rolename):
+    async def rinfo(self, ctx, *, rolename: discord.Role):
         """Shows role info."""
         channel = ctx.channel
         guild = ctx.guild
@@ -587,7 +624,9 @@ class Tools(commands.Cog):
         form = "`{rpos:0{zpadding}}` - `{rid}` - `{rcolor}` - {rment} "
         max_zpadding = max([len(str(r.position)) for r in ctx.guild.roles])
         rolelist = [
-            form.format(rpos=r.position, zpadding=max_zpadding, rid=r.id, rment=r.mention, rcolor=r.color)
+            form.format(
+                rpos=r.position, zpadding=max_zpadding, rid=r.id, rment=r.mention, rcolor=r.color
+            )
             for r in ctx.guild.roles
         ]
 
@@ -716,39 +755,41 @@ class Tools(commands.Cog):
         waiting = await ctx.send(load)
 
         data = "```ini\n"
-        data += "[Name]:      {}\n".format(cf.escape(str(user)))
-        data += "[Nickname]:  {}\n".format(cf.escape(str(user.nick)))
-        data += "[ID]:        {}\n".format(user.id)
-        data += "[Status]:    {}\n".format(user.status)
-        data += "[Servers]:   {} shared\n".format(seen)
-        act = user.activity
-        if act is None:
-            pass
-
-        elif act.type == discord.ActivityType.playing:
-            data += "[Playing]:   {}\n".format(cf.escape(str(act.name)))
-        elif act.type == discord.ActivityType.listening:
-            if isinstance(act, discord.Spotify):
-                _form = act.title
+        data += "[Name]:          {}\n".format(cf.escape(str(user)))
+        if user.nick is not None:
+            data += "[Nickname]:      {}\n".format(cf.escape(str(user.nick)))
+        data += "[ID]:            {}\n".format(user.id)
+        data += "[Status]:        {}\n".format(user.status)
+        data += "[Servers]:       {} shared\n".format(seen)
+        if actplay := discord.utils.get(user.activities, type=discord.ActivityType.playing):
+            data += "[Playing]:       {}\n".format(cf.escape(str(actplay.name)))
+        if actlisten := discord.utils.get(user.activities, type=discord.ActivityType.listening):
+            if isinstance(actlisten, discord.Spotify):
+                _form = "{} - {}".format(actlisten.artist, actlisten.title)
             else:
-                _form = act.name
-            data += "[Listening]: {}\n".format(cf.escape(_form))
-        elif act.type == discord.ActivityType.listening:
-            data += "[Watching]:   {}\n".format(cf.escape(str(user.activity.name)))
-        else:
+                _form = actlisten.name
+            data += "[Listening]:     {}\n".format(cf.escape(_form))
+        if actwatch := discord.utils.get(user.activities, type=discord.ActivityType.watching):
+            data += "[Watching]:      {}\n".format(cf.escape(str(actwatch.name)))
+        if actstream := discord.utils.get(user.activities, type=discord.ActivityType.streaming):
             data += "[Streaming]: [{}]({})\n".format(
-                cf.escape(str(user.activity.name)), cf.escape(user.activity.url)
+                cf.escape(str(actstream.name)), cf.escape(actstream.url)
             )
+        if actcustom := discord.utils.get(user.activities, type=discord.ActivityType.custom):
+            if actcustom.name is not None:
+                data += "[Custom status]: {}\n".format(cf.escape(str(actcustom.name)))
         passed = (ctx.message.created_at - user.created_at).days
-        data += "[Created]:   {}\n".format(self._dynamic_time(user.created_at))
+        data += "[Created]:       {}\n".format(self._dynamic_time(user.created_at))
         joined_at = self.fetch_joined_at(user, ctx.guild)
         if caller != "invoke":
-            data += "[Joined]:    {}\n".format(self._dynamic_time(joined_at))
-            data += "[Roles]:     {}\n".format(", ".join(roles))
-            data += "[In Voice]:  {}\n".format(
+            data += "[Joined]:        {}\n".format(self._dynamic_time(joined_at))
+            data += "[Roles]:         {}\n".format(", ".join(roles))
+            data += "[In Voice]:      {}\n".format(
                 user.voice.channel if user.voice is not None else None
             )
-            data += "[AFK]:       {}\n".format(user.voice.afk if user.voice is not None else False)
+            data += "[AFK]:           {}\n".format(
+                user.voice.afk if user.voice is not None else False
+            )
         data += "```"
         await asyncio.sleep(1)
         await waiting.edit(content=data)

trickortreat/trickortreat.py

@@ -3,16 +3,11 @@ import datetime
 import discord
 import random
 import math
-from typing import Union  # <- Remove this at 3.2
-from babel.numbers import format_decimal  # <- Remove this at 3.2
 from redbot.core import commands, checks, Config, bank
-from redbot.core.utils.chat_formatting import box, pagify  #, humanize_number <- Will be for 3.2
+from redbot.core.utils.chat_formatting import box, pagify, humanize_number
 from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
 
-__version__ = "0.0.6a"
-
-def humanize_number(val: Union[int, float]):  # <- Remove this at 3.2
-    return format_decimal(val, locale="en_US")
+__version__ = "0.0.7"
 
 
 class TrickOrTreat(commands.Cog):

warcraftlogs/__init__.py

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

warcraftlogs/info.json

@@ -0,0 +1,8 @@
+{
+	"author": ["aikaterna"],
+	"description": "Check WarcraftLogs for data on players of World of Warcraft Classic.",
+	"install_msg": "Check out [p]help WarcraftLogs and set your WCL API key, available by signing into a WarcraftLogs account on their site and visiting the bottom of your settings page. ",
+	"short": "WarcraftLogs data for World of Warcraft Classic players.",
+	"tags": ["warcraft"],
+	"type": "COG"
+}

warcraftlogs/warcraftlogs.py

@@ -0,0 +1,340 @@
+import aiohttp
+import asyncio
+import datetime
+import discord
+import itertools
+import json
+from operator import itemgetter
+from redbot.core import Config, commands, checks
+from redbot.core.utils.chat_formatting import box, humanize_list, pagify
+from redbot.core.utils.menus import menu, DEFAULT_CONTROLS
+
+
+class WarcraftLogs(commands.Cog):
+    """Access Warcraftlogs stats."""
+
+    def __init__(self, bot):
+        self.bot = bot
+        self.config = Config.get_conf(self, 2713931001, force_registration=True)
+        self.session = aiohttp.ClientSession()
+        self.zones = [1003, 1002, 1001, 1000]
+        self.partitions = [2, 1]
+
+        default_user = {
+            "charname": None,
+            "realm": None,
+            "region": None,
+        }
+
+        default_global = {
+            "apikey": None,
+        }
+
+        self.config.register_user(**default_user)
+        self.config.register_global(**default_global)
+
+    def cog_unload(self):
+        self.bot.loop.create_task(self.session.close())
+
+    @commands.command()
+    async def wclregion(self, ctx, region: str):
+        """Set your region."""
+        valid_regions = ["EU", "US"]
+        if region.upper() not in valid_regions:
+            return await ctx.send("Valid regions are: {humanize_list(valid_regions)}")
+        await self.config.user(ctx.author).region.set(region)
+        await ctx.send(f"Your server's region was set to {region.upper()}.")
+
+    @commands.command()
+    async def wclcharname(self, ctx, charname: str):
+        """Set your character's name."""
+        await self.config.user(ctx.author).charname.set(charname)
+        await ctx.send(f"Your character name was set to {charname.title()}.")
+
+    @commands.command()
+    async def wclrealm(self, ctx, *, realm: str):
+        """Set your realm."""
+        realmname = realm.replace(" ", "-")
+        await self.config.user(ctx.author).realm.set(realmname)
+        await ctx.send(f"Your realm was set to {realm.title()}.")
+
+    @commands.command()
+    async def wclsettings(self, ctx, user: discord.User = None):
+        """Show your current settings."""
+        if not user:
+            user = ctx.author
+        userinfo = await self.config.user(user).all()
+        msg = f"[Settings for {user.display_name}]\n"
+        charname = userinfo["charname"].title() if userinfo["charname"] else "None"
+        realmname = userinfo["realm"].title().replace("-", " ") if userinfo["realm"] else "None"
+        regionname = userinfo["region"].upper() if userinfo["region"] else "None"
+        msg += f"Character: {charname}\nRealm: {realmname}\nRegion: {regionname}\n"
+        await ctx.send(box(msg, lang="ini"))
+
+    @commands.command()
+    @checks.is_owner()
+    async def wclapikey(self, ctx, apikey: str):
+        """Set the api key."""
+        await self.config.apikey.set(apikey)
+        try:
+            await ctx.message.delete()
+        except discord.errors.Forbidden:
+            pass
+        await ctx.send(f"The WarcraftLogs API key has been set.")
+
+    @commands.command()
+    @commands.guild_only()
+    async def wclrank(self, ctx, username=None, realmname=None, region=None):
+        """Fetch ranking info about a player."""
+        userdata = await self.config.user(ctx.author).all()
+        apikey = await self.config.apikey()
+        if not apikey:
+            return await ctx.send(
+                "The bot owner needs to set a WarcraftLogs API key before this can be used."
+            )
+        if not username:
+            username = userdata["charname"]
+            if not username:
+                return await ctx.send("Please specify a character name with this command.")
+        if not realmname:
+            realmname = userdata["realm"]
+            if not realmname:
+                return await ctx.send("Please specify a realm name with this command.")
+        if not region:
+            region = userdata["region"]
+            if not region:
+                return await ctx.send("Please specify a region name with this command.")
+
+        final_embed_list = []
+        kill_data = []
+        log_data = []
+
+        async with ctx.channel.typing():
+            for zone in self.zones:
+                for phase in self.partitions:
+                    url = f"https://classic.warcraftlogs.com/v1/parses/character/{username}/{realmname}/{region}?zone={zone}&partition={phase}&api_key={apikey}"
+                    try:
+                        async with self.session.request("GET", url) as page:
+                            data = await page.text()
+                            data = json.loads(data)
+                    except Exception as e:
+                        return await ctx.send(
+                            f"Oops, there was a problem fetching something (Zone {zone}/Phase {phase}): {e}"
+                        )
+                    if "error" in data:
+                        return await ctx.send(
+                            f"{username.title()} - {realmname.title()} ({region.upper()}) doesn't have any valid logs that I can see.\nError {data['status']}: {data['error']}"
+                        )
+                    # Logged Kills
+                    zone_name = self.get_zone(zone)
+                    zone_and_phase = f"{zone_name}_{phase}"
+                    area_data = self.get_kills(data, zone_and_phase)
+                    kill_data.append(area_data)
+                    # Log IDs for parses
+                    log_info = self.get_log_id(data, zone_and_phase)
+                    log_data.append(log_info)
+
+        # Logged Kill sorting
+        embed1 = discord.Embed(
+            title=f"{username.title()} - {realmname.title()} ({region.upper()})\nLogged Kills"
+        )
+        for item in kill_data:
+            zone_kills = ""
+            for boss_info in list(item.values()):
+                zone_name, phase_num = self.clean_name(list(item))
+                for boss_name, boss_kills in boss_info.items():
+                    zone_kills += f"{boss_name}: {boss_kills}\n"
+            if zone_kills:
+                embed1.add_field(name=f"{zone_name}\n{phase_num}", value=zone_kills)
+        final_embed_list.append(embed1)
+
+        # Log ID sorting
+        wcl_url = "https://classic.warcraftlogs.com/reports/{}#fight={}"
+        log_embed_list = []
+
+        for item in log_data:
+            log_page = ""
+            for id_data in list(item.values()):
+                sorted_item = {
+                    k: v
+                    for k, v in sorted(id_data.items(), key=lambda item: item[1], reverse=True)
+                }
+                short_list = dict(itertools.islice(sorted_item.items(), 5))
+                zone_name, phase_num = self.clean_name(list(item))
+                for log_id, info_list in short_list.items():
+                    # info_list: [timestamp:int, percentile:int, spec:str, fightid:int, rank:int, outOf:int]
+                    # log_id: encounterid-encountername
+                    log_url = log_id.split("-")[0]
+                    log_name = log_id.split("-")[1]
+                    log_page += f"{wcl_url.format(log_url, info_list[3])}\n{self.time_convert(info_list[0])} UTC\nEncounter: {log_name}\nDPS Percentile: {info_list[1]} [{info_list[4]} of {info_list[5]}] ({info_list[2]})\n\n"
+
+            if id_data:
+                embed = discord.Embed(
+                    title=f"{username.title()} - {realmname.title()} ({region.upper()})\nWarcraft Log IDs"
+                )
+                embed.add_field(name=f"{zone_name}\n{phase_num}", value=log_page, inline=False)
+                embed.set_footer(text="Up to the last 5 logs shown per encounter/phase.")
+                log_embed_list.append(embed)
+
+        for log_embed in log_embed_list:
+            final_embed_list.append(log_embed)
+
+        await menu(ctx, final_embed_list, DEFAULT_CONTROLS)
+
+    @commands.command()
+    @commands.guild_only()
+    async def wclgear(self, ctx, username=None, realmname=None, region=None):
+        """Fetch gear info about a player."""
+        userdata = await self.config.user(ctx.author).all()
+        apikey = await self.config.apikey()
+        if not apikey:
+            return await ctx.send(
+                "The bot owner needs to set a WarcraftLogs API key before this can be used."
+            )
+        if not username:
+            username = userdata["charname"]
+            if not username:
+                return await ctx.send("Please specify a character name with this command.")
+        if not realmname:
+            realmname = userdata["realm"]
+            if not realmname:
+                return await ctx.send("Please specify a realm name with this command.")
+        if not region:
+            region = userdata["region"]
+            if not region:
+                return await ctx.send("Please specify a region name with this command.")
+
+        all_encounters = []
+        for zone, phase in [(x, y) for x in self.zones for y in self.partitions]:
+            url = f"https://classic.warcraftlogs.com/v1/parses/character/{username}/{realmname}/{region}?zone={zone}&partition={phase}&api_key={apikey}"
+
+            async with self.session.request("GET", url) as page:
+                data = await page.text()
+                data = json.loads(data)
+                if "error" in data:
+                    return await ctx.send(
+                        f"{username.title()} - {realmname.title()} ({region.upper()}) doesn't have any valid logs that I can see.\nError {data['status']}: {data['error']}"
+                    )
+                if data:
+                    encounter = self.get_recent_gear(data)
+                    if encounter:
+                        all_encounters.append(encounter)
+        final = self.get_recent_gear(all_encounters)
+
+        wowhead_url = "https://classic.wowhead.com/item={}"
+        wcl_url = "https://classic.warcraftlogs.com/reports/{}"
+        itempage = ""
+
+        for item in final["gear"]:
+            if item["id"] == 0:
+                continue
+            rarity = self.get_rarity(item)
+            itempage += f"{rarity} [{item['name']}]({wowhead_url.format(item['id'])})\n"
+        itempage += f"\nAverage ilvl: {final['ilvlKeyOrPatch']}"
+
+        embed = discord.Embed(
+            title=f"{final['characterName']} - {final['server']} ({region.upper()})\n{final['class']} ({final['spec']})",
+            description=itempage,
+        )
+        embed.set_footer(
+            text=f"Gear data pulled from {wcl_url.format(final['reportID'])}\nEncounter: {final['encounterName']}\nLog Date/Time: {self.time_convert(final['startTime'])} UTC"
+        )
+        await ctx.send(embed=embed)
+
+    @staticmethod
+    def get_rarity(item):
+        rarity = item["quality"]
+        if rarity == "common":
+            return "⬜"
+        elif rarity == "uncommon":
+            return "🟩"
+        elif rarity == "rare":
+            return "🟦"
+        elif rarity == "epic":
+            return "🟪"
+        else:
+            return "🔳"
+
+    @staticmethod
+    def time_convert(time):
+        time = str(time)[0:10]
+        value = datetime.datetime.fromtimestamp(int(time)).strftime("%Y-%m-%d %H:%M:%S")
+        return value
+
+    @staticmethod
+    def get_kills(data, zone_and_phase):
+        # data is json data
+        # zone_and_phase: Name_Phasenum
+        boss_kills = {}
+        for encounter in data:
+            if encounter["encounterName"] not in boss_kills.keys():
+                boss_kills[encounter["encounterName"]] = 0
+            boss_kills[encounter["encounterName"]] += 1
+        complete_info = {}
+        complete_info[zone_and_phase] = boss_kills
+        return complete_info
+
+    @staticmethod
+    def get_zone(zone):
+        # Zone ID and name is available from the API, but why make another
+        # call to a url when it's simple for now... maybe revisit in phase 5+
+        if zone == 1000:
+            zone_name = "MoltenCore"
+        elif zone == 1001:
+            zone_name = "Onyxia"
+        elif zone == 1002:
+            zone_name = "BWL"
+        else:
+            zone_name = "ZG"
+        return zone_name
+
+    @staticmethod
+    def clean_name(zone_and_phase):
+        zone_and_phase = zone_and_phase[0]
+        zone_name = zone_and_phase.split("_")[0]
+        phase_num = zone_and_phase[-1]
+
+        if zone_name == "MoltenCore":
+            zone_name = "Molten Core"
+        elif zone_name == "BWL":
+            zone_name = "Blackwing Lair"
+        elif zone_name == "ZG":
+            zone_name = "Zul'Gurub"
+        else:
+            zone_name = zone_name
+
+        if phase_num == "1":
+            phase_num = "Phase 1 & 2"
+        else:
+            phase_num = "Phase 3 & 4"
+        return zone_name, phase_num
+
+    @staticmethod
+    def get_log_id(data, zone_and_phase):
+        report_ids = {}
+        for encounter in data:
+            keyname = f"{encounter['reportID']}-{encounter['encounterName']}"
+            report_ids[keyname] = [
+                encounter["startTime"],
+                encounter["percentile"],
+                encounter["spec"],
+                encounter["fightID"],
+                encounter["rank"],
+                encounter["outOf"],
+            ]
+        complete_info = {}
+        complete_info[zone_and_phase] = report_ids
+        return complete_info
+
+    @staticmethod
+    def get_recent_gear(data):
+        date_sorted_data = sorted(data, key=itemgetter('startTime'), reverse=True) 
+        for encounter in date_sorted_data:
+            try:
+                item_name = encounter["gear"][0]["name"]
+                if item_name == "Unknown Item":
+                    continue
+                else:
+                    return encounter
+            except KeyError:
+                return None

wolfram/wolfram.py

@@ -35,17 +35,20 @@ class Wolfram(commands.Cog):
         query = " ".join(question)
         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:
-            result = await r.text()
-        root = ET.fromstring(result)
-        a = []
-        for pt in root.findall(".//plaintext"):
-            if pt.text:
-                a.append(pt.text.capitalize())
+        async with ctx.typing():
+            async with self.session.get(url, params=payload, headers=headers) as r:
+                result = await r.text()
+            root = ET.fromstring(result)
+            a = []
+            for pt in root.findall(".//plaintext"):
+                if pt.text:
+                    a.append(pt.text.capitalize())
         if len(a) < 1:
             message = "There is as yet insufficient data for a meaningful answer."
         else:
             message = "\n".join(a[0:3])
+            if "Current geoip location" in message:
+                message = "There is as yet insufficient data for a meaningful answer."
 
         await ctx.send(box(message))
 
@@ -68,9 +71,9 @@ class Wolfram(commands.Cog):
         units = "metric"
         query = " ".join(arguments)
         query = urllib.parse.quote(query)
-        url = f"http://api.wolframalpha.com/v1/simple?appid={api_key}&i={query}%3F&width={width}&fontsize={font_size}&layout={layout}&background={background}&foreground={foreground}&units={units}"
+        url = f"http://api.wolframalpha.com/v1/simple?appid={api_key}&i={query}%3F&width={width}&fontsize={font_size}&layout={layout}&background={background}&foreground={foreground}&units={units}&ip=127.0.0.1"
 
-        async with ctx.channel.typing():
+        async with ctx.typing():
             async with self.session.request("GET", url) as r:
                 img = await r.content.read()
                 if len(img) == 43:
@@ -104,7 +107,7 @@ class Wolfram(commands.Cog):
         }
         msg = ""
 
-        async with ctx.channel.typing():
+        async with ctx.typing():
             async with self.session.request("GET", url, params=params) as r:
                 text = await r.content.read()
                 root = ET.fromstring(text)
@@ -124,7 +127,7 @@ class Wolfram(commands.Cog):
     @checks.is_owner()
     @commands.command(name="setwolframapi", aliases=["setwolfram"])
     async def _setwolframapi(self, ctx, key: str):
-        """Set the api-key."""
+        """Set the api-key. The key is the AppID of your application on the Wolfram|Alpha Developer Portal."""
 
         if key:
             await self.config.WOLFRAM_API_KEY.set(key)

youtube/youtube.py

@@ -13,13 +13,10 @@ class YouTube(commands.Cog):
 
     async def _youtube_results(self, query: str):
         try:
-            search_url = "https://www.youtube.com/results?"
-            payload = {"search_query": "".join(query)}
             headers = {"user-agent": "Red-cog/3.0"}
-            async with self.session.get(search_url, params=payload, headers=headers) as r:
+            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"href=\"\/watch\?v=(.{11})", result)
-
+            yt_find = re.findall(r"{\"videoId\":\"(.{11})", result)
             url_list = []
             for track in yt_find:
                 url = f"https://www.youtube.com/watch?v={track}"
@@ -35,13 +32,19 @@ class YouTube(commands.Cog):
     async def youtube(self, ctx, *, query: str):
         """Search on Youtube."""
         result = await self._youtube_results(query)
-        await ctx.send(result[0])
+        if result:
+            await ctx.send(result[0])
+        else:
+            await ctx.send("Nothing found. Try again later.")
 
     @commands.command()
     async def ytsearch(self, ctx, *, query: str):
         """Search on Youtube, multiple results."""
         result = await self._youtube_results(query)
-        await menu(ctx, result, DEFAULT_CONTROLS)
+        if result:
+            await menu(ctx, result, DEFAULT_CONTROLS)
+        else:
+            await ctx.send("Nothing found. Try again later.")
 
     def cog_unload(self):
         self.bot.loop.create_task(self.session.close())