Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
13 changes: 10 additions & 3 deletions slackclient/_util.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,13 @@ def find(self, name):


class SearchDict(dict):

def find(self, name):
return self.get(name)
def find(self, search_string):
# Find the user by name
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:
return user
16 changes: 12 additions & 4 deletions tests/test_server.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,10 +29,18 @@ def test_Server_parse_channel_data(server, login_fixture):

def test_Server_parse_user_data(server, login_fixture):
server.parse_user_data(login_fixture["users"])
fakeuser = server.users.find('fakeuser')
assert type(fakeuser) == User
assert fakeuser == "fakeuser"
assert fakeuser != "someotheruser"
# Find user by Name
userbyname = server.users.find('fakeuser')
assert type(userbyname) == User
assert userbyname == "fakeuser"
assert userbyname != "someotheruser"
# Find user by ID
userbyid = server.users.find('U10CX1234')
assert type(userbyid) == User
assert userbyid == "fakeuser"
# Don't find invalid user
userbyid = server.users.find('invaliduser')
assert type(userbyid) != User


def test_Server_cantconnect(server):
Expand Down