zaklaus
/
microblog
1
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix admin outbox query

main
Thomas Sileo 2022-07-07 08:55:53 +02:00
parent d058c1ba26
commit 952b28ece7
1 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
app/boxes.py
View File

@ -454,24 +454,28 @@ async def get_outbox_object_by_ap_id(
db_session: AsyncSession, ap_id: str db_session: AsyncSession, ap_id: str
) -> models.OutboxObject | None: ) -> models.OutboxObject | None:
return ( return (
await db_session.execute( (
select(models.OutboxObject) await db_session.execute(
.where(models.OutboxObject.ap_id == ap_id) select(models.OutboxObject)
.options( .where(models.OutboxObject.ap_id == ap_id)
joinedload(models.OutboxObject.outbox_object_attachments).options( .options(
joinedload(models.OutboxObjectAttachment.upload)
),
joinedload(models.OutboxObject.relates_to_inbox_object).options(
joinedload(models.InboxObject.actor),
),
joinedload(models.OutboxObject.relates_to_outbox_object).options(
joinedload(models.OutboxObject.outbox_object_attachments).options( joinedload(models.OutboxObject.outbox_object_attachments).options(
joinedload(models.OutboxObjectAttachment.upload) joinedload(models.OutboxObjectAttachment.upload)
), ),
), joinedload(models.OutboxObject.relates_to_inbox_object).options(
joinedload(models.InboxObject.actor),
),
joinedload(models.OutboxObject.relates_to_outbox_object).options(
joinedload(
models.OutboxObject.outbox_object_attachments
).options(joinedload(models.OutboxObjectAttachment.upload)),
),
)
) )
) )
).scalar_one_or_none() # type: ignore .unique()
.scalar_one_or_none()
) # type: ignore
async def get_anybox_object_by_ap_id( async def get_anybox_object_by_ap_id(