Send multiphoto messages in order

matrix_appservice_kakaotalk/portal.py

@@ -1050,7 +1050,7 @@ class Portal(DBPortal, BasePortal):
             source, intent, attachment, timestamp, message_text
         ))
 
-    def _handle_remote_multiphoto(
+    async def _handle_remote_multiphoto(
         self,
         source: u.User,
         intent: IntentAPI,
@@ -1059,30 +1059,28 @@ class Portal(DBPortal, BasePortal):
         message_text: str | None,
     ) -> Awaitable[list[EventID]]:
         # 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,
+                    mentions=attachment.mentions,
-                        mentions=attachment.mentions,
+                    urls=attachment.urls,
-                        urls=attachment.urls,
+                    url=attachment.imageUrls[i],
-                        url=attachment.imageUrls[i],
+                    s=attachment.sl[i],
-                        s=attachment.sl[i],
+                    k=attachment.kl[i],
-                        k=attachment.kl[i],
+                    w=attachment.wl[i],
-                        w=attachment.wl[i],
+                    h=attachment.hl[i],
-                        h=attachment.hl[i],
+                    thumbnailUrl=attachment.thumbnailUrls[i],
-                        thumbnailUrl=attachment.thumbnailUrls[i],
+                    thumbnailWidth=attachment.thumbnailWidths[i],
-                        thumbnailWidth=attachment.thumbnailWidths[i],
+                    thumbnailHeight=attachment.thumbnailHeights[i],
-                        thumbnailHeight=attachment.thumbnailHeights[i],
+                    cs=attachment.csl[i],
-                        cs=attachment.csl[i],
+                    mt=attachment.mtl[i],
-                        mt=attachment.mtl[i],
+                ),
-                    ),
+                timestamp, message_text,
-                    timestamp, message_text,
+            )
-                )
+            for i in range(len(attachment.imageUrls))
-                for i in range(len(attachment.imageUrls))
+        ]
-            ]
-        )
 
     def _handle_remote_uniphoto(
         self,

matrix_appservice_kakaotalk/puppet.py

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