resolve conflicts

minato_namikaze/bot_files/cogs/anime_and_vocaloids/vocaloid.py

@@ -1,125 +1,125 @@
-from discord.ext import commands
 import discord
+from discord.ext import commands
 
 from ...lib.functions import meek_api
 
 
 class Vocaloid(commands.Cog):
     def __init__(self, bot):
         self.bot = bot
-        self.description = 'Get some kawai pictures of the vocaloids.'
-    
+        self.description = "Get some kawai pictures of the vocaloids."
+
     @property
     def display_emoji(self) -> discord.PartialEmoji:
-        return discord.PartialEmoji(name='miku_hello', id=852809647357820968)
+        return discord.PartialEmoji(name="miku_hello", id=852809647357820968)
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def rin(self, ctx):
-        '''Rin kawai picture'''
-        await ctx.send(embed=await meek_api('rin'))
+        """Rin kawai picture"""
+        await ctx.send(embed=await meek_api("rin"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def una(self, ctx):
-        '''Una kawai picture'''
-        await ctx.send(embed=await meek_api('una'))
+        """Una kawai picture"""
+        await ctx.send(embed=await meek_api("una"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def gumi(self, ctx):
-        '''Gumi kawai picture'''
-        await ctx.send(embed=await meek_api('gumi'))
+        """Gumi kawai picture"""
+        await ctx.send(embed=await meek_api("gumi"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def ia(self, ctx):
-        '''Ia kawai picture'''
-        await ctx.send(embed=await meek_api('ia'))
+        """Ia kawai picture"""
+        await ctx.send(embed=await meek_api("ia"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def luka(self, ctx):
-        '''Luka kawai picture'''
-        await ctx.send(embed=await meek_api('luka'))
+        """Luka kawai picture"""
+        await ctx.send(embed=await meek_api("luka"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def fukase(self, ctx):
-        '''Fukase kawai picture'''
-        await ctx.send(embed=await meek_api('fukase'))
+        """Fukase kawai picture"""
+        await ctx.send(embed=await meek_api("fukase"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def miku(self, ctx):
-        '''Hatsune Miku kawai picture'''
-        await ctx.send(embed=await meek_api('miku'))
+        """Hatsune Miku kawai picture"""
+        await ctx.send(embed=await meek_api("miku"))
 
-    @commands.command(name='len')
+    @commands.command(name="len")
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def _len(self, ctx):
-        '''Len kawai picture'''
-        await ctx.send(embed=await meek_api('len'))
+        """Len kawai picture"""
+        await ctx.send(embed=await meek_api("len"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def kaito(self, ctx):
-        '''Kaito kawai picture'''
-        await ctx.send(embed=await meek_api('kaito'))
+        """Kaito kawai picture"""
+        await ctx.send(embed=await meek_api("kaito"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def teto(self, ctx):
-        '''Teto kawai picture'''
-        await ctx.send(embed=await meek_api('teto'))
+        """Teto kawai picture"""
+        await ctx.send(embed=await meek_api("teto"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def meiko(self, ctx):
-        '''Meiko kawai picture'''
-        await ctx.send(embed=await meek_api('meiko'))
+        """Meiko kawai picture"""
+        await ctx.send(embed=await meek_api("meiko"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def yukari(self, ctx):
-        '''Yukari kawai picture'''
-        await ctx.send(embed=await meek_api('yukari'))
+        """Yukari kawai picture"""
+        await ctx.send(embed=await meek_api("yukari"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def miki(self, ctx):
-        '''Miki kawai picture'''
-        await ctx.send(embed=await meek_api('miki'))
+        """Miki kawai picture"""
+        await ctx.send(embed=await meek_api("miki"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def lily(self, ctx):
-        '''Lily kawai picture'''
-        await ctx.send(embed=await meek_api('lily'))
+        """Lily kawai picture"""
+        await ctx.send(embed=await meek_api("lily"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def mayu(self, ctx):
-        '''Mayu kawai picture'''
-        await ctx.send(embed=await meek_api('mayu'))
+        """Mayu kawai picture"""
+        await ctx.send(embed=await meek_api("mayu"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def aoki(self, ctx):
-        '''Aoki kawai picture'''
-        await ctx.send(embed=await meek_api('aoki'))
+        """Aoki kawai picture"""
+        await ctx.send(embed=await meek_api("aoki"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def zola(self, ctx):
-        '''Zola kawai picture'''
-        await ctx.send(embed=await meek_api('zola'))
+        """Zola kawai picture"""
+        await ctx.send(embed=await meek_api("zola"))
 
     @commands.command()
     @commands.cooldown(1, 2, commands.BucketType.user)
     async def diva(self, ctx):
-        '''Random picturs from Project Diva'''
-        await ctx.send(embed=await meek_api('diva'))
+        """Random picturs from Project Diva"""
+        await ctx.send(embed=await meek_api("diva"))
 
 
 def setup(bot):