diff options
Diffstat (limited to 'slack')
| -rw-r--r-- | slack/error.py | 12 | ||||
| -rw-r--r-- | slack/slack_api.py | 21 | ||||
| -rw-r--r-- | slack/slack_user.py | 3 |
3 files changed, 23 insertions, 13 deletions
diff --git a/slack/error.py b/slack/error.py index 917eddf..d190978 100644 --- a/slack/error.py +++ b/slack/error.py @@ -2,7 +2,7 @@ from __future__ import annotations from dataclasses import dataclass, field from datetime import datetime -from typing import TYPE_CHECKING, Dict, Mapping, Optional, Sequence, Union +from typing import TYPE_CHECKING, Dict, Optional from uuid import uuid4 from slack.python_compatibility import format_exception_only @@ -40,16 +40,14 @@ class SlackApiError(Exception): workspace: SlackWorkspace, method: str, response: SlackErrorResponse, - params: Mapping[ - str, Union[str, int, bool, Sequence[str], Sequence[int], Sequence[bool]] - ] = {}, + request: object = None, ): super().__init__( - f"{self.__class__.__name__}: workspace={workspace}, method='{method}', params={params}, response={response}" + f"{self.__class__.__name__}: workspace={workspace}, method='{method}', request={request}, response={response}" ) self.workspace = workspace self.method = method - self.params = params + self.request = request self.response = response @@ -112,7 +110,7 @@ def store_and_format_uncaught_error(uncaught_error: UncaughtError) -> str: ) elif isinstance(e, SlackApiError): return ( - f"Error from Slack API method {e.method} with params {e.params} for workspace " + f"Error from Slack API method {e.method} with request {e.request} for workspace " f"{e.workspace.name}: {e.response} ({stack_msg})" ) elif isinstance(e, SlackRtmError): diff --git a/slack/slack_api.py b/slack/slack_api.py index 83e8962..c54268f 100644 --- a/slack/slack_api.py +++ b/slack/slack_api.py @@ -29,13 +29,12 @@ if TYPE_CHECKING: from slack_api.slack_conversations_members import SlackConversationsMembersResponse from slack_api.slack_conversations_replies import SlackConversationsRepliesResponse from slack_api.slack_emoji import SlackEmojiListResponse + from slack_api.slack_profile import SlackSetProfile, SlackUsersProfileSetResponse from slack_api.slack_rtm_connect import SlackRtmConnectResponse from slack_api.slack_team_info import SlackTeamInfoResponse from slack_api.slack_usergroups_info import SlackUsergroupsInfoResponse from slack_api.slack_users_conversations import SlackUsersConversationsResponse from slack_api.slack_users_info import ( - SlackProfile, - SlackSetProfile, SlackUserInfoResponse, SlackUsersInfoResponse, ) @@ -142,6 +141,18 @@ class SlackApi(SlackApiCommon): return response return response + async def _post(self, method: str, body: Mapping[str, object]): + url = f"https://api.slack.com/api/{method}" + options = self._get_request_options() + options["httpheader"] += "\nContent-Type: application/json" + options["postfields"] = json.dumps(body) + response = await http_request( + url, + options, + self.workspace.config.network_timeout.value * 1000, + ) + return json.loads(response) + async def fetch_team_info(self): method = "team.info" response: SlackTeamInfoResponse = await self._fetch(method) @@ -256,10 +267,10 @@ class SlackApi(SlackApiCommon): async def _set_user_profile(self, profile: SlackSetProfile): method = "users.profile.set" - params: Params = {"profile": dict(profile)} - response: SlackProfile = await self._fetch(method, params) + body = {"profile": profile} + response: SlackUsersProfileSetResponse = await self._post(method, body) if response["ok"] is False: - raise SlackApiError(self.workspace, method, response, params) + raise SlackApiError(self.workspace, method, response, body) return response async def set_user_status(self, status: str): diff --git a/slack/slack_user.py b/slack/slack_user.py index 07a87d2..96696fa 100644 --- a/slack/slack_user.py +++ b/slack/slack_user.py @@ -13,8 +13,9 @@ from slack.util import with_color if TYPE_CHECKING: from slack_api.slack_bots_info import SlackBotInfo from slack_api.slack_conversations_history import SlackMessageUserProfile + from slack_api.slack_profile import SlackProfile from slack_api.slack_usergroups_info import SlackUsergroupInfo - from slack_api.slack_users_info import SlackProfile, SlackUserInfo + from slack_api.slack_users_info import SlackUserInfo from typing_extensions import Literal from slack.slack_workspace import SlackWorkspace |