Merge branch 'develop' of https://www.github.com/CactusBot/CactusBot into develop

Author: Innectic

cactus.py

@@ -145,8 +145,6 @@ def _run(self, *args, **kwargs):
 
         self.started = True
 
-        self.channel = self.get_channel(self.config["channel"])
-
         self.channel = self.config["channel"]
         self.channel_data = self.get_channel(self.channel)
 

models.py

@@ -31,6 +31,17 @@ class StoredCommand(Base):
     author = Column(Integer)
 
 
+class Quote(Base):
+    __tablename__ = "quotes"
+
+    id = Column(Integer, unique=True, primary_key=True)
+
+    quote = Column(String)
+
+    creation = Column(DateTime)
+    author = Column(Integer)
+
+
 class Command(StoredCommand, User):
     def __init__(self, *args, **kwargs):
         super(Command, self).__init__(*args, **kwargs)
@@ -59,17 +70,6 @@ def __call__(self, user, *args):
         return response
 
 
-class Quote(Base):
-    __tablename__ = "quotes"
-
-    id = Column(Integer, unique=True, primary_key=True)
-
-    quote = Column(String)
-
-    creation = Column(DateTime)
-    author = Column(Integer)
-
-
 class CommandCommand(Command):
     def __call__(self, args, data):
         mod_roles = ("Owner", "Staff", "Founder", "Global Mod", "Mod")
@@ -170,8 +170,7 @@ class SocialCommand(Command):
     user = User()
 
     def __call__(self, args, data=None):
-        social = self.user.request("GET", "/channels/{id}".format(
-            id=data['channel']), fields='user')["user"]["social"]
+        social = self.user.get_channel(data["channel"])["user"]["social"]
         if social:
             return ', '.join(': '.join((k.title(), social[k])) for k in social)
         return "No social services were found on the streamer's profile."

user.py

@@ -76,7 +76,7 @@ def get_channel(self, id, **p):
 
     def get_chat(self, id):
         """Get chat server data."""
-        return self.request("GET", "/chats/{id}".format(id=id), params="")
+        return self.request("GET", "/chats/{id}".format(id=id))
 
     def connect(self, channel_id, bot_id):
         """Connect to a Beam chat through a websocket."""