moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bugfix/follow-query-overhead' into 'develop' 

activitypub utils: optimize block and follow activity lookup

See merge request pleroma/pleroma!171
This commit is contained in:
lambda 2018-05-25 07:13:05 +00:00
parent f3a71f2986 5f06a1a3c5
commit caae83e6d5
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
lib/pleroma/web/activity_pub/utils.ex
View File

@ -240,11 +240,16 @@ def fetch_latest_follow(%User{ap_id: follower_id}, %User{ap_id: followed_id}) do
activity in Activity, activity in Activity,
where: where:
fragment( fragment(
"? @> ?", "? ->> 'type' = 'Follow'",
activity.data, activity.data
^%{type: "Follow", object: followed_id}
), ),
where: activity.actor == ^follower_id, where: activity.actor == ^follower_id,
where:
fragment(
"? @> ?",
activity.data,
^%{object: followed_id}
),
order_by: [desc: :id], order_by: [desc: :id],
limit: 1 limit: 1
) )
@ -365,11 +370,16 @@ def fetch_latest_block(%User{ap_id: blocker_id}, %User{ap_id: blocked_id}) do
activity in Activity, activity in Activity,
where: where:
fragment( fragment(
"? @> ?", "? ->> 'type' = 'Block'",
activity.data, activity.data
^%{type: "Block", object: blocked_id}
), ),
where: activity.actor == ^blocker_id, where: activity.actor == ^blocker_id,
where:
fragment(
"? @> ?",
activity.data,
^%{object: blocked_id}
),
order_by: [desc: :id], order_by: [desc: :id],
limit: 1 limit: 1
) )

2
test/web/common_api/common_api_test.exs
View File

@ -1,4 +1,4 @@
defmodule Pleroma.Web.CommonAPI.UtilsTest do defmodule Pleroma.Web.CommonAPI.Test do
use Pleroma.DataCase use Pleroma.DataCase
alias Pleroma.Web.CommonAPI alias Pleroma.Web.CommonAPI