From f66c3f20e12b0b2d952c8e37fe9e27818564e513 Mon Sep 17 00:00:00 2001
From: marcopandolfo <marcopandolfo577@gmail.com>
Date: Fri, 30 Aug 2019 19:31:13 -0300
Subject: [PATCH 1/5] Env to gitignore

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index bf96b13..bb1e904 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,5 @@
 venv
 .vscode
 __pycache__
-.editorconfig
\ No newline at end of file
+.editorconfig
+env
\ No newline at end of file

From f2774f4ffb9a023cdd6eb74f306c8e530025f4db Mon Sep 17 00:00:00 2001
From: marcopandolfo <marcopandolfo577@gmail.com>
Date: Fri, 30 Aug 2019 21:47:44 -0300
Subject: [PATCH 2/5] Cleanup

---
 bothello.py       | 10 ++++++++--
 cogs/greetings.py | 11 +++--------
 cogs/ready.py     | 17 +++++++++++++++++
 info.py           | 10 ----------
 utils.py          |  1 +
 5 files changed, 29 insertions(+), 20 deletions(-)
 create mode 100644 cogs/ready.py
 delete mode 100644 info.py

diff --git a/bothello.py b/bothello.py
index 6fc13cb..eed0853 100644
--- a/bothello.py
+++ b/bothello.py
@@ -10,27 +10,33 @@
 
 client = commands.Bot(command_prefix='!')
 
-
+# Load Cog Command
 @client.command()
 async def load(ctx, extension):
+    print(f'[LOADING EXT] - {extension}')
     client.load_extension(f'cogs.{extension}')
 
 
+# Unload Cog command
 @client.command()
 async def unload(ctx, extension):
+    print(f'[UNLOADING EXT] - {extension}')
     client.unload_extension(f'cogs.{extension}')
 
 
+# Reload Cog Command
 @client.command()
 async def reload(ctx, extension):
+    print(f'[RELOADING EXT] - {extension}')
     client.unload_extension(f'cogs.{extension}')
     client.load_extension(f'cogs.{extension}')
 
 
+# Initialize Cogs
 for filename in listdir('./cogs'):
     if filename.endswith('.py'):
+        print(f'[LOADING EXT] - {filename[:-3]}')
         client.load_extension(f'cogs.{filename[:-3]}')
-        print(f'cogs.{filename[:-3]}')
 
 
 client.run(token_bot)
diff --git a/cogs/greetings.py b/cogs/greetings.py
index 869b08a..081c242 100644
--- a/cogs/greetings.py
+++ b/cogs/greetings.py
@@ -7,15 +7,10 @@ class Greetings(commands.Cog):
     def __init__(self, client):
         self.client = client
 
-    @commands.Cog.listener()
-    async def on_ready(client):
-        print(f'We are online {client}')
-    # await utils.set_presence(client)
-
-    @commands.command()
-    async def hello(self, ctx):
-        await ctx.send("Para de pingar mardito")
 
+    @commands.Cog.listener()
+    async def on_member_join(self, member):
+        print(f'[MEMBER JOINED] - {member}')
 
 def setup(client):
     client.add_cog(Greetings(client))
diff --git a/cogs/ready.py b/cogs/ready.py
new file mode 100644
index 0000000..f3b9450
--- /dev/null
+++ b/cogs/ready.py
@@ -0,0 +1,17 @@
+import utils
+import discord
+from discord.ext import commands
+
+
+class Ready(commands.Cog):
+
+    def __init__(self, client):
+        self.client = client
+
+    @commands.Cog.listener()
+    async def on_ready(client):
+        print('[BOT READY!]')
+
+
+def setup(client):
+    client.add_cog(Ready(client))
diff --git a/info.py b/info.py
deleted file mode 100644
index 7dad644..0000000
--- a/info.py
+++ /dev/null
@@ -1,10 +0,0 @@
-from discord.ext import commands
-
-
-class Info(commands.Cog):
-    def __init__(self, bot):
-        self.bot = bot
-
-    @commands.command()
-    async def info(self, ctx):
-        print(self.bot.application_info())
diff --git a/utils.py b/utils.py
index e742da7..1b60815 100644
--- a/utils.py
+++ b/utils.py
@@ -1,5 +1,6 @@
 import discord
 
+# Set Bot Presence
 async def set_presence(client, game="Python"):
     game = discord.Game(game)
     await client.change_presence(status=discord.Status.idle, activity=game)

From 9cb33785ecede3af7f61bbd41be9d3c80117e994 Mon Sep 17 00:00:00 2001
From: marcopandolfo <marcopandolfo577@gmail.com>
Date: Fri, 30 Aug 2019 22:00:04 -0300
Subject: [PATCH 3/5] Creating command template

