b1-66er/microblog.pub
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Tweak direct messages handling

Browse Source
This commit is contained in:
Thomas Sileo
2019-10-06 11:54:12 +02:00
parent 0e7d7a6625
commit 813ea37988
3 changed files with 26 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
core/shared.py
View File

@@ -140,7 +140,9 @@ def _get_ip():
return ip, geoip
def _build_thread(data, include_children=True): # noqa: C901
def _build_thread(data, include_children=True, query=None): # noqa: C901
if query is None:
query = {}
data["_requested"] = True
app.logger.info(f"_build_thread({data!r})")
root_id = data["meta"].get(
@@ -150,7 +152,12 @@ def _build_thread(data, include_children=True): # noqa: C901
replies = [data]
for dat in find_activities(
{**by_object_id(root_id), **not_deleted(), **by_type(ap.ActivityType.CREATE)}
{
**by_object_id(root_id),
**not_deleted(),
**by_type(ap.ActivityType.CREATE),
**query,
}
):
replies.append(dat)
@@ -159,12 +166,13 @@ def _build_thread(data, include_children=True): # noqa: C901
**flag(MetaKey.THREAD_ROOT_PARENT, root_id),
**not_deleted(),
**by_type(ap.ActivityType.CREATE),
**query,
}
):
replies.append(dat)
for dat in DB.replies.find(
{**flag(MetaKey.THREAD_ROOT_PARENT, root_id), **not_deleted()}
{**flag(MetaKey.THREAD_ROOT_PARENT, root_id), **not_deleted(), **query}
):
# Make a Note/Question/... looks like a Create
dat["meta"].update(