hnarjis
/
matrix-appservice-kakaotalk
forked from fair/matrix-appservice-kakaotalk
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Awaitable and mark_read for account/friend management commands

This commit is contained in:
Andrew Ferrazzutti 2022-05-06 02:49:49 -04:00
parent c3b299d26c
commit dcf17fd40a
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
matrix_appservice_kakaotalk/commands/kakaotalk.py
View File

@ -167,9 +167,9 @@ async def _get_search_result_puppet(source: u.User, friend_struct: FriendStruct)
help_text="List all KakaoTalk friends", help_text="List all KakaoTalk friends",
) )
async def list_friends(evt: CommandEvent) -> None: async def list_friends(evt: CommandEvent) -> None:
await evt.mark_read()
try: try:
resp = await evt.sender.client.list_friends() resp = await evt.sender.client.list_friends()
await evt.mark_read()
except CommandException as e: except CommandException as e:
await evt.reply(f"Error while listing friends: {e!s}") await evt.reply(f"Error while listing friends: {e!s}")
return return
@ -220,8 +220,8 @@ async def _get_id_from_mxid(mxid: UserID) -> Long | None:
help_text="Add a KakaoTalk user to your KakaoTalk friends list", help_text="Add a KakaoTalk user to your KakaoTalk friends list",
help_args="<_KakaoTalk ID_|_Matrix user ID_>", help_args="<_KakaoTalk ID_|_Matrix user ID_>",
) )
async def add_friend(evt: CommandEvent) -> None: def add_friend(evt: CommandEvent) -> Awaitable[None]:
await _edit_friend(evt, True) return _edit_friend(evt, True)
@command_handler( @command_handler(
needs_auth=True, needs_auth=True,
@ -230,8 +230,8 @@ async def add_friend(evt: CommandEvent) -> None:
help_text="Remove a KakaoTalk user from your KakaoTalk friends list", help_text="Remove a KakaoTalk user from your KakaoTalk friends list",
help_args="<_KakaoTalk ID_|_Matrix user ID_>", help_args="<_KakaoTalk ID_|_Matrix user ID_>",
) )
async def remove_friend(evt: CommandEvent) -> None: def remove_friend(evt: CommandEvent) -> Awaitable[None]:
await _edit_friend(evt, False) return _edit_friend(evt, False)
async def _edit_friend(evt: CommandEvent, add: bool) -> None: async def _edit_friend(evt: CommandEvent, add: bool) -> None:
if not evt.args: if not evt.args:
@ -266,6 +266,7 @@ async def _edit_friend(evt: CommandEvent, add: bool) -> None:
await _edit_friend_by_uuid(evt, arg, add) await _edit_friend_by_uuid(evt, arg, add)
async def _edit_friend_by_ktid(evt: CommandEvent, ktid: Long, add: bool) -> None: async def _edit_friend_by_ktid(evt: CommandEvent, ktid: Long, add: bool) -> None:
await evt.mark_read()
try: try:
friend_struct = await evt.sender.client.edit_friend(ktid, add) friend_struct = await evt.sender.client.edit_friend(ktid, add)
except RPCError as e: except RPCError as e:
@ -274,6 +275,7 @@ async def _edit_friend_by_ktid(evt: CommandEvent, ktid: Long, add: bool) -> None
await _on_friend_edited(evt, friend_struct, add) await _on_friend_edited(evt, friend_struct, add)
async def _edit_friend_by_uuid(evt: CommandEvent, uuid: str, add: bool) -> None: async def _edit_friend_by_uuid(evt: CommandEvent, uuid: str, add: bool) -> None:
await evt.mark_read()
try: try:
friend_struct = await evt.sender.client.edit_friend_by_uuid(uuid, add) friend_struct = await evt.sender.client.edit_friend_by_uuid(uuid, add)
except RPCError as e: except RPCError as e: