squeegily/pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Apply suggestion to lib/pleroma/web/activity_pub/utils.ex

Browse Source
This commit is contained in:
Maksim 2019-09-04 17:31:14 +00:00
parent a890451187
commit 8306078de1
1 changed files with 13 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -356,26 +356,19 @@ defmodule Pleroma.Web.ActivityPub.Utils do
%Activity{data: %{"actor" => actor, "object" => object}} = activity, %Activity{data: %{"actor" => actor, "object" => object}} = activity,
state state
) do ) do
query = "Follow"
from(activity in Activity, |> Activity.Queries.by_type()
where: fragment("data->>'type' = 'Follow'"), |> Activity.Queries.by_actor(actor)
where: fragment("data->>'state' = 'pending'"), |> Activity.Queries.by_object_id(object["id"])
where: fragment("data->>'actor' = ?", ^actor), |> where(fragment("data->>'state' = 'pending'"))
where: fragment("data->>'object' = ?", ^object), |> update(set: [data: fragment("jsonb_set(data, '{state}', ?)", ^state)])
update: [ |> Repo.update_all([])
set: [
data: fragment("jsonb_set(data, '{state}', ?)", ^state) User.set_follow_state_cache(actor, object, state)
]
] activity = Activity.get_by_id(activity.id)
)
{:ok, activity}
with {_, _} <- Repo.update_all(query, []),
{_, _} <- User.set_follow_state_cache(actor, object, state),
%Activity{} = activity <- Activity.get_by_id(activity.id) do
{:ok, activity}
else
e -> {:error, e}
end
end end
def update_follow_state( def update_follow_state(