forks/microblog.pub
1
0
Fork 1
mirror of https://git.sr.ht/~tsileo/microblog.pub synced 2024-11-15 03:04:28 +00:00
Code Issues Projects Releases Packages Wiki Activity

Fix queries for index/outbox

Browse source
This commit is contained in:
Thomas Sileo 2019-09-01 21:49:36 +02:00
parent 5b1e776fa2
commit 151ced0b41
1 changed files with 25 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
app.py
View file

@ -109,9 +109,14 @@ else:
def inject_config(): def inject_config():
q = { q = {
**in_outbox(), **in_outbox(),
**by_type([ActivityType.CREATE, ActivityType.ANNOUNCE]), "$or": [
{
**by_type(ActivityType.CREATE),
**not_deleted(), **not_deleted(),
**by_visibility(ap.Visibility.PUBLIC), **by_visibility(ap.Visibility.PUBLIC),
},
{**by_type(ActivityType.ANNOUNCE), **not_undo()},
],
} }
notes_count = DB.activities.count(q) notes_count = DB.activities.count(q)
# FIXME(tsileo): rename to all_count, and remove poll answers from it # FIXME(tsileo): rename to all_count, and remove poll answers from it
@ -348,10 +353,15 @@ def index():
q = { q = {
**in_outbox(), **in_outbox(),
**by_type([ActivityType.CREATE, ActivityType.ANNOUNCE]), "$or": [
{
**by_type(ActivityType.CREATE),
**not_deleted(), **not_deleted(),
**by_visibility(ap.Visibility.PUBLIC), **by_visibility(ap.Visibility.PUBLIC),
"$or": [{"meta.pinned": False}, {"meta.pinned": {"$exists": False}}], "$or": [{"meta.pinned": False}, {"meta.pinned": {"$exists": False}}],
},
{**by_type(ActivityType.ANNOUNCE), **not_undo()},
],
} }
apinned = [] apinned = []
@ -478,9 +488,14 @@ def outbox():
# TODO(tsileo): returns the whole outbox if authenticated and look at OCAP support # TODO(tsileo): returns the whole outbox if authenticated and look at OCAP support
q = { q = {
**in_outbox(), **in_outbox(),
**by_type([ActivityType.CREATE, ActivityType.ANNOUNCE]), "$or": [
{
**by_type(ActivityType.CREATE),
**not_deleted(), **not_deleted(),
**by_visibility(ap.Visibility.PUBLIC), **by_visibility(ap.Visibility.PUBLIC),
},
{**by_type(ActivityType.ANNOUNCE), **not_undo()},
],
} }
return activitypubify( return activitypubify(
**activitypub.build_ordered_collection( **activitypub.build_ordered_collection(