aboutsummaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorlain <lain@soykaf.club>2018-05-26 15:11:50 +0200
committerlain <lain@soykaf.club>2018-05-26 15:11:50 +0200
commit0a6c897c9488b26273a5fbb2de1ae1bfa0c96675 (patch)
treeac4cd78b67888027c1586e5f188b4ecb97a714d5 /lib
parentbfce29866fea3ec7ab91a6b1f20a845248fa0130 (diff)
downloadpleroma-0a6c897c9488b26273a5fbb2de1ae1bfa0c96675.tar.gz
Formatting.
Diffstat (limited to 'lib')
-rw-r--r--lib/pleroma/web/activity_pub/transmogrifier.ex19
1 files changed, 17 insertions, 2 deletions
diff --git a/lib/pleroma/web/activity_pub/transmogrifier.ex b/lib/pleroma/web/activity_pub/transmogrifier.ex
index fee0b5859..62667daa2 100644
--- a/lib/pleroma/web/activity_pub/transmogrifier.ex
+++ b/lib/pleroma/web/activity_pub/transmogrifier.ex
@@ -166,6 +166,7 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
# Can't find the activity. This might a Mastodon 2.3 "Accept"
{:activity, nil} ->
mastodon_follow_hack(follow_object, followed)
+
_ ->
{:error, nil}
end
@@ -177,7 +178,14 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
{:ok, follow_activity} <- get_follow_activity(follow_object, followed),
%User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity.data["actor"]),
- {:ok, activity} <- ActivityPub.accept(%{to: follow_activity.data["to"], type: "Accept", actor: followed.ap_id, object: follow_activity.data["id"], local: false}) do
+ {:ok, activity} <-
+ ActivityPub.accept(%{
+ to: follow_activity.data["to"],
+ type: "Accept",
+ actor: followed.ap_id,
+ object: follow_activity.data["id"],
+ local: false
+ }) do
if not User.following?(follower, followed) do
{:ok, follower} = User.follow(follower, followed)
end
@@ -194,7 +202,14 @@ defmodule Pleroma.Web.ActivityPub.Transmogrifier do
with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
{:ok, follow_activity} <- get_follow_activity(follow_object, followed),
%User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity.data["actor"]),
- {:ok, activity} <- ActivityPub.accept(%{to: follow_activity.data["to"], type: "Accept", actor: followed.ap_id, object: follow_activity.data["id"], local: false}) do
+ {:ok, activity} <-
+ ActivityPub.accept(%{
+ to: follow_activity.data["to"],
+ type: "Accept",
+ actor: followed.ap_id,
+ object: follow_activity.data["id"],
+ local: false
+ }) do
User.unfollow(follower, followed)
{:ok, activity}