slackapi · rawdigits · Feb 13, 2015 · Dec 17, 2014 · Dec 17, 2014 · Dec 17, 2014
diff --git a/__init__.py b/__init__.py
@@ -0,0 +1 @@
+__author__ = 'nik'
diff --git a/slackclient/_channel.py b/slackclient/_channel.py
@@ -14,7 +14,8 @@ def __eq__(self, compare_str):
     def __str__(self):
         data = ""
         for key in self.__dict__.keys():
-            data += "{} : {}\n".format(key, str(self.__dict__[key])[:40])
+            if key != "server":
+                data += "{} : {}\n".format(key, str(self.__dict__[key])[:40])
         return data
 
     def __repr__(self):

diff --git a/slackclient/_client.py b/slackclient/_client.py
@@ -14,11 +14,12 @@ def rtm_connect(self):
         try:
             self.server.rtm_connect()
             return True
-        except:
+        except Exception as e:
+            print e
             return False
 
     def api_call(self, method, **kwargs):
-        return self.server.api_call(method, kwargs)
+        return self.server.api_call(method, **kwargs)
 
     def rtm_read(self):
         #in the future, this should handle some events internally i.e. channel creation
@@ -33,7 +34,11 @@ def rtm_read(self):
             raise SlackNotConnected
 
     def rtm_send_message(self, channel, message):
-        return self.server.channels.find(channel).send_message(message)
+        if channel.startswith("D"):
+            return self.server.ims.find(channel).send_message(message)
+        else:
+            return self.server.channels.find(channel).send_message(message)
+
 
 class SlackNotConnected(Exception):
     pass
diff --git a/slackclient/_im.py b/slackclient/_im.py
@@ -0,0 +1,26 @@
+class Im(object):
+    def __init__(self, server, user, id):
+        self.server = server
+        self.user = user
+        self.id = id
+
+    def __eq__(self, compare_str):
+        if self.id == compare_str or self.user == compare_str:
+            return True
+        else:
+            return False
+
+    def __str__(self):
+        data = ""
+        for key in self.__dict__.keys():
+            if key != "server":
+                data += "{} : {}\n".format(key, str(self.__dict__[key])[:40])
+        return data
+
+    def __repr__(self):
+        return self.__str__()
+
+    def send_message(self, message):
+        message_json = {"type": "message", "channel": self.id, "text": message}
+        self.server.send_to_websocket(message_json)
+
diff --git a/slackclient/_server.py b/slackclient/_server.py
@@ -1,6 +1,8 @@
 from _slackrequest import SlackRequest
 from _channel import Channel
 from _util import SearchList
+from slackclient.slackclient._im import Im
+from slackclient.slackclient._user import User
 
 from websocket import create_connection
 import json
@@ -12,8 +14,11 @@ def __init__(self, token, connect=True):
         self.domain = None
         self.login_data = None
         self.websocket = None
+
         self.users = SearchList()
         self.channels = SearchList()
+        self.ims = SearchList()
+
         self.connected = False
         self.pingcounter = 0
         self.api_requester = SlackRequest()
@@ -50,7 +55,8 @@ def parse_slack_login_data(self, login_data):
         self.username = self.login_data["self"]["name"]
         self.parse_channel_data(login_data["channels"])
         self.parse_channel_data(login_data["groups"])
-        self.parse_channel_data(login_data["ims"])
+        self.parse_im_data(login_data["ims"])
+        self.parse_user_data(login_data["users"])
         try:
             self.websocket = create_connection(self.login_data['url'])
             self.websocket.sock.setblocking(0)
@@ -65,6 +71,23 @@ def parse_channel_data(self, channel_data):
                 channel["members"] = []
             self.attach_channel(channel["name"], channel["id"], channel["members"])
 
+    def parse_im_data(self, im_data):
+        for im in im_data:
+            self.ims.append(Im(self,  im["user"], im["id"]))
+
+    def parse_user_data(self, user_data):
+        for user in user_data:
+            if user["deleted"]:
+                continue
+
+            if "real_name" not in user:
+                user["real_name"] = user["name"]
+
+            if "tz" not in user:
+                user["tz"] = None
+
+            self.users.append(User(self, user["id"], user["name"], user["real_name"], user["tz"]))
+
     def send_to_websocket(self, data):
         """Send (data) directly to the websocket."""
         data = json.dumps(data)

diff --git a/slackclient/_user.py b/slackclient/_user.py
@@ -0,0 +1,23 @@
+class User(object):
+    def __init__(self, server, id, name, real_name, tz):
+        self.tz = tz
+        self.name = name
+        self.real_name = real_name
+        self.server = server
+        self.id = id
+
+    def __eq__(self, compare_str):
+        if self.id == compare_str:
+            return True
+        else:
+            return False
+
+    def __str__(self):
+        data = ""
+        for key in self.__dict__.keys():
+            if key != "server":
+                data += "{} : {}\n".format(key, str(self.__dict__[key])[:40])
+        return data
+
+    def __repr__(self):
+        return self.__str__()
diff --git a/slackclient/_util.py b/slackclient/_util.py
@@ -9,7 +9,7 @@ def find(self, name):
                 if child == name:
                     items.append(child)
 
-        if len(items) == 1:
+        if len(items) > 0:
             return items[0]
         elif items != []:
             return items