Send multiphoto messages in order
This commit is contained in:
parent
d116ebefc7
commit
15415a5eec
|
@ -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(
|
||||
*[
|
||||
self._handle_remote_uniphoto(
|
||||
source, intent,
|
||||
PhotoAttachment(
|
||||
shout=attachment.shout,
|
||||
mentions=attachment.mentions,
|
||||
urls=attachment.urls,
|
||||
url=attachment.imageUrls[i],
|
||||
s=attachment.sl[i],
|
||||
k=attachment.kl[i],
|
||||
w=attachment.wl[i],
|
||||
h=attachment.hl[i],
|
||||
thumbnailUrl=attachment.thumbnailUrls[i],
|
||||
thumbnailWidth=attachment.thumbnailWidths[i],
|
||||
thumbnailHeight=attachment.thumbnailHeights[i],
|
||||
cs=attachment.csl[i],
|
||||
mt=attachment.mtl[i],
|
||||
),
|
||||
timestamp, message_text,
|
||||
)
|
||||
for i in range(len(attachment.imageUrls))
|
||||
]
|
||||
)
|
||||
return [
|
||||
await self._handle_remote_uniphoto(
|
||||
source, intent,
|
||||
PhotoAttachment(
|
||||
shout=attachment.shout,
|
||||
mentions=attachment.mentions,
|
||||
urls=attachment.urls,
|
||||
url=attachment.imageUrls[i],
|
||||
s=attachment.sl[i],
|
||||
k=attachment.kl[i],
|
||||
w=attachment.wl[i],
|
||||
h=attachment.hl[i],
|
||||
thumbnailUrl=attachment.thumbnailUrls[i],
|
||||
thumbnailWidth=attachment.thumbnailWidths[i],
|
||||
thumbnailHeight=attachment.thumbnailHeights[i],
|
||||
cs=attachment.csl[i],
|
||||
mt=attachment.mtl[i],
|
||||
),
|
||||
timestamp, message_text,
|
||||
)
|
||||
for i in range(len(attachment.imageUrls))
|
||||
]
|
||||
|
||||
def _handle_remote_uniphoto(
|
||||
self,
|
||||
|
|
Loading…
Reference in New Issue