From 4b7f996ed4a6a51bc5d6e54d305a3f933e10380c Mon Sep 17 00:00:00 2001 From: Roach Date: Thu, 19 Jan 2017 15:17:10 -0800 Subject: [PATCH] Index users by ID instead of name (#156) * Index users by ID instead of name --- slackclient/_server.py | 4 ++-- slackclient/_util.py | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/slackclient/_server.py b/slackclient/_server.py index a2a795863..cc413a481 100644 --- a/slackclient/_server.py +++ b/slackclient/_server.py @@ -151,8 +151,8 @@ def websocket_safe_read(self): raise return data.rstrip() - def attach_user(self, name, channel_id, real_name, tz): - self.users.update({name: User(self, name, channel_id, real_name, tz)}) + def attach_user(self, name, user_id, real_name, tz): + self.users.update({user_id: User(self, name, user_id, real_name, tz)}) def attach_channel(self, name, channel_id, members=None): if members is None: diff --git a/slackclient/_util.py b/slackclient/_util.py index 2428089f3..8d993425d 100644 --- a/slackclient/_util.py +++ b/slackclient/_util.py @@ -19,12 +19,12 @@ def find(self, name): class SearchDict(dict): def find(self, search_string): - # Find the user by name + # Find the user by ID user = self.get(search_string) if user: return user else: - # If the user can't be found by name, try searching by ID - for name, user in self.items(): - if str(user.id) == search_string: + # If the user can't be found by ID, try searching by name + for id, user in self.items(): + if str(user.name) == search_string: return user