Added !server, !join and some general improvements

Audio's task now properly checks if the audio module is still loaded
Added !server to cogs.general for server info
Added !join <invite> (owner only) to make Red join other servers
settings.json now gets deleted if login fails

cogs/audio.py

@@ -41,7 +41,6 @@ class Audio:
         self.playlist = []
         self.current = -1 #current track index in self.playlist
         self.downloader = {"DONE" : False, "TITLE" : False, "ID" : False, "URL" : False, "DURATION" : False, "DOWNLOADING" : False}
-        self.quit_manager = False
         self.skip_votes = []
 
         self.sing =  ["https://www.youtube.com/watch?v=zGTkAVsrfg8", "https://www.youtube.com/watch?v=cGMWL8cOeAU",
@@ -422,7 +421,7 @@ class Audio:
             return False
 
     async def queue_manager(self):
-        while not self.quit_manager:
+        while "Audio" in self.bot.cogs:
             if self.queue and not self.music_player.is_playing():
                 new_link = self.queue[0]
                 self.queue.pop(0)
@@ -453,10 +452,7 @@ class Audio:
 
     async def incoming_messages(self, msg): # Workaround, need to fix
         if msg.author.id != self.bot.user.id:
-            cmds = ("unload cogs.audio", "reload cogs.audio")
             
-            if msg.content in cmds:
-                self.quit_manager = True
             if msg.channel.is_private and msg.attachments != []:
                 await self.transfer_playlist(msg)
         if not msg.channel.is_private:

cogs/general.py

@@ -133,30 +133,50 @@ class General:
         await self.bot.say("http://lmgtfy.com/?q=" + text)
 
     @commands.command(no_pm=True, hidden=True)
-    async def hug(self, member : discord.Member = None):
+    async def hug(self, user : discord.Member = None):
         """Because everyone likes hugs"""
-        await self.bot.say("(っ´▽｀)っ" + " *" + member.name + "*")
+        await self.bot.say("(っ´▽｀)っ" + " *" + user.name + "*")
 
     @commands.command(pass_context=True, no_pm=True)
-    async def info(self, ctx, member : discord.Member = None):
-        """Shows member's information"""
+    async def info(self, ctx, user : discord.Member = None):
+        """Shows users's informations"""
         author = ctx.message.author
-        if not member:
-            member = author
+        if not user:
+            user = author
         roles = []
-        for m in member.roles:
+        for m in user.roles:
             if m.name != "@everyone":
                 roles.append('"' + m.name + '"') #.replace("@", "@\u200b")
         if not roles: roles = ["None"]
         data = "```\n"
-        data += "Name: " + member.name + "\n"
-        data += "ID: " + member.id + "\n"
-        data += "Joined: " + str(member.joined_at) + "\n"
+        data += "Name: " + user.name + "\n"
+        data += "ID: " + user.id + "\n"
+        data += "Joined: " + str(user.joined_at) + "\n"
         data += "Roles: " + " ".join(roles) + "\n"
-        data += "Avatar: " + member.avatar_url + "\n"
+        data += "Avatar: " + user.avatar_url + "\n"
         data += "```"
         await self.bot.say(data)
 
+    @commands.command(pass_context=True, no_pm=True)
+    async def server(self, ctx):
+        """Shows server's informations"""
+        server = ctx.message.server
+        online = str(len([m.status for m in server.members if str(m.status) == "online" or str(m.status) == "idle"]))
+        total = str(len(server.members))
+
+        data = "```\n"
+        data += "Name: " + server.name + "\n"
+        data += "ID: " + server.id + "\n"
+        data += "Region: " + server.region.name + "\n"
+        data += "Users: " + online + "/" + total + "\n"
+        data += "Channels: " + str(len(server.channels)) + "\n"
+        data += "Roles: " + str(len(server.roles)) + "\n"
+        data += "Created: " + str(server.owner.joined_at) + "\n"
+        data += "Owner: " + server.owner.name + "\n"
+        data += "Icon: " + str(server.icon_url) + "\n"
+        data += "```"
+        await self.bot.say(data)
+        
     @commands.command()
     async def urban(self, *, search_terms : str):
         """Urban Dictionary search"""
@@ -275,4 +295,4 @@ class NewPoll():
 def setup(bot):
     n = General(bot)
     bot.add_listener(n.check_poll_votes, "on_message")
-    bot.add_cog(n)
+    bot.add_cog(n)

cogs/mod.py

@@ -2,7 +2,6 @@ import discord
 from discord.ext import commands
 from .utils import checks
 from .utils.dataIO import fileIO
-import __main__
 import os
 
 class Mod: