From 8c71f7e11a377d92234c141ea50170485e773fdc Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Tue, 4 Feb 2020 20:35:32 +0400 Subject: Add support for cancellation of a follow request --- lib/pleroma/user.ex | 25 +++++++++++++++---------- lib/pleroma/web/activity_pub/utils.ex | 9 +++++++++ 2 files changed, 24 insertions(+), 10 deletions(-) (limited to 'lib') diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 3c86cdb38..398c91cf3 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -647,20 +647,25 @@ defmodule Pleroma.User do end end + def unfollow(%User{ap_id: ap_id}, %User{ap_id: ap_id}) do + {:error, "Not subscribed!"} + end + def unfollow(%User{} = follower, %User{} = followed) do - if following?(follower, followed) and follower.ap_id != followed.ap_id do - FollowingRelationship.unfollow(follower, followed) + case FollowingRelationship.get(follower, followed) do + %{state: state} when state in ["accept", "pending"] -> + FollowingRelationship.unfollow(follower, followed) + {:ok, followed} = update_follower_count(followed) - {:ok, followed} = update_follower_count(followed) + {:ok, follower} = + follower + |> update_following_count() + |> set_cache() - {:ok, follower} = - follower - |> update_following_count() - |> set_cache() + {:ok, follower, Utils.fetch_latest_follow(follower, followed)} - {:ok, follower, Utils.fetch_latest_follow(follower, followed)} - else - {:error, "Not subscribed!"} + nil -> + {:error, "Not subscribed!"} end end diff --git a/lib/pleroma/web/activity_pub/utils.ex b/lib/pleroma/web/activity_pub/utils.ex index 4f7fdaf38..5bca3868b 100644 --- a/lib/pleroma/web/activity_pub/utils.ex +++ b/lib/pleroma/web/activity_pub/utils.ex @@ -490,6 +490,15 @@ defmodule Pleroma.Web.ActivityPub.Utils do |> Repo.one() end + def fetch_latest_undo(%User{ap_id: ap_id}) do + "Undo" + |> Activity.Queries.by_type() + |> where(actor: ^ap_id) + |> order_by([activity], fragment("? desc nulls last", activity.id)) + |> limit(1) + |> Repo.one() + end + def get_latest_reaction(internal_activity_id, %{ap_id: ap_id}, emoji) do %{data: %{"object" => object_ap_id}} = Activity.get_by_id(internal_activity_id) -- cgit v1.2.3 From 8b9742ecf546c37695229d54f0a0b3ed4edd66e1 Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Thu, 6 Feb 2020 16:47:15 +0400 Subject: Cancellation of a follow request for a remote user --- lib/pleroma/following_relationship.ex | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) (limited to 'lib') diff --git a/lib/pleroma/following_relationship.ex b/lib/pleroma/following_relationship.ex index 0b0219b82..cc381af53 100644 --- a/lib/pleroma/following_relationship.ex +++ b/lib/pleroma/following_relationship.ex @@ -30,9 +30,24 @@ defmodule Pleroma.FollowingRelationship do end def get(%User{} = follower, %User{} = following) do - __MODULE__ - |> where(follower_id: ^follower.id, following_id: ^following.id) - |> Repo.one() + following_relationship = + __MODULE__ + |> where(follower_id: ^follower.id, following_id: ^following.id) + |> Repo.one() + + case {following_relationship, following.local} do + {nil, false} -> + case Pleroma.Web.ActivityPub.Utils.fetch_latest_follow(follower, following) do + %{data: %{"state" => state}} when state in ["pending", "accept"] -> + %{state: state} + + _ -> + nil + end + + {following_relationship, _} -> + following_relationship + end end def update(follower, following, "reject"), do: unfollow(follower, following) @@ -58,8 +73,8 @@ defmodule Pleroma.FollowingRelationship do def unfollow(%User{} = follower, %User{} = following) do case get(follower, following) do - nil -> {:ok, nil} %__MODULE__{} = following_relationship -> Repo.delete(following_relationship) + _ -> {:ok, nil} end end -- cgit v1.2.3 From bc2e98b20099be767a8262b734c6702edea663b4 Mon Sep 17 00:00:00 2001 From: Egor Kislitsyn Date: Fri, 7 Feb 2020 16:17:34 +0400 Subject: Add User.get_follow_state/2 --- lib/pleroma/following_relationship.ex | 21 +++------------------ lib/pleroma/user.ex | 22 ++++++++++++++++++++-- 2 files changed, 23 insertions(+), 20 deletions(-) (limited to 'lib') diff --git a/lib/pleroma/following_relationship.ex b/lib/pleroma/following_relationship.ex index cc381af53..b8cb3bf03 100644 --- a/lib/pleroma/following_relationship.ex +++ b/lib/pleroma/following_relationship.ex @@ -30,24 +30,9 @@ defmodule Pleroma.FollowingRelationship do end def get(%User{} = follower, %User{} = following) do - following_relationship = - __MODULE__ - |> where(follower_id: ^follower.id, following_id: ^following.id) - |> Repo.one() - - case {following_relationship, following.local} do - {nil, false} -> - case Pleroma.Web.ActivityPub.Utils.fetch_latest_follow(follower, following) do - %{data: %{"state" => state}} when state in ["pending", "accept"] -> - %{state: state} - - _ -> - nil - end - - {following_relationship, _} -> - following_relationship - end + __MODULE__ + |> where(follower_id: ^follower.id, following_id: ^following.id) + |> Repo.one() end def update(follower, following, "reject"), do: unfollow(follower, following) diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex index 398c91cf3..5ea36fea3 100644 --- a/lib/pleroma/user.ex +++ b/lib/pleroma/user.ex @@ -652,8 +652,8 @@ defmodule Pleroma.User do end def unfollow(%User{} = follower, %User{} = followed) do - case FollowingRelationship.get(follower, followed) do - %{state: state} when state in ["accept", "pending"] -> + case get_follow_state(follower, followed) do + state when state in ["accept", "pending"] -> FollowingRelationship.unfollow(follower, followed) {:ok, followed} = update_follower_count(followed) @@ -671,6 +671,24 @@ defmodule Pleroma.User do defdelegate following?(follower, followed), to: FollowingRelationship + def get_follow_state(%User{} = follower, %User{} = following) do + following_relationship = FollowingRelationship.get(follower, following) + + case {following_relationship, following.local} do + {nil, false} -> + case Utils.fetch_latest_follow(follower, following) do + %{data: %{"state" => state}} when state in ["pending", "accept"] -> state + _ -> nil + end + + {%{state: state}, _} -> + state + + {nil, _} -> + nil + end + end + def locked?(%User{} = user) do user.locked || false end -- cgit v1.2.3