From 48e7b2fb0e58c5aba09211c554d2fc9bb217d25b Mon Sep 17 00:00:00 2001
From: Akumatic <ugp@hotmail.de>
Date: Wed, 27 Jun 2018 11:57:38 +0200
Subject: [PATCH] Moved join and leave event logging to moderation

---
 extensions/moderation.py | 20 ++++++++++++++++++++
 extensions/user.py       | 22 ++--------------------
 2 files changed, 22 insertions(+), 20 deletions(-)

diff --git a/extensions/moderation.py b/extensions/moderation.py
index 3d9c805..db86609 100644
--- a/extensions/moderation.py
+++ b/extensions/moderation.py
@@ -20,6 +20,26 @@ class Moderation():
     def __init__(self, bot):
         self.bot = bot
 
+    #Logs
+    async def on_member_join(self, member):
+        await member.send(s[str(member.guild.id)]["joinMessage"])
+        if(s[str(member.guild.id)]["modChannel"] != 0):
+            e = discord.Embed(color=0x32c832)
+            e.set_author(name = str(member) + " has joined the server.", icon_url=member.avatar_url)
+            e.add_field(name="ID", value=str(member.id), inline=False)
+            e.add_field(name="Mention", value=member.mention, inline=False)
+            chan = self.bot.get_channel(s[str(member.guild.id)]["modChannel"])
+            await chan.send(embed=e)
+
+    async def on_member_remove(self, member):
+        if(s[str(member.guild.id)]["modChannel"] != 0):
+            e = discord.Embed(color=0xc83232)
+            e.set_author(name = str(member) + " has left the server.", icon_url=member.avatar_url)
+            e.add_field(name="ID", value=str(member.id), inline=False)
+            e.add_field(name="Mention", value=member.mention, inline=False)
+            chan = self.bot.get_channel(s[str(member.guild.id)]["modChannel"])
+            await chan.send(embed=e)
+
     #Groups
     @commands.group()
     async def mod(self, ctx):
diff --git a/extensions/user.py b/extensions/user.py
index 10823e8..1f4280c 100644
--- a/extensions/user.py
+++ b/extensions/user.py
@@ -11,7 +11,7 @@ class User():
         """Prints the greeting text a user receives by joining the server"""
         await ctx.send(s[str(ctx.guild.id)]["joinMessage"])
 
-    @commands.command()
+    @commands.command(hidden=True)
     async def botinvite(self, ctx):
         await ctx.send("""Invite Link: <https://discordapp.com/oauth2/authorize?client_id={}&scope=bot&permissions=8>
         \nPlease read <https://github.com/Akumatic/Akuma-Matata/blob/master/README.md> for informations""".format(self.bot.user.id))
@@ -38,25 +38,7 @@ class User():
         else:
             await ctx.guild.get_member(ctx.guild.owner.id).send(embed=e)
 
-    async def on_member_join(self, member):
-        await member.send(s[str(member.guild.id)]["joinMessage"])
-        if(s[str(member.guild.id)]["modChannel"] != 0):
-            e = discord.Embed(color=0x32c832)
-            e.set_author(name = str(member) + " has joined the server.", icon_url=member.avatar_url)
-            e.add_field(name="ID", value=str(member.id), inline=False)
-            e.add_field(name="Mention", value=member.mention, inline=False)
-            chan = self.bot.get_channel(s[str(member.guild.id)]["modChannel"])
-            await chan.send(embed=e)
-
-    async def on_member_remove(self, member):
-        if(s[str(member.guild.id)]["modChannel"] != 0):
-            e = discord.Embed(color=0xc83232)
-            e.set_author(name = str(member) + " has left the server.", icon_url=member.avatar_url)
-            e.add_field(name="ID", value=str(member.id), inline=False)
-            e.add_field(name="Mention", value=member.mention, inline=False)
-            chan = self.bot.get_channel(s[str(member.guild.id)]["modChannel"])
-            await chan.send(embed=e)
-
+   
 #Setup
 def setup(bot):
     bot.add_cog(User(bot))
\ No newline at end of file