projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'length-limit-bio' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
activity_pub
/
relay.ex
diff --git
a/lib/pleroma/web/activity_pub/relay.ex
b/lib/pleroma/web/activity_pub/relay.ex
index d30853d62ef258d448492022460c051cad51578b..5f18cc64a8744726c98d580ca29a4d633636189e 100644
(file)
--- a/
lib/pleroma/web/activity_pub/relay.ex
+++ b/
lib/pleroma/web/activity_pub/relay.ex
@@
-1,44
+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
defmodule Pleroma.Web.ActivityPub.Relay do
- alias Pleroma.{User, Object, Activity}
+ alias Pleroma.Activity
+ alias Pleroma.Object
+ alias Pleroma.User
alias Pleroma.Web.ActivityPub.ActivityPub
require Logger
def get_actor do
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
end
+ @spec follow(String.t()) :: {:ok, Activity.t()} | {:error, any()}
def follow(target_instance) do
with %User{} = local_user <- get_actor(),
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
Logger.info("relay: followed instance: #{target_instance}; id=#{activity.data["id"]}")
{:ok, activity} <- ActivityPub.follow(local_user, target_user) do
Logger.info("relay: followed instance: #{target_instance}; id=#{activity.data["id"]}")
+ {:ok, activity}
else
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
end
+ @spec unfollow(String.t()) :: {:ok, Activity.t()} | {:error, any()}
def unfollow(target_instance) do
with %User{} = local_user <- get_actor(),
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
Logger.info("relay: unfollowed instance: #{target_instance}: id=#{activity.data["id"]}")
{:ok, activity} <- ActivityPub.unfollow(local_user, target_user) do
Logger.info("relay: unfollowed instance: #{target_instance}: id=#{activity.data["id"]}")
+ {:ok, activity}
else
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
end
+ @spec publish(any()) :: {:ok, Activity.t(), Object.t()} | {:error, any()}
def publish(%Activity{data: %{"type" => "Create"}} = activity) do
with %User{} = user <- get_actor(),
def publish(%Activity{data: %{"type" => "Create"}} = activity) do
with %User{} = user <- get_actor(),
- %Object{} = object <- Object.normalize(activity
.data["object"]["id"]
) do
- ActivityPub.announce(user, object)
+ %Object{} = object <- Object.normalize(activity) do
+ 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