jonny/microblog.pub
1
0
Fork 0
forked from forks/microblog.pub
Code Pull requests Activity

Fix DMs section

Browse source
This commit is contained in:
Thomas Sileo 2022-08-13 15:53:07 +02:00
parent ce80e98d33
commit 1f36348021
1 changed files with 24 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
app/admin.py
View file

@ -496,6 +496,7 @@ async def admin_direct_messages(
) )
) )
last_from_inbox = ( last_from_inbox = (
(
( (
await db_session.scalars( await db_session.scalars(
select(models.InboxObject) select(models.InboxObject)
@ -508,21 +509,28 @@ async def admin_direct_messages(
.unique() .unique()
.all() .all()
) )
if convos_with_last_from_inbox
else []
)
last_from_outbox = ( last_from_outbox = (
(
( (
await db_session.scalars( await db_session.scalars(
select(models.OutboxObject) select(models.OutboxObject)
.where(or_(*convos_with_last_from_outbox)) .where(or_(*convos_with_last_from_outbox))
.options( .options(
joinedload(models.OutboxObject.outbox_object_attachments).options( joinedload(
joinedload(models.OutboxObjectAttachment.upload) models.OutboxObject.outbox_object_attachments
), ).options(joinedload(models.OutboxObjectAttachment.upload)),
) )
) )
) )
.unique() .unique()
.all() .all()
) )
if convos_with_last_from_outbox
else []
)
# Build the template response # Build the template response
threads = [] threads = []