1 files changed, 41 insertions, 8 deletions
diff --git a/slack/slack_api.py b/slack/slack_api.py
index 3761930..8408488 100644
--- a/slack/slack_api.py
+++ b/slack/slack_api.py
@@ -1,13 +1,17 @@
 from __future__ import annotations
 
 import json
-from typing import TYPE_CHECKING, Dict, Union
+from typing import TYPE_CHECKING, Any, Dict, Union
 from urllib.parse import urlencode
 
 from slack.http import http_request
 from slack.shared import shared
 
 if TYPE_CHECKING:
+    from slack_api import SlackConversationInfoResponse
+
+    from slack.slack_conversation import SlackConversation
+    from slack.slack_user import SlackUser
     from slack.slack_workspace import SlackWorkspace
 
 
@@ -15,34 +19,63 @@ class SlackApi:
     def __init__(self, workspace: SlackWorkspace):
         self.workspace = workspace
 
-    def get_request_options(self):
+    def _get_request_options(self):
         return {
             "useragent": f"wee_slack {shared.SCRIPT_VERSION}",
             "httpheader": f"Authorization: Bearer {self.workspace.config.api_token.value}",
             "cookie": self.workspace.config.api_cookies.value,
         }
 
-    async def fetch(self, method: str, params: Dict[str, Union[str, int]] = {}):
+    async def _fetch(self, method: str, params: Dict[str, Union[str, int]] = {}):
         url = f"https://api.slack.com/api/{method}?{urlencode(params)}"
         response = await http_request(
             url,
-            self.get_request_options(),
+            self._get_request_options(),
             self.workspace.config.slack_timeout.value * 1000,
         )
         return json.loads(response)
 
-    async def fetch_list(
+    async def _fetch_list(
         self,
         method: str,
         list_key: str,
         params: Dict[str, Union[str, int]] = {},
-        pages: int = 1,  # negative or 0 means all pages
+        pages: int = -1,  # negative or 0 means all pages
     ):
-        response = await self.fetch(method, params)
+        response = await self._fetch(method, params)
         next_cursor = response.get("response_metadata", {}).get("next_cursor")
         if pages != 1 and next_cursor and response["ok"]:
             params["cursor"] = next_cursor
-            next_pages = await self.fetch_list(method, list_key, params, pages - 1)
+            next_pages = await self._fetch_list(method, list_key, params, pages - 1)
             response[list_key].extend(next_pages[list_key])
             return response
         return response
+
+    async def fetch_conversations_history(self, conversation: SlackConversation) -> Any:
+        return await self._fetch("conversations.history", {"channel": conversation.id})
+
+    async def fetch_conversations_info(
+        self, conversation: SlackConversation
+    ) -> SlackConversationInfoResponse:
+        return await self._fetch("conversations.info", {"channel": conversation.id})
+
+    async def fetch_users_conversations(
+        self,
+        types: str,
+        exclude_archived: bool = True,
+        limit: int = 1000,
+        pages: int = -1,
+    ) -> Any:
+        return await self._fetch_list(
+            "users.conversations",
+            "channels",
+            {
+                "types": types,
+                "exclude_archived": exclude_archived,
+                "limit": limit,
+            },
+            pages,
+        )
+
+    async def fetch_users_info(self, user: SlackUser) -> Any:
+        return await self._fetch("users.info", {"user": user.id})