---
 cogs/command_example.py | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 cogs/command_example.py

diff --git a/cogs/command_example.py b/cogs/command_example.py
new file mode 100644
index 0000000..91a3eb6
--- /dev/null
+++ b/cogs/command_example.py
@@ -0,0 +1,17 @@
+import discord
+from discord.ext import commands
+
+
+class Example(commands.Cog):
+
+    def __init__(self, client):
+        self.client = client
+
+
+    @commands.command()
+    async def example(self, ctx):
+        await ctx.send('This is an example command :)')
+        
+
+def setup(client):
+    client.add_cog(Example(client))

From 093acbad168a9d0205c17b977a86910262b7bcc2 Mon Sep 17 00:00:00 2001
From: marcopandolfo <marcopandolfo577@gmail.com>
Date: Fri, 30 Aug 2019 22:01:35 -0300
Subject: [PATCH 4/5] Capturing messages

---
 cogs/message.py | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)
 create mode 100644 cogs/message.py

diff --git a/cogs/message.py b/cogs/message.py
new file mode 100644
index 0000000..9d56ae7
--- /dev/null
+++ b/cogs/message.py
@@ -0,0 +1,16 @@
+import discord
+from discord.ext import commands
+
+
+class Message(commands.Cog):
+
+    def __init__(self, client):
+        self.client = client
+
+
+    @commands.Cog.listener()
+    async def on_message(self, message):
+        print(f'[{message.author}] - {message.content}')
+
+def setup(client):
+    client.add_cog(Message(client))

From c3bcc5219c95d7a6e7a983cf66e166185b88c4e8 Mon Sep 17 00:00:00 2001
From: marcopandolfo <marcopandolfo577@gmail.com>
Date: Fri, 30 Aug 2019 22:23:00 -0300
Subject: [PATCH 5/5] organizing structure

---
 bothello.py => bot.py                        | 12 +++++++++---
 cogs/{ => commands}/command_example.py       |  0
 cogs/{greetings.py => events/member_join.py} |  4 ++--
 cogs/{ => events}/message.py                 |  0
 cogs/{ => events}/ready.py                   |  0
 5 files changed, 11 insertions(+), 5 deletions(-)
 rename bothello.py => bot.py (71%)
 rename cogs/{ => commands}/command_example.py (100%)
 rename cogs/{greetings.py => events/member_join.py} (78%)
 rename cogs/{ => events}/message.py (100%)
 rename cogs/{ => events}/ready.py (100%)

diff --git a/bothello.py b/bot.py
similarity index 71%
rename from bothello.py
rename to bot.py
index eed0853..7595b51 100644
--- a/bothello.py
+++ b/bot.py
@@ -32,11 +32,17 @@ async def reload(ctx, extension):
     client.load_extension(f'cogs.{extension}')
 
 
-# Initialize Cogs
-for filename in listdir('./cogs'):
+# Initialize Events
+for filename in listdir('./cogs/events/'):
     if filename.endswith('.py'):
         print(f'[LOADING EXT] - {filename[:-3]}')
-        client.load_extension(f'cogs.{filename[:-3]}')
+        client.load_extension(f'cogs.events.{filename[:-3]}')
+
+# Initialize Commands
+for filename in listdir('./cogs/commands/'):
+    if filename.endswith('.py'):
+        print(f'[LOADING EXT] - {filename[:-3]}')
+        client.load_extension(f'cogs.commands.{filename[:-3]}')
 
 
 client.run(token_bot)
diff --git a/cogs/command_example.py b/cogs/commands/command_example.py
similarity index 100%
rename from cogs/command_example.py
rename to cogs/commands/command_example.py
diff --git a/cogs/greetings.py b/cogs/events/member_join.py
similarity index 78%
rename from cogs/greetings.py
rename to cogs/events/member_join.py
index 081c242..b188627 100644
--- a/cogs/greetings.py
+++ b/cogs/events/member_join.py
@@ -2,7 +2,7 @@
 from discord.ext import commands
 
 
-class Greetings(commands.Cog):
+class MemberJoin(commands.Cog):
 
     def __init__(self, client):
         self.client = client
@@ -13,4 +13,4 @@ async def on_member_join(self, member):
         print(f'[MEMBER JOINED] - {member}')
 
 def setup(client):
-    client.add_cog(Greetings(client))
+    client.add_cog(MemberJoin(client))
diff --git a/cogs/message.py b/cogs/events/message.py
similarity index 100%
rename from cogs/message.py
rename to cogs/events/message.py
diff --git a/cogs/ready.py b/cogs/events/ready.py
similarity index 100%
rename from cogs/ready.py
rename to cogs/events/ready.py