X-Git-Url: https://git.squeep.com/?a=blobdiff_plain;f=lib%2Fpleroma%2Fweb%2Factivity_pub%2Frelay.ex;h=5f18cc64a8744726c98d580ca29a4d633636189e;hb=10fef2fceee6d527d3fae0f67d81868b457d71b1;hp=8b49188fbee76b29f744b3b92d2aa2beb1cb2ec1;hpb=99be3d3dccbbd7877192c6291bbaae92f66e06bf;p=akkoma

diff --git a/lib/pleroma/web/activity_pub/relay.ex b/lib/pleroma/web/activity_pub/relay.ex
index 8b49188fb..5f18cc64a 100644
--- a/lib/pleroma/web/activity_pub/relay.ex
+++ b/lib/pleroma/web/activity_pub/relay.ex
@@ -1,35 +1,66 @@
+# Pleroma: A lightweight social networking server
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
+# SPDX-License-Identifier: AGPL-3.0-only
+
 defmodule Pleroma.Web.ActivityPub.Relay do
+  alias Pleroma.Activity
+  alias Pleroma.Object
   alias Pleroma.User
   alias Pleroma.Web.ActivityPub.ActivityPub
   require Logger
 
   def get_actor do
-    User.get_or_create_instance_user()
+    "#{Pleroma.Web.Endpoint.url()}/relay"
+    |> User.get_or_create_service_actor_by_ap_id()
   end
 
+  @spec follow(String.t()) :: {:ok, Activity.t()} | {:error, any()}
   def follow(target_instance) do
     with %User{} = local_user <- get_actor(),
-         %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),
          {:ok, activity} <- ActivityPub.follow(local_user, target_user) do
-      ActivityPub.publish(local_user, activity)
       Logger.info("relay: followed instance: #{target_instance}; id=#{activity.data["id"]}")
+      {:ok, activity}
     else
-      e -> Logger.error("error: #{inspect(e)}")
-    end
+      {:error, _} = error ->
+        Logger.error("error: #{inspect(error)}")
+        error
 
-    :ok
+      e ->
+        Logger.error("error: #{inspect(e)}")
+        {:error, e}
+    end
   end
 
+  @spec unfollow(String.t()) :: {:ok, Activity.t()} | {:error, any()}
   def unfollow(target_instance) do
     with %User{} = local_user <- get_actor(),
-         %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),
          {:ok, activity} <- ActivityPub.unfollow(local_user, target_user) do
-      ActivityPub.publish(local_user, activity)
       Logger.info("relay: unfollowed instance: #{target_instance}: id=#{activity.data["id"]}")
+      {:ok, activity}
     else
-      e -> Logger.error("error: #{inspect(e)}")
+      {:error, _} = error ->
+        Logger.error("error: #{inspect(error)}")
+        error
+
+      e ->
+        Logger.error("error: #{inspect(e)}")
+        {:error, e}
     end
+  end
 
-    :ok
+  @spec publish(any()) :: {:ok, Activity.t(), Object.t()} | {:error, any()}
+  def publish(%Activity{data: %{"type" => "Create"}} = activity) do
+    with %User{} = user <- get_actor(),
+         %Object{} = object <- Object.normalize(activity) do
+      ActivityPub.announce(user, object, nil, true, false)
+    else
+      e ->
+        Logger.error("error: #{inspect(e)}")
+        {:error, inspect(e)}
+    end
   end
+
+  def publish(_), do: {:error, "Not implemented"}
 end