Merge branch 'feature/improve-microformats' into 'develop'

improve microformats support

See merge request pleroma/pleroma!672

diff --combined test/web/mastodon_api/mastodon_api_controller_test.exs
index 62677638dcd37147f2b7057729c52e1b34334d80,9e4ecedc5d451eb46a179da2bfe216f7329c7ab2..c83bb5bc8db3bae6595df007143fc2840eab5b59
--- 1/test/web/mastodon_api/mastodon_api_controller_test.exs
--- 2/test/web/mastodon_api/mastodon_api_controller_test.exs
+++ b/test/web/mastodon_api/mastodon_api_controller_test.exs
@@@ -386,7 -386,7 +386,7 @@@ defmodule Pleroma.Web.MastodonAPI.Masto
          |> assign(:user, user)
          |> get("/api/v1/filters/#{filter.filter_id}")
  
-       assert response = json_response(conn, 200)
+       assert _response = json_response(conn, 200)
      end
  
      test "update a filter", %{conn: conn} do
@@@ -600,7 -600,9 +600,9 @@@
          |> get("/api/v1/notifications")
  
        expected_response =
-         "hi <span><a data-user=\"#{user.id}\" href=\"#{user.ap_id}\">@<span>#{user.nickname}</span></a></span>"
+         "hi <span class=\"h-card\"><a data-user=\"#{user.id}\" class=\"u-url mention\" href=\"#{
+           user.ap_id
+         }\">@<span>#{user.nickname}</span></a></span>"
  
        assert [%{"status" => %{"content" => response}} | _rest] = json_response(conn, 200)
        assert response == expected_response
@@@ -621,7 -623,9 +623,9 @@@
          |> get("/api/v1/notifications/#{notification.id}")
  
        expected_response =
-         "hi <span><a data-user=\"#{user.id}\" href=\"#{user.ap_id}\">@<span>#{user.nickname}</span></a></span>"
+         "hi <span class=\"h-card\"><a data-user=\"#{user.id}\" class=\"u-url mention\" href=\"#{
+           user.ap_id
+         }\">@<span>#{user.nickname}</span></a></span>"
  
        assert %{"status" => %{"content" => response}} = json_response(conn, 200)
        assert response == expected_response
@@@ -1357,7 -1361,7 +1361,7 @@@
      assert [status] = json_response(first_conn, 200)
      assert status["id"] == to_string(activity.id)
  
-     assert [{"link", link_header}] =
+     assert [{"link", _link_header}] =
               Enum.filter(first_conn.resp_headers, fn element -> match?({"link", _}, element) end)
  
      # Honours query params
@@@ -1402,9 -1406,9 +1406,9 @@@
        assert user = json_response(conn, 200)
  
        assert user["note"] ==
-                "I drink <a data-tag=\"cofe\" href=\"http://localhost:4001/tag/cofe\">#cofe</a> with <span><a data-user=\"#{
+                "I drink <a class=\"hashtag\" data-tag=\"cofe\" href=\"http://localhost:4001/tag/cofe\">#cofe</a> with <span class=\"h-card\"><a data-user=\"#{
                   user2.id
-                }\" href=\"#{user2.ap_id}\">@<span>#{user2.nickname}</span></a></span>"
+                }\" class=\"u-url mention\" href=\"#{user2.ap_id}\">@<span>#{user2.nickname}</span></a></span>"
      end
  
      test "updates the user's locking status", %{conn: conn} do
@@@ -1471,36 -1475,20 +1475,36 @@@
    test "get instance information", %{conn: conn} do
      insert(:user, %{local: true})
      user = insert(:user, %{local: true})
 -    insert(:user, %{local: false})
 +    insert(:user, %{local: false, nickname: "u@peer1.com"})
 +    insert(:user, %{local: false, nickname: "u@peer2.com"})
  
      {:ok, _} = TwitterAPI.create_status(user, %{"status" => "cofe"})
  
      Pleroma.Stats.update_stats()
  
 -    conn =
 -      conn
 -      |> get("/api/v1/instance")
 +    conn = get(conn, "/api/v1/instance")
 +
 +    assert result = json_response(conn, 200)
 +
 +    stats = result["stats"]
 +
 +    assert stats
 +    assert stats["user_count"] == 2
 +    assert stats["status_count"] == 1
 +    assert stats["domain_count"] == 2
 +  end
 +
 +  test "get peers", %{conn: conn} do
 +    insert(:user, %{local: false, nickname: "u@peer1.com"})
 +    insert(:user, %{local: false, nickname: "u@peer2.com"})
 +
 +    Pleroma.Stats.update_stats()
 +
 +    conn = get(conn, "/api/v1/instance/peers")
  
      assert result = json_response(conn, 200)
  
 -    assert result["stats"]["user_count"] == 2
 -    assert result["stats"]["status_count"] == 1
 +    assert ["peer1.com", "peer2.com"] == Enum.sort(result)
    end
  
    test "put settings", %{conn: conn} do
@@@ -1511,7 -1499,7 +1515,7 @@@
        |> assign(:user, user)
        |> put("/api/web/settings", %{"data" => %{"programming" => "socks"}})
  
-     assert result = json_response(conn, 200)
+     assert _result = json_response(conn, 200)
  
      user = User.get_cached_by_ap_id(user.ap_id)
      assert user.info.settings == %{"programming" => "socks"}