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
6 changes: 3 additions & 3 deletions rocketchat_API/APISections/dm.py
Original file line number Diff line number Diff line change
Expand Up @@ -78,10 +78,10 @@ def dm_files(self, room_id=None, user_name=None, **kwargs):
return self.call_api_get("dm.files", username=user_name, kwargs=kwargs)
raise RocketMissingParamException(ROOM_ID_OR_USERNAME_REQUIRED)

def dm_counters(self, room_id, user_name=None):
def dm_counters(self, room_id, user_id=None):
"""Gets counters of direct messages."""
if user_name:
return self.call_api_get("dm.counters", roomId=room_id, username=user_name)
if user_id:
return self.call_api_get("dm.counters", roomId=room_id, userId=user_id)
return self.call_api_get("dm.counters", roomId=room_id)

def dm_delete(self, room_id, **kwargs):
Expand Down
4 changes: 1 addition & 3 deletions rocketchat_API/APISections/teams.py
Original file line number Diff line number Diff line change
Expand Up @@ -173,7 +173,7 @@ def teams_autocomplete(self, name, **kwargs):

@paginated("rooms")
def teams_list_rooms_of_user(
self, team_id=None, team_name=None, user_id=None, can_add=False, **kwargs
self, team_id=None, team_name=None, user_id=None, **kwargs
):
"""
Lists only the team's rooms that a particular user has joined.
Expand All @@ -184,15 +184,13 @@ def teams_list_rooms_of_user(
"teams.listRoomsOfUser",
teamId=team_id,
userId=user_id,
canAdd=can_add,
kwargs=kwargs,
)
if team_name:
return self.call_api_get(
"teams.listRoomsOfUser",
teamName=team_name,
userId=user_id,
canAdd=can_add,
kwargs=kwargs,
)
raise RocketMissingParamException(TEAM_ID_OR_TEAM_NAME_REQUIRED)
2 changes: 1 addition & 1 deletion rocketchat_API/APISections/users.py
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ def users_set_active_status(self, user_id, active_status, **kwargs):

def users_forgot_password(self, email, **kwargs):
"""Send email to reset your password."""
return self.call_api_post("users.forgotPassword", email=email, data=kwargs)
return self.call_api_post("users.forgotPassword", email=email, kwargs=kwargs)

def users_get_preferences(self, **kwargs):
"""Gets all preferences of user."""
Expand Down
2 changes: 1 addition & 1 deletion tests/test_dms.py
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ def test_dm_counters(logged_rocket, recipient_user):

dm_counters = logged_rocket.dm_counters(
room_id=dm_create.get("room").get("_id"),
user_name=logged_rocket.me().get("_id"),
user_id=logged_rocket.me().get("_id"),
)
assert all(
key in dm_counters
Expand Down
Loading