From: feld <feld@feld.me>
Date: Wed, 11 Mar 2020 15:10:09 +0000 (+0000)
Subject: Merge branch 'relay-list-change' into 'develop'
X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=f92c447bbc38db417beb2ac505c17649c6de01d2;hp=-c;p=akkoma

Merge branch 'relay-list-change' into 'develop'

Relay list shows hosts without accepted follow

See merge request pleroma/pleroma!2240
---

f92c447bbc38db417beb2ac505c17649c6de01d2
diff --combined lib/mix/tasks/pleroma/relay.ex
index c6ca888d4,b0fadeae9..c3312507e
--- a/lib/mix/tasks/pleroma/relay.ex
+++ b/lib/mix/tasks/pleroma/relay.ex
@@@ -1,5 -1,5 +1,5 @@@
  # Pleroma: A lightweight social networking server
 -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Mix.Tasks.Pleroma.Relay do
@@@ -35,7 -35,7 +35,7 @@@
    def run(["list"]) do
      start_pleroma()
  
-     with {:ok, list} <- Relay.list() do
+     with {:ok, list} <- Relay.list(true) do
        list |> Enum.each(&shell_info(&1))
      else
        {:error, e} -> shell_error("Error while fetching relay subscription list: #{inspect(e)}")
diff --combined test/tasks/relay_test.exs
index 08855f245,43565b7c7..d3d88467d
--- a/test/tasks/relay_test.exs
+++ b/test/tasks/relay_test.exs
@@@ -1,5 -1,5 +1,5 @@@
  # Pleroma: A lightweight social networking server
 -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Mix.Tasks.Pleroma.RelayTest do
@@@ -38,6 -38,9 +38,9 @@@
        assert activity.data["type"] == "Follow"
        assert activity.data["actor"] == local_user.ap_id
        assert activity.data["object"] == target_user.ap_id
+ 
+       :ok = Mix.Tasks.Pleroma.Relay.run(["list"])
+       assert_receive {:mix_shell, :info, ["mastodon.example.org (no Accept received)"]}
      end
    end
  
diff --combined test/web/activity_pub/activity_pub_controller_test.exs
index 9151034da,0c80e2434..b2352538a
--- a/test/web/activity_pub/activity_pub_controller_test.exs
+++ b/test/web/activity_pub/activity_pub_controller_test.exs
@@@ -1,5 -1,5 +1,5 @@@
  # Pleroma: A lightweight social networking server
 -# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 +# Copyright © 2017-2020 Pleroma Authors <https://pleroma.social/>
  # SPDX-License-Identifier: AGPL-3.0-only
  
  defmodule Pleroma.Web.ActivityPub.ActivityPubControllerTest do
@@@ -341,6 -341,44 +341,44 @@@
        assert "ok" == json_response(conn, 200)
        assert Instances.reachable?(sender_url)
      end
+ 
+     test "accept follow activity", %{conn: conn} do
+       Pleroma.Config.put([:instance, :federating], true)
+       relay = Relay.get_actor()
+ 
+       assert {:ok, %Activity{} = activity} = Relay.follow("https://relay.mastodon.host/actor")
+ 
+       followed_relay = Pleroma.User.get_by_ap_id("https://relay.mastodon.host/actor")
+       relay = refresh_record(relay)
+ 
+       accept =
+         File.read!("test/fixtures/relay/accept-follow.json")
+         |> String.replace("{{ap_id}}", relay.ap_id)
+         |> String.replace("{{activity_id}}", activity.data["id"])
+ 
+       assert "ok" ==
+                conn
+                |> assign(:valid_signature, true)
+                |> put_req_header("content-type", "application/activity+json")
+                |> post("/inbox", accept)
+                |> json_response(200)
+ 
+       ObanHelpers.perform(all_enqueued(worker: ReceiverWorker))
+ 
+       assert Pleroma.FollowingRelationship.following?(
+                relay,
+                followed_relay
+              )
+ 
+       Mix.shell(Mix.Shell.Process)
+ 
+       on_exit(fn ->
+         Mix.shell(Mix.Shell.IO)
+       end)
+ 
+       :ok = Mix.Tasks.Pleroma.Relay.run(["list"])
+       assert_receive {:mix_shell, :info, ["relay.mastodon.host"]}
+     end
    end
  
    describe "/users/:nickname/inbox" do