hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'from/upstream-develop/tusooa/assoc-object-id' into 'develop'

Browse source 
Add function to calculate associated object id

Closes #2307

See merge request pleroma/pleroma!3692
This commit is contained in:
Haelwenn 2022-09-03 02:50:40 +00:00
commit 299255b9bb
11 changed files with 315 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
lib/pleroma/activity/queries.ex
View file

@ -52,8 +52,7 @@ defmodule Pleroma.Activity.Queries do
activity in query,
where:
fragment(
"coalesce((?)->'object'->>'id', (?)->>'object') = ANY(?)",
activity.data,
"associated_object_id((?)) = ANY(?)",
activity.data,
^object_ids
)
@ -64,8 +63,7 @@ defmodule Pleroma.Activity.Queries do
from(activity in query,
where:
fragment(
"coalesce((?)->'object'->>'id', (?)->>'object') = ?",
activity.data,
"associated_object_id((?)) = ?",
activity.data,
^object_id
)