vbatts/microblog.pub
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Admin improvements and design tweaks

Browse source
This commit is contained in:
Thomas Sileo 2022-07-03 22:01:47 +02:00
parent 1acefc679d
commit 45dc57b538
8 changed files with 139 additions and 118 deletions
Download patch file Download diff file Expand all files Collapse all files

23
app/admin.py
View file

@ -158,15 +158,23 @@ async def admin_bookmarks(
models.InboxObject.ap_type.in_(
["Note", "Article", "Video", "Announce"]
),
models.InboxObject.is_hidden_from_stream.is_(False),
models.InboxObject.undone_by_inbox_object_id.is_(None),
models.InboxObject.is_bookmarked.is_(True),
)
.options(
joinedload(models.InboxObject.relates_to_inbox_object),
joinedload(models.InboxObject.relates_to_outbox_object).options(
joinedload(
models.OutboxObject.outbox_object_attachments
).options(joinedload(models.OutboxObjectAttachment.upload)),
),
joinedload(models.InboxObject.actor),
)
.order_by(models.InboxObject.ap_published_at.desc())
.limit(20)
)
).all()
# TODO: joinedload + unique
)
.unique()
.all()
)
return await templates.render_template(
db_session,
@ -185,7 +193,7 @@ async def admin_inbox(
filter_by: str | None = None,
cursor: str | None = None,
) -> templates.TemplateResponse:
where = [models.InboxObject.ap_type.not_in(["Accept"])]
where = [models.InboxObject.ap_type.not_in(["Accept", "Delete"])]
if filter_by:
where.append(models.InboxObject.ap_type == filter_by)
if cursor:
@ -253,7 +261,10 @@ async def admin_outbox(
filter_by: str | None = None,
cursor: str | None = None,
) -> templates.TemplateResponse:
where = [models.OutboxObject.ap_type.not_in(["Accept"])]
where = [
models.OutboxObject.ap_type.not_in(["Accept", "Delete"]),
models.OutboxObject.is_deleted.is_(False),
]
if filter_by:
where.append(models.OutboxObject.ap_type == filter_by)
if cursor: