Skip to content

include email as user property #113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
acaire wants to merge 1 commit into from
Closed

include email as user property #113

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
12 changes: 9 additions & 3 deletions slackclient/_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,13 @@ def parse_user_data(self, user_data):
user["tz"] = "unknown"
if "real_name" not in user:
user["real_name"] = user["name"]
self.attach_user(user["name"], user["id"], user["real_name"], user["tz"])
if "email" not in user["profile"]:
user["profile"]["email"] = ""
self.attach_user(user["name"],
user["id"],
user["real_name"],
user["tz"],
user["profile"]["email"])

def send_to_websocket(self, data):
"""
Expand Down Expand Up @@ -150,9 +156,9 @@ def websocket_safe_read(self):
raise
return data.rstrip()

def attach_user(self, name, channel_id, real_name, tz):
def attach_user(self, name, channel_id, real_name, tz, email):
if self.users.find(channel_id) is None:
self.users.append(User(self, name, channel_id, real_name, tz))
self.users.append(User(self, name, channel_id, real_name, tz, email))

def attach_channel(self, name, channel_id, members=None):
if members is None:
Expand Down
3 changes: 2 additions & 1 deletion slackclient/_user.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
class User(object):
def __init__(self, server, name, user_id, real_name, tz):
def __init__(self, server, name, user_id, real_name, tz, email):
self.tz = tz
self.name = name
self.real_name = real_name
self.server = server
self.id = user_id
self.email = email

def __eq__(self, compare_str):
if compare_str in (self.id, self.name):
Expand Down
8 changes: 7 additions & 1 deletion tests/test_server.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,13 @@ 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"])
assert type(server.users.find('fakeuser')) == User
fakeuser = server.users.find('fakeuser')
assert type(fakeuser) == User
assert fakeuser.email == 'fakeuser@example.com'
assert fakeuser.id == 'U10CX1234'
assert fakeuser.name == 'fakeuser'
assert fakeuser.real_name == ''
assert fakeuser.tz == 'America/Los_Angeles'


def test_Server_cantconnect(server):
Expand Down