mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-23 08:36:29 +00:00
Code Issues Projects Releases Wiki Activity

ActivityPub: Remove ActivityPub.accept

Browse source 
Switch to the pipeline in CommonAPI and SideEffects
This commit is contained in:
lain 2020-08-11 17:43:16 +02:00
parent f988d82e46
commit 25bfee0d12
3 changed files with 5 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/web/activity_pub/activity_pub.ex
View file

@ -285,11 +285,6 @@ defmodule Pleroma.Web.ActivityPub.ActivityPub do
end end
end end
@spec accept(map()) :: {:ok, Activity.t()} | {:error, any()}
def accept(params) do
accept_or_reject("Accept", params)
end
@spec reject(map()) :: {:ok, Activity.t()} | {:error, any()} @spec reject(map()) :: {:ok, Activity.t()} | {:error, any()}
def reject(params) do def reject(params) do
accept_or_reject("Reject", params) accept_or_reject("Reject", params)

15
lib/pleroma/web/activity_pub/side_effects.ex
View file

@ -16,6 +16,7 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
alias Pleroma.Repo alias Pleroma.Repo
alias Pleroma.User alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub alias Pleroma.Web.ActivityPub.ActivityPub
alias Pleroma.Web.ActivityPub.Builder
alias Pleroma.Web.ActivityPub.Pipeline alias Pleroma.Web.ActivityPub.Pipeline
alias Pleroma.Web.ActivityPub.Utils alias Pleroma.Web.ActivityPub.Utils
alias Pleroma.Web.Push alias Pleroma.Web.Push
@ -72,18 +73,8 @@ defmodule Pleroma.Web.ActivityPub.SideEffects do
{_, {:ok, _}, _, _} <- {_, {:ok, _}, _, _} <-
{:following, User.follow(follower, followed, :follow_pending), follower, followed} do {:following, User.follow(follower, followed, :follow_pending), follower, followed} do
if followed.local && !followed.locked do if followed.local && !followed.locked do
Utils.update_follow_state_for_all(object, "accept") {:ok, accept_data, _} = Builder.accept(followed, object)
FollowingRelationship.update(follower, followed, :follow_accept) {:ok, _activity, _} = Pipeline.common_pipeline(accept_data, local: true)
User.update_follower_count(followed)
User.update_following_count(follower)
%{
to: [following_user],
actor: followed,
object: follow_id,
local: true
}
|> ActivityPub.accept()
end end
else else
{:following, {:error, _}, follower, followed} -> {:following, {:error, _}, follower, followed} ->

13
lib/pleroma/web/common_api/common_api.ex
View file

@ -122,17 +122,8 @@ defmodule Pleroma.Web.CommonAPI do
def accept_follow_request(follower, followed) do def accept_follow_request(follower, followed) do
with %Activity{} = follow_activity <- Utils.fetch_latest_follow(follower, followed), with %Activity{} = follow_activity <- Utils.fetch_latest_follow(follower, followed),
{:ok, follower} <- User.follow(follower, followed), {:ok, accept_data, _} <- Builder.accept(followed, follow_activity),
{:ok, follow_activity} <- Utils.update_follow_state_for_all(follow_activity, "accept"), {:ok, _activity, _} <- Pipeline.common_pipeline(accept_data, local: true) do
{:ok, _relationship} <- FollowingRelationship.update(follower, followed, :follow_accept),
{:ok, _activity} <-
ActivityPub.accept(%{
to: [follower.ap_id],
actor: followed,
object: follow_activity.data["id"],
type: "Accept"
}) do
Notification.update_notification_type(followed, follow_activity)
{:ok, follower} {:ok, follower}
end end
end end