Merge branch 'master' of https://github.com/fixator10/Fixator10-Cogs

# Conflicts:
#	restricts/restricts.py

README.md

@@ -1,3 +1,7 @@
+[![Discord](https://img.shields.io/discord/221158719025709056.svg?style=for-the-badge)](https://discord.me/fixator10)
+[![Discord](https://img.shields.io/badge/Red-DiscordBot-red.svg?style=for-the-badge)](https://github.com/Cog-Creators/Red-DiscordBot)
+[![CodeFactor](https://www.codefactor.io/repository/github/fixator10/fixator10-cogs/badge?style=for-the-badge)](https://www.codefactor.io/repository/github/fixator10/fixator10-cogs)
+
 # Fixator10-Cogs
 Cogs from my edition of DiNitride's selfbot and moar
 

adminutils/adminutils.py

@@ -22,7 +22,7 @@
 
 
 class AdminUtils:
-    def __init__(self, bot: discord.Client):
+    def __init__(self, bot: commands.Bot):
         self.bot = bot
         self.base_api_url = "https://discordapp.com/api/oauth2/authorize?"
         self.session = aiohttp.ClientSession(loop=self.bot.loop)

datautils/datautils.py

@@ -22,14 +22,11 @@ def get_rgb_from_int(rgb_int):
 
 
 def bool_emojify(bool_var: bool) -> str:
-    if bool_var:
-        return "✔"
-    else:
-        return "❌"
+    return "✔" if bool_var else "❌"
 
 
 class DataUtils:
-    def __init__(self, bot: discord.Client):
+    def __init__(self, bot: commands.Bot):
         self.bot = bot
 
     @commands.command(pass_context=True)

godvilledata/godvilledata.py

@@ -70,8 +70,8 @@ async def godville(self, *, godname: str):
                 text += "{}: {}\n".format(profile_replacements[key], value)
             elif key == "pet":
                 text += "Питомец:\n"
-                for key, value in profile["pet"].items():
-                    text += "    {}: {}\n".format(pet_replacements[key], value)
+                for petfield, petdata in profile["pet"].items():
+                    text += "    {}: {}\n".format(pet_replacements[petfield], petdata)
         await self.bot.say(text_header + chat.box(text))
 
 

holidays/holidays.py

@@ -11,16 +11,13 @@
 
 
 def bool_emojify(bool_var: bool) -> str:
-    if bool_var:
-        return "✅"
-    else:
-        return "❎"
+    return "✅" if bool_var else "❎"
 
 
 class Holidays:
     """Check holidays for this month"""
 
-    def __init__(self, bot):
+    def __init__(self, bot: commands.Bot):
         self.bot = bot
         self.session = aiohttp.ClientSession(loop=self.bot.loop)
         self.config_file = "data/holidays/config.json"

memegen/memegen.py

@@ -11,7 +11,7 @@
 class MemeGen:
     """Make memes with bot!"""
 
-    def __init__(self, bot):
+    def __init__(self, bot: commands.Bot):
         self.bot = bot
         self.session = aiohttp.ClientSession(loop=self.bot.loop)
 

moreutils/moreutils.py

@@ -50,10 +50,7 @@ def rgb_to_cmyk(r, g, b):
 
 
 def bool_emojify(bool_var: bool) -> str:
-    if bool_var:
-        return "✔"
-    else:
-        return "❌"
+    return "✔" if bool_var else "❌"
 
 
 class CustomChecks:
@@ -69,7 +66,7 @@ def predicate(ctx):
 
 
 class MoreUtils:
-    def __init__(self, bot: discord.Client):
+    def __init__(self, bot: commands.Bot):
         self.bot = bot
         self.config_file = "data/moreutils/config.json"
         self.config = dataIO.load_json(self.config_file)
@@ -266,14 +263,14 @@ async def color(self, ctx, color: discord.Color):
             await self.bot.say(embed=em)
         else:
             await self.bot.say("```\n" +
-                                   "Provided HEX: " + color +
-                                   "\nRGB: " + str(colorrgb) +
-                                   "\nCMYK: " + str(colorcmyk) +
-                                   "\nHSV: " + str(colorhsv) +
-                                   "\nHLS: " + str(colorhls) +
-                                   "\nYIQ: " + str(coloryiq) +
-                                   "\nint: " + str(colorint) +
-                                   "```")
+                               "Provided HEX: " + color +
+                               "\nRGB: " + str(colorrgb) +
+                               "\nCMYK: " + str(colorcmyk) +
+                               "\nHSV: " + str(colorhsv) +
+                               "\nHLS: " + str(colorhls) +
+                               "\nYIQ: " + str(coloryiq) +
+                               "\nint: " + str(colorint) +
+                               "```")
 
     @commands.command(pass_context=True, no_pm=True)
     async def someone(self, ctx, *, text: str = None):

personalroles/personalroles.py

@@ -35,7 +35,7 @@ def predicate(ctx: commands.Context):
 class PersonalRoles:
     """Assign and edit personal roles"""
 
-    def __init__(self, bot: discord.Client):
+    def __init__(self, bot: commands.Bot):
         self.bot = bot
         self.config_file = "data/personalroles/config.json"
         self.config = dataIO.load_json(self.config_file)
@@ -72,15 +72,15 @@ async def unassign(self, ctx, *, user: discord.Member):
 
     @myrole.command(pass_context=True, no_pm=True, hidden=True)
     @checks.admin_or_permissions(manage_roles=True)
-    async def unassignid(self, ctx, *, id: str):
+    async def unassignid(self, ctx, *, userid: str):
         """Unassign personal role from someone by ID"""
         sv = ctx.message.server.id
-        if sv not in self.config or id not in self.config[sv]["users"]:
-            await self.bot.say("Can't find {} in assigned roles list.".format(id))
+        if sv not in self.config or userid not in self.config[sv]["users"]:
+            await self.bot.say("Can't find {} in assigned roles list.".format(userid))
             return
-        del self.config[sv]["users"][id]
+        del self.config[sv]["users"][userid]
         dataIO.save_json(self.config_file, self.config)
-        await self.bot.say("Ok. I just removed {} from assigned roles list.".format(id))
+        await self.bot.say("Ok. I just removed {} from assigned roles list.".format(userid))
 
     @myrole.command(pass_context=True, no_pm=True, name="list")
     @checks.admin_or_permissions(manage_roles=True)