Merge branch 'master' of https://github.com/CreeperSeth/RubyRoseBot

Author: script-head

bot.py

@@ -88,7 +88,7 @@ async def set_default_status():
                 os._exit(1)
             status = discord.Activity(name=name, url="http://twitch.tv/ZeroEpoch1969", type=discord.ActivityType.streaming)
         else:
-            status = discord.Game(name=name, type=discord.ActivityType.playing)
+            status = discord.Activity(name=name, type=discord.ActivityType.playing)
         await bot.change_presence(status=type, activity=status)
     else:
         await bot.change_presence(status=type)

commands/music.py

@@ -7,7 +7,7 @@
 from discord.ext import commands
 from utils.mysql import *
 from utils.opus_loader import load_opus_lib
-from utils.config import Config;
+from utils.config import Config
 from utils.language import Language
 
 load_opus_lib()

commands/nsfw.py

@@ -129,7 +129,7 @@ async def gelbooru(self, ctx, *, tags:str):
         images = []
         for i in range(image_count):
             try:
-                images.append("http:{}".format(data[random.randint(0, count)]["file_url"]))
+                images.append("{}".format(data[random.randint(0, count)]["file_url"]))#http isn't needed
             except KeyError:
                 await ctx.send(data["message"])
                 return