Added some new base commands

Author: Innectic

messages.py

@@ -1,5 +1,5 @@
 from user import User
-from models import Command, session, CommandCommand, QuoteCommand, CubeCommand, SocialCommand, ScheduleCommand
+from models import Command, session, CommandCommand, QuoteCommand, CubeCommand, SocialCommand, ScheduleCommand, WhoAmICommand, UptimeCommand, CactusCommand
 from asyncio import async, coroutine
 from functools import partial
 
@@ -47,6 +47,9 @@ def message_handler(self, data):
                 "cube": CubeCommand,
                 "social": SocialCommand,
                 "schedule": ScheduleCommand,
+                "whoami": WhoAmICommand,
+                "uptime": UptimeCommand,
+                "cactus": CactusCommand
             }
             if args[0][1:] in commands:
                 yield from self.send_message(

models.py

@@ -6,7 +6,6 @@
 from datetime import datetime
 from re import sub, findall
 from random import randrange
-from schedule import Schedule
 
 from user import User
 
@@ -185,13 +184,26 @@ def __call__(self, args, data=None):
         if action is "add":
             time = interval[:-1]
             modifer = interval[-1:]
-
-
         elif action is "remove":
             pass
         else:
             pass
 
+
+class WhoAmICommand(Command):
+    def __call__(self, args, data=None):
+        return 'Ohai, {name}! Want a :cactus ?'.format(name=data['token'])
+
+
+class UptimeCommand(Command):
+    def __call__(self, args, data=None):
+        return 'This isn\'t done yet. #BlameLiveLoading :cactus'
+
+
+class CactusCommand(Command):
+    def __call__(command):
+        return 'Ohai! I\'m CactusBot! And you are?'
+
 # #### TO BE REDONE IN USERS MODEL #### #