Skip to content

Commit 06da88b

Browse files
committed
chore: update deprecated APIS
1 parent 23fda18 commit 06da88b

File tree

4 files changed

+27
-31
lines changed

4 files changed

+27
-31
lines changed

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717
setup(
1818
name="swibots",
19-
version="1.4.56",
19+
version="1.4.57",
2020
packages=find_packages(exclude=["samples", "bots_impl", "docs"]),
2121
long_description=long_description,
2222
long_description_content_type="text/markdown",

swibots/api/chat/controllers/message_controller.py

Lines changed: 18 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,9 @@ async def new_message(
6060
app=self.client.app,
6161
)
6262

63-
async def get_messages(self, user_id: int = None) -> List[Message]:
63+
async def get_messages(
64+
self, user_id: int = None, limit: int = 100, offset: int = 0
65+
) -> List[Message]:
6466
"""Get messages for a user
6567
6668
Parameters:
@@ -74,8 +76,11 @@ async def get_messages(self, user_id: int = None) -> List[Message]:
7476
"""
7577
if user_id is None:
7678
user_id = self.client.user.id
79+
data = {"limit": limit, "offset": offset}
7780
log.debug("Getting messages for user %s", user_id)
78-
response = await self.client.get(f"{BASE_PATH}/{user_id}")
81+
response = await self.client.get(
82+
f"{BASE_PATH}/personal/{user_id}?{urlencode(data)}"
83+
)
7984
return self.client.build_list(Message, response.data)
8085

8186
async def send_message(
@@ -341,9 +346,7 @@ async def delete_messages(self, message_ids: List[Union[int, Message]]) -> bool:
341346
log.debug(response)
342347
return True
343348

344-
async def delete_messages_from_user(
345-
self, recipient_id: int, user_id: int = None
346-
) -> bool:
349+
async def delete_messages_from_user(self, receiver_id: int) -> bool:
347350
"""Delete messages from a user
348351
349352
Parameters:
@@ -357,11 +360,10 @@ async def delete_messages_from_user(
357360
``~switch.error.SwitchError``: If the messages could not be deleted
358361
359362
"""
360-
log.debug("Deleting messages for user %s", recipient_id)
361-
if user_id is None:
362-
user_id = self.client.user.id
363-
364-
response = await self.client.delete(f"{BASE_PATH}/{user_id}/{recipient_id}")
363+
log.debug("Deleting messages for user %s", receiver_id)
364+
response = await self.client.delete(
365+
f"{BASE_PATH}/clear-personal-messages?receiverId={receiver_id}"
366+
)
365367
return True
366368

367369
async def get_messages_between_users(
@@ -487,15 +489,12 @@ async def get_group_chat_history(
487489
log.debug("Getting group chat history for group %s", group_id)
488490
data = {
489491
"communityId": community_id,
490-
"pageOffset": page_offset,
491-
"pageLimit": page_limit,
492-
"isChannel": "false",
492+
"offset": page_offset,
493+
"limit": page_limit,
494+
"groupId": group_id,
493495
}
494-
if user_id is None:
495-
user_id = self.client.user.id
496-
497496
response = await self.client.get(
498-
f"{BASE_PATH}/group/{user_id}/{group_id}?{urlencode(data)}"
497+
f"{BASE_PATH}/community-messages?{urlencode(data)}"
499498
)
500499
return self.client.build_object(GroupChatHistory, response.data)
501500

@@ -528,14 +527,11 @@ async def get_channel_chat_history(
528527
"communityId": community_id,
529528
"pageOffset": page_offset,
530529
"pageLimit": page_limit,
531-
"isChannel": "true",
530+
"channelId": channel_id,
532531
}
533532

534-
if user_id is None:
535-
user_id = self.client.user.id
536-
537533
response = await self.client.get(
538-
f"{BASE_PATH}/group/{user_id}/{channel_id}?{urlencode(data)}"
534+
f"{BASE_PATH}/community-messages?{urlencode(data)}"
539535
)
540536
return self.client.build_object(GroupChatHistory, response.data)
541537

swibots/api/chat/methods/get_messages.py

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,12 +5,14 @@
55

66
class GetMessages:
77
async def get_messages(
8-
self: "swibots.ApiClient", user_id: int = None
8+
self: "swibots.ApiClient", user_id: int, limit: int = 100, offset: int = 0
99
) -> List[Message]:
1010
"""Get messages
1111
1212
Parameters:
13-
user_id (``int``, *optional*): The user id. Defaults to the current user id.
13+
user_id (``int``, *optional*): The user id.
14+
limit (``int``, *optional*): The limit of messages to retrieve. Defaults to 100.
15+
offset (``int``, *optional*): The offset of messages to retrieve. Defaults to 0
1416
1517
Returns:
1618
``List[~switch.api.chat.models.Message]``: The messages
@@ -20,4 +22,6 @@ async def get_messages(
2022
2123
This function does the same as :meth:`~switch.api.chat.controllers.MessageController.get_messages`.
2224
"""
23-
return await self.chat_service.messages.get_messages(user_id)
25+
return await self.chat_service.messages.get_messages(
26+
user_id, limit=limit, offset=offset
27+
)

swibots/api/chat/models/group_chat_history.py

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,20 +10,16 @@ class GroupChatHistory(SwitchObject):
1010
def __init__(
1111
self,
1212
app: "swibots.App" = None,
13-
users: List[User] = None,
1413
messages: List[Message] = None,
1514
):
1615
super().__init__(app)
17-
self.users = users or []
1816
self.messages = messages or []
1917

2018
def from_json(self, data: dict) -> "GroupChatHistory":
21-
self.users = User.build_from_json_list(data.get("userInfo", []), self.app)
22-
self.messages = Message.build_from_json_list(data.get("message", []), self.app)
19+
self.messages = Message.build_from_json_list(data, self.app)
2320
return self
2421

2522
def to_json(self) -> dict:
2623
return {
27-
"userInfo": [user.to_json() for user in self.users],
2824
"message": [message.to_json() for message in self.messages],
2925
}

0 commit comments

Comments
 (0)