Merge branch 'test/web_activity_pub_relay' into 'develop'
tests for Web/ActivityPub/Relay See merge request pleroma/pleroma!1557
This commit is contained in:
commit
943da97d6b
@ -14,6 +14,7 @@ defmodule Pleroma.Web.ActivityPub.Relay do
|
|||||||
|> User.get_or_create_service_actor_by_ap_id()
|
|> User.get_or_create_service_actor_by_ap_id()
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@spec follow(String.t()) :: {:ok, Activity.t()} | {:error, any()}
|
||||||
def follow(target_instance) do
|
def follow(target_instance) do
|
||||||
with %User{} = local_user <- get_actor(),
|
with %User{} = local_user <- get_actor(),
|
||||||
{:ok, %User{} = target_user} <- User.get_or_fetch_by_ap_id(target_instance),
|
{:ok, %User{} = target_user} <- User.get_or_fetch_by_ap_id(target_instance),
|
||||||
@ -21,12 +22,17 @@ defmodule Pleroma.Web.ActivityPub.Relay do
|
|||||||
Logger.info("relay: followed instance: #{target_instance}; id=#{activity.data["id"]}")
|
Logger.info("relay: followed instance: #{target_instance}; id=#{activity.data["id"]}")
|
||||||
{:ok, activity}
|
{:ok, activity}
|
||||||
else
|
else
|
||||||
|
{:error, _} = error ->
|
||||||
|
Logger.error("error: #{inspect(error)}")
|
||||||
|
error
|
||||||
|
|
||||||
e ->
|
e ->
|
||||||
Logger.error("error: #{inspect(e)}")
|
Logger.error("error: #{inspect(e)}")
|
||||||
{:error, e}
|
{:error, e}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@spec unfollow(String.t()) :: {:ok, Activity.t()} | {:error, any()}
|
||||||
def unfollow(target_instance) do
|
def unfollow(target_instance) do
|
||||||
with %User{} = local_user <- get_actor(),
|
with %User{} = local_user <- get_actor(),
|
||||||
{:ok, %User{} = target_user} <- User.get_or_fetch_by_ap_id(target_instance),
|
{:ok, %User{} = target_user} <- User.get_or_fetch_by_ap_id(target_instance),
|
||||||
@ -34,20 +40,27 @@ defmodule Pleroma.Web.ActivityPub.Relay do
|
|||||||
Logger.info("relay: unfollowed instance: #{target_instance}: id=#{activity.data["id"]}")
|
Logger.info("relay: unfollowed instance: #{target_instance}: id=#{activity.data["id"]}")
|
||||||
{:ok, activity}
|
{:ok, activity}
|
||||||
else
|
else
|
||||||
|
{:error, _} = error ->
|
||||||
|
Logger.error("error: #{inspect(error)}")
|
||||||
|
error
|
||||||
|
|
||||||
e ->
|
e ->
|
||||||
Logger.error("error: #{inspect(e)}")
|
Logger.error("error: #{inspect(e)}")
|
||||||
{:error, e}
|
{:error, e}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
|
@spec publish(any()) :: {:ok, Activity.t(), Object.t()} | {:error, any()}
|
||||||
def publish(%Activity{data: %{"type" => "Create"}} = activity) do
|
def publish(%Activity{data: %{"type" => "Create"}} = activity) do
|
||||||
with %User{} = user <- get_actor(),
|
with %User{} = user <- get_actor(),
|
||||||
%Object{} = object <- Object.normalize(activity) do
|
%Object{} = object <- Object.normalize(activity) do
|
||||||
ActivityPub.announce(user, object, nil, true, false)
|
ActivityPub.announce(user, object, nil, true, false)
|
||||||
else
|
else
|
||||||
e -> Logger.error("error: #{inspect(e)}")
|
e ->
|
||||||
|
Logger.error("error: #{inspect(e)}")
|
||||||
|
{:error, inspect(e)}
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
||||||
def publish(_), do: nil
|
def publish(_), do: {:error, "Not implemented"}
|
||||||
end
|
end
|
||||||
|
@ -5,11 +5,71 @@
|
|||||||
defmodule Pleroma.Web.ActivityPub.RelayTest do
|
defmodule Pleroma.Web.ActivityPub.RelayTest do
|
||||||
use Pleroma.DataCase
|
use Pleroma.DataCase
|
||||||
|
|
||||||
|
alias Pleroma.Activity
|
||||||
|
alias Pleroma.Object
|
||||||
|
alias Pleroma.Web.ActivityPub.ActivityPub
|
||||||
alias Pleroma.Web.ActivityPub.Relay
|
alias Pleroma.Web.ActivityPub.Relay
|
||||||
|
|
||||||
|
import Pleroma.Factory
|
||||||
|
|
||||||
test "gets an actor for the relay" do
|
test "gets an actor for the relay" do
|
||||||
user = Relay.get_actor()
|
user = Relay.get_actor()
|
||||||
|
assert user.ap_id == "#{Pleroma.Web.Endpoint.url()}/relay"
|
||||||
|
end
|
||||||
|
|
||||||
assert user.ap_id =~ "/relay"
|
describe "follow/1" do
|
||||||
|
test "returns errors when user not found" do
|
||||||
|
assert Relay.follow("test-ap-id") == {:error, "Could not fetch by AP id"}
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns activity" do
|
||||||
|
user = insert(:user)
|
||||||
|
service_actor = Relay.get_actor()
|
||||||
|
assert {:ok, %Activity{} = activity} = Relay.follow(user.ap_id)
|
||||||
|
assert activity.actor == "#{Pleroma.Web.Endpoint.url()}/relay"
|
||||||
|
assert user.ap_id in activity.recipients
|
||||||
|
assert activity.data["type"] == "Follow"
|
||||||
|
assert activity.data["actor"] == service_actor.ap_id
|
||||||
|
assert activity.data["object"] == user.ap_id
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "unfollow/1" do
|
||||||
|
test "returns errors when user not found" do
|
||||||
|
assert Relay.unfollow("test-ap-id") == {:error, "Could not fetch by AP id"}
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns activity" do
|
||||||
|
user = insert(:user)
|
||||||
|
service_actor = Relay.get_actor()
|
||||||
|
ActivityPub.follow(service_actor, user)
|
||||||
|
assert {:ok, %Activity{} = activity} = Relay.unfollow(user.ap_id)
|
||||||
|
assert activity.actor == "#{Pleroma.Web.Endpoint.url()}/relay"
|
||||||
|
assert user.ap_id in activity.recipients
|
||||||
|
assert activity.data["type"] == "Undo"
|
||||||
|
assert activity.data["actor"] == service_actor.ap_id
|
||||||
|
assert activity.data["to"] == [user.ap_id]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
describe "publish/1" do
|
||||||
|
test "returns error when activity not `Create` type" do
|
||||||
|
activity = insert(:like_activity)
|
||||||
|
assert Relay.publish(activity) == {:error, "Not implemented"}
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns error when activity not public" do
|
||||||
|
activity = insert(:direct_note_activity)
|
||||||
|
assert Relay.publish(activity) == {:error, false}
|
||||||
|
end
|
||||||
|
|
||||||
|
test "returns announce activity" do
|
||||||
|
service_actor = Relay.get_actor()
|
||||||
|
note = insert(:note_activity)
|
||||||
|
assert {:ok, %Activity{} = activity, %Object{} = obj} = Relay.publish(note)
|
||||||
|
assert activity.data["type"] == "Announce"
|
||||||
|
assert activity.data["actor"] == service_actor.ap_id
|
||||||
|
assert activity.data["object"] == obj.data["id"]
|
||||||
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
Loading…
Reference in New Issue
Block a user