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

Compare commits

base: fair:d7b0b9013f30beab723dacbf75e1dd5fc8183eaa
Branches Tags
fair:master
fair:kt-version
fair:python38
fair:testing
...
compare: fair:15415a5eec256789e4031acf991d6af33f756f5e
Branches Tags
fair:master
fair:kt-version
fair:python38
fair:testing

2 Commits
d7b0b9013f ... 15415a5eec

Author SHA1 Message Date
Andrew Ferrazzutti
15415a5eec Send multiphoto messages in order 2022-03-29 03:25:38 -04:00
Andrew Ferrazzutti
d116ebefc7 Async function -> return awaitable 2022-03-29 03:25:06 -04:00
2 changed files with 29 additions and 31 deletions
Show Stats Expand all files Collapse all files

8
matrix_appservice_kakaotalk/portal.py
View File

@ -1050,7 +1050,7 @@ class Portal(DBPortal, BasePortal):
source, intent, attachment, timestamp, message_text source, intent, attachment, timestamp, message_text
)) ))
def _handle_remote_multiphoto( async def _handle_remote_multiphoto(
self, self,
source: u.User, source: u.User,
intent: IntentAPI, intent: IntentAPI,
@ -1059,9 +1059,8 @@ class Portal(DBPortal, BasePortal):
message_text: str | None, message_text: str | None,
) -> Awaitable[list[EventID]]: ) -> Awaitable[list[EventID]]:
# TODO Upload media concurrently, but post messages sequentially # TODO Upload media concurrently, but post messages sequentially
return asyncio.gather( return [
*[ await self._handle_remote_uniphoto(
self._handle_remote_uniphoto(
source, intent, source, intent,
PhotoAttachment( PhotoAttachment(
shout=attachment.shout, shout=attachment.shout,
@ -1082,7 +1081,6 @@ class Portal(DBPortal, BasePortal):
) )
for i in range(len(attachment.imageUrls)) for i in range(len(attachment.imageUrls))
] ]
)
def _handle_remote_uniphoto( def _handle_remote_uniphoto(
self, self,

12
matrix_appservice_kakaotalk/puppet.py
View File

@ -148,26 +148,26 @@ class Puppet(DBPuppet, BasePuppet):
# region User info updating # region User info updating
async def update_info_from_participant( def update_info_from_participant(
self, self,
source: u.User, source: u.User,
info: UserInfoUnion, info: UserInfoUnion,
update_avatar: bool = True, update_avatar: bool = True,
) -> Puppet: ) -> Awaitable[Puppet]:
await self._update_info( return self._update_info(
source, source,
info.nickname, info.nickname,
info.profileURL, info.profileURL,
update_avatar update_avatar
) )
async def update_info_from_friend( def update_info_from_friend(
self, self,
source: u.User, source: u.User,
info: FriendStruct, info: FriendStruct,
update_avatar: bool = True, update_avatar: bool = True,
) -> Puppet: ) -> Awaitable[Puppet]:
await self._update_info( return self._update_info(
source, source,
info.nickName, info.nickName,
info.profileImageUrl, info.profileImageUrl,