projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/377-stuck-follow-request' 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 c0a52e349ea423460a5c1c9f52e7fba7e376447f..93808517bde9ad2af6c717de8022b0db9c513a7c 100644
(file)
--- a/
lib/pleroma/web/activity_pub/relay.ex
+++ b/
lib/pleroma/web/activity_pub/relay.ex
@@
-3,7
+3,9
@@
# SPDX-License-Identifier: AGPL-3.0-only
defmodule Pleroma.Web.ActivityPub.Relay do
# SPDX-License-Identifier: AGPL-3.0-only
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
alias Pleroma.Web.ActivityPub.ActivityPub
require Logger
@@
-13,7
+15,7
@@
defmodule Pleroma.Web.ActivityPub.Relay do
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}
{:ok, activity} <- ActivityPub.follow(local_user, target_user) do
Logger.info("relay: followed instance: #{target_instance}; id=#{activity.data["id"]}")
{:ok, activity}
@@
-26,7
+28,7
@@
defmodule Pleroma.Web.ActivityPub.Relay do
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}
{:ok, activity} <- ActivityPub.unfollow(local_user, target_user) do
Logger.info("relay: unfollowed instance: #{target_instance}: id=#{activity.data["id"]}")
{:ok, activity}
@@
-39,7
+41,7
@@
defmodule Pleroma.Web.ActivityPub.Relay do
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
+ %Object{} = object <- Object.normalize(activity) do
ActivityPub.announce(user, object, nil, true, false)
else
e -> Logger.error("error: #{inspect(e)}")
ActivityPub.announce(user, object, nil, true, false)
else
e -> Logger.error("error: #{inspect(e)}")