Change and fix waifu media

cogs/anime.py

@@ -22,25 +22,26 @@ class Anime(commands.Cog):
     @commands.command(name="animemedia")
     async def animemedia(self, ctx):
         """
-        Sends a random anime gif or pic
+        Sends a random Anime gif or picture
         """
         # Choose either a gif or a pic -> config/media.py
         media_type = random.choice(loadconfig.__media_anime__)
         media = random.choice(media_type)
         await ctx.send(media)
 
-    @commands.command(name="waifumedia")
-    async def waifumedia(self, ctx, waifu: str):
+    @commands.command(name="animegirl")
+    async def girlmedia(self, ctx, query: str):
         """
-        Sends a random pic of a waifu
+        Sends a random picture or gif of an Anime girl
         """
         # config/media.py
+        girl = query.capitalize()
         try:
-            media = random.choice(loadconfig.__media_waifu__[waifu])
+            media = random.choice(loadconfig.__media_girl__[girl])
             await ctx.send(media)
         except KeyError as error:
             text = (
-                    f"Waifu `{waifu}` not found in database!\n"
+                    f"Girl `{girl}` not found in database!\n"
                     "It probably sucks...")
             await ctx.send(text)
 

cogs/voice_new.py

@@ -0,0 +1,140 @@
+"""
+Rework the voice commands
+
+https://discordpy.readthedocs.io/en/latest/ext/commands/cogs.html
+
+"""
+
+# IMPORTS - external
+import discord
+from discord.ext import commands
+
+# COG INIT
+class voice(commands.Cog):
+    def __init__(self, bot):
+        self.bot = bot
+
+# COG BODY
+
+class VoiceError(Exception):
+    pass
+
+class YTDLError(Exception):
+    pass
+
+
+# YTDLSource class from:
+# https://gist.github.com/vbe0201/ade9b80f2d3b64643d854938d40a0a2d
+class YTDLSource(discord.PCMVolumeTransformer):
+    YTDL_OPTIONS = {
+        'format': 'bestaudio/best',
+        'extractaudio': True,
+        'audioformat': 'mp3',
+        'outtmpl': '%(extractor)s-%(id)s-%(title)s.%(ext)s',
+        'restrictfilenames': True,
+        'noplaylist': True,
+        'nocheckcertificate': True,
+        'ignoreerrors': False,
+        'logtostderr': False,
+        'quiet': True,
+        'no_warnings': True,
+        'default_search': 'auto',
+        'source_address': '0.0.0.0',
+    }
+
+    FFMPEG_OPTIONS = {
+        'before_options': '-reconnect 1 -reconnect_streamed 1 -reconnect_delay_max 5',
+        'options': '-vn',
+    }
+
+    ytdl = youtube_dl.YoutubeDL(YTDL_OPTIONS)
+
+    def __init__(self, ctx: commands.Context, source: discord.FFmpegPCMAudio, *, data: dict, volume: float = 0.5):
+        super().__init__(source, volume)
+
+        self.requester = ctx.author
+        self.channel = ctx.channel
+        self.data = data
+
+        self.uploader = data.get('uploader')
+        self.uploader_url = data.get('uploader_url')
+        date = data.get('upload_date')
+        self.upload_date = date[6:8] + '.' + date[4:6] + '.' + date[0:4]
+        self.title = data.get('title')
+        self.thumbnail = data.get('thumbnail')
+        self.description = data.get('description')
+        self.duration = self.parse_duration(int(data.get('duration')))
+        self.tags = data.get('tags')
+        self.url = data.get('webpage_url')
+        self.views = data.get('view_count')
+        self.likes = data.get('like_count')
+        self.dislikes = data.get('dislike_count')
+        self.stream_url = data.get('url')
+
+    def __str__(self):
+        return '**{0.title}** by **{0.uploader}**'.format(self)
+
+    @classmethod
+    async def create_source(cls, ctx: commands.Context, search: str, *, loop: asyncio.BaseEventLoop = None):
+        loop = loop or asyncio.get_event_loop()
+
+        partial = functools.partial(cls.ytdl.extract_info, search, download=False, process=False)
+        data = await loop.run_in_executor(None, partial)
+
+        if data is None:
+            raise YTDLError('Couldn\'t find anything that matches `{}`'.format(search))
+
+        if 'entries' not in data:
+            process_info = data
+        else:
+            process_info = None
+            for entry in data['entries']:
+                if entry:
+                    process_info = entry
+                    break
+
+            if process_info is None:
+                raise YTDLError('Couldn\'t find anything that matches `{}`'.format(search))
+
+        webpage_url = process_info['webpage_url']
+        partial = functools.partial(cls.ytdl.extract_info, webpage_url, download=False)
+        processed_info = await loop.run_in_executor(None, partial)
+
+        if processed_info is None:
+            raise YTDLError('Couldn\'t fetch `{}`'.format(webpage_url))
+
+        if 'entries' not in processed_info:
+            info = processed_info
+        else:
+            info = None
+            while info is None:
+                try:
+                    info = processed_info['entries'].pop(0)
+                except IndexError:
+                    raise YTDLError('Couldn\'t retrieve any matches for `{}`'.format(webpage_url))
+
+        return cls(ctx, discord.FFmpegPCMAudio(info['url'], **cls.FFMPEG_OPTIONS), data=info)
+
+    @staticmethod
+    def parse_duration(duration: int):
+        minutes, seconds = divmod(duration, 60)
+        hours, minutes = divmod(minutes, 60)
+        days, hours = divmod(hours, 24)
+
+        duration = []
+        if days > 0:
+            duration.append('{} days'.format(days))
+        if hours > 0:
+            duration.append('{} hours'.format(hours))
+        if minutes > 0:
+            duration.append('{} minutes'.format(minutes))
+        if seconds > 0:
+            duration.append('{} seconds'.format(seconds))
+
+        return ', '.join(duration)
+    # End of copy pasta
+
+
+# COG ENDING
+def setup(bot):
+    bot.add_cog(voice(bot))

config/media.py

@@ -9,21 +9,26 @@ pics_anime = [
         "https://i.imgur.com/4xnJN9x.png",
         ]
 
-waifu_aqua = []
+girl_aqua = []
 
-waifu_megumin = []
+girl_noel = [
+        "https://i.imgur.com/qSAjVSL.png",
+        ]
 
-waifu_akeno = []
+girl_megumin = []
 
-waifu_rem = []
+girl_akeno = []
+
+girl_rem = []
 
 
 # Exports
 __media_anime__ = [gifs_anime, pics_anime]
 
-__media_waifu__ = {
-        "aqua": waifu_aqua,
-        "meugmin": waifu_megumin,
-        "akeno": waifu_akeno,
-        "rem": waifu_rem
+__media_girl__ = {
+        "Aqua": girl_aqua,
+        "Noel": girl_noel,
+        "Megumin": girl_megumin,
+        "Akeno": girl_akeno,
+        "Rem": girl_rem
         }