moon
/
honkoma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Formatting.

This commit is contained in:
lain 2018-05-26 15:11:50 +02:00
parent bfce29866f
commit 0a6c897c94
3 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
lib/pleroma/web/activity_pub/transmogrifier.ex
View File

@ -166,6 +166,7 @@ defp get_follow_activity(follow_object, followed) do
# Can't find the activity. This might a Mastodon 2.3 "Accept" # Can't find the activity. This might a Mastodon 2.3 "Accept"
{:activity, nil} -> {:activity, nil} ->
mastodon_follow_hack(follow_object, followed) mastodon_follow_hack(follow_object, followed)
_ -> _ ->
{:error, nil} {:error, nil}
end end
@ -177,7 +178,14 @@ def handle_incoming(
with %User{} = followed <- User.get_or_fetch_by_ap_id(actor), with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
{:ok, follow_activity} <- get_follow_activity(follow_object, followed), {:ok, follow_activity} <- get_follow_activity(follow_object, followed),
%User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity.data["actor"]), %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 if not User.following?(follower, followed) do
{:ok, follower} = User.follow(follower, followed) {:ok, follower} = User.follow(follower, followed)
end end
@ -194,7 +202,14 @@ def handle_incoming(
with %User{} = followed <- User.get_or_fetch_by_ap_id(actor), with %User{} = followed <- User.get_or_fetch_by_ap_id(actor),
{:ok, follow_activity} <- get_follow_activity(follow_object, followed), {:ok, follow_activity} <- get_follow_activity(follow_object, followed),
%User{local: true} = follower <- User.get_cached_by_ap_id(follow_activity.data["actor"]), %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) User.unfollow(follower, followed)
{:ok, activity} {:ok, activity}

10
test/web/activity_pub/transmogrifier_test.exs
View File

@ -399,12 +399,12 @@ test "it works for incoming accepts which were pre-accepted" do
|> Poison.decode!() |> Poison.decode!()
|> Map.put("actor", followed.ap_id) |> Map.put("actor", followed.ap_id)
object = accept_data["object"] object =
|> Map.put("actor", follower.ap_id) accept_data["object"]
|> Map.put("id", follow_activity.data["id"]) |> Map.put("actor", follower.ap_id)
|> Map.put("id", follow_activity.data["id"])
accept_data = accept_data = Map.put(accept_data, "object", object)
Map.put(accept_data, "object", object)
{:ok, activity} = Transmogrifier.handle_incoming(accept_data) {:ok, activity} = Transmogrifier.handle_incoming(accept_data)
refute activity.local refute activity.local

2
test/web/mastodon_api/mastodon_api_controller_test.exs
View File

@ -298,7 +298,7 @@ test "deleting a list", %{conn: conn} do
test "list timeline", %{conn: conn} do test "list timeline", %{conn: conn} do
user = insert(:user) user = insert(:user)
other_user = insert(:user) other_user = insert(:user)
{:ok, activity_one} = TwitterAPI.create_status(user, %{"status" => "Marisa is cute."}) {:ok, _activity_one} = TwitterAPI.create_status(user, %{"status" => "Marisa is cute."})
{:ok, activity_two} = TwitterAPI.create_status(other_user, %{"status" => "Marisa is cute."}) {:ok, activity_two} = TwitterAPI.create_status(other_user, %{"status" => "Marisa is cute."})
{:ok, list} = Pleroma.List.create("name", user) {:ok, list} = Pleroma.List.create("name", user)
{:ok, list} = Pleroma.List.follow(list, other_user) {:ok, list} = Pleroma.List.follow(list, other_user)