Merge remote-tracking branch 'origin/main'

lib/federation/activity_pub/types/actors.ex

@@ -301,7 +301,7 @@ defmodule Mobilizon.Federation.ActivityPub.Types.Actors do
        ) do
     %Actor{id: relay_id} = Relay.get_actor()
 
-    unless follower.target_actor.manually_approves_followers or
+    unless follower.target_actor.manually_approves_followers == true or
              follower.target_actor.id == relay_id do
       require Logger
       Logger.debug("Target doesn't manually approves followers, we can accept right away")

lib/federation/node_info.ex

@@ -5,6 +5,7 @@ defmodule Mobilizon.Federation.NodeInfo do
 
   alias Mobilizon.Service.HTTP.WebfingerClient
   require Logger
+  import Mobilizon.Service.HTTP.Utils, only: [is_content_type?: 2]
 
   @application_uri "https://www.w3.org/ns/activitystreams#Application"
   @nodeinfo_rel_2_0 "http://nodeinfo.diaspora.software/ns/schema/2.0"
@@ -20,7 +21,7 @@ defmodule Mobilizon.Federation.NodeInfo do
       {:ok, body} ->
         extract_application_actor(body)
 
-      {:error, :node_info_meta_http_error} ->
+      {:error, _err} ->
         nil
     end
   end
@@ -31,7 +32,9 @@ defmodule Mobilizon.Federation.NodeInfo do
 
     with {:ok, endpoint} when is_binary(endpoint) <- fetch_nodeinfo_details(host),
          :ok <- Logger.debug("Going to get NodeInfo information from URL #{endpoint}"),
-         {:ok, %{body: body, status: code}} when code in 200..299 <- WebfingerClient.get(endpoint) do
+         {:ok, %{body: body, status: code, headers: headers}} when code in 200..299 <-
+           WebfingerClient.get(endpoint),
+         {:ok, body} <- validate_json_response(body, headers) do
       Logger.debug("Found nodeinfo information for domain #{host}")
       {:ok, body}
     else
@@ -58,8 +61,8 @@ defmodule Mobilizon.Federation.NodeInfo do
     prefix = if @env !== :dev, do: "https", else: "http"
 
     case WebfingerClient.get("#{prefix}://#{host}/.well-known/nodeinfo") do
-      {:ok, %{body: body, status: code}} when code in 200..299 ->
+      {:ok, %{body: body, status: code, headers: headers}} when code in 200..299 ->
-        {:ok, body}
+        validate_json_response(body, headers)
 
       err ->
         Logger.debug("Failed to fetch NodeInfo data #{inspect(err)}")
@@ -102,4 +105,19 @@ defmodule Mobilizon.Federation.NodeInfo do
       rel == relation and is_binary(href)
     end)
   end
+
+  @spec validate_json_response(map() | String.t(), list()) ::
+          {:ok, String.t()} | {:error, :bad_content_type | :body_not_json}
+  defp validate_json_response(body, headers) do
+    cond do
+      !is_content_type?(headers, "application/json") ->
+        {:error, :bad_content_type}
+
+      !is_map(body) ->
+        {:error, :body_not_json}
+
+      true ->
+        {:ok, body}
+    end
+  end
 end

lib/graphql/resolvers/admin.ex

@@ -16,6 +16,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
   alias Mobilizon.Reports.{Note, Report}
   alias Mobilizon.Service.Auth.Authenticator
   alias Mobilizon.Service.Statistics
+  alias Mobilizon.Service.Workers.RefreshInstances
   alias Mobilizon.Storage.Page
   alias Mobilizon.Users.User
   alias Mobilizon.Web.Email
@@ -546,6 +547,7 @@ defmodule Mobilizon.GraphQL.Resolvers.Admin do
     case Relay.follow(domain) do
       {:ok, _activity, _follow} ->
         Instances.refresh()
+        RefreshInstances.refresh_instance_actor(domain)
         get_instance(parent, args, resolution)
 
       {:error, :follow_pending} ->

lib/mobilizon/instances/instances.ex

@@ -22,15 +22,16 @@ defmodule Mobilizon.Instances do
 
     order_by_options = Keyword.new([{direction, order_by}])
 
-    subquery =
+    query =
-      Actor
+      Instance
-      |> where(
+      |> join(:left, [i], ia in InstanceActor, on: i.domain == ia.domain)
-        [a],
+      |> join(:left, [_i, ia], a in Actor, on: ia.actor_id == a.id)
-        a.preferred_username == "relay" and a.type == :Application and not is_nil(a.domain)
+      |> join(:left, [_i, _ia, a], f1 in Follower, on: f1.target_actor_id == a.id)
-      )
+      |> join(:left, [_i, _ia, a], f2 in Follower, on: f2.actor_id == a.id)
-      |> join(:left, [a], f1 in Follower, on: f1.target_actor_id == a.id)
+      |> select([i, ia, a, f1, f2], %{
-      |> join(:left, [a], f2 in Follower, on: f2.actor_id == a.id)
+        instance: i,
-      |> select([a, f1, f2], %{
+        instance_actor: ia,
+        actor: a,
         domain: a.domain,
         has_relay: fragment(@is_null_fragment, a.id),
         following: fragment(@is_null_fragment, f2.id),
@@ -38,13 +39,6 @@ defmodule Mobilizon.Instances do
         follower: fragment(@is_null_fragment, f1.id),
         follower_approved: f1.approved
       })
-
-    query =
-      Instance
-      |> join(:left, [i], s in subquery(subquery), on: i.domain == s.domain)
-      |> join(:left, [i], ia in InstanceActor, on: i.domain == ia.domain)
-      |> join(:left, [_i, _s, ia], a in Actor, on: ia.actor_id == a.id)
-      |> select([i, s, ia, a], {i, s, ia, a})
       |> order_by(^order_by_options)
 
     query =
@@ -93,17 +87,17 @@ defmodule Mobilizon.Instances do
     SQL.query!(Repo, "REFRESH MATERIALIZED VIEW instances")
   end
 
-  defp convert_instance_meta(
+  defp convert_instance_meta(%{
-         {instance,
+         instance: instance,
-          %{
+         instance_actor: instance_meta,
-            domain: _domain,
+         actor: instance_actor,
-            follower: follower,
+         domain: _domain,
-            follower_approved: follower_approved,
+         follower: follower,
-            following: following,
+         follower_approved: follower_approved,
-            following_approved: following_approved,
+         following: following,
-            has_relay: has_relay
+         following_approved: following_approved,
-          }, instance_meta, instance_actor}
+         has_relay: has_relay
-       ) do
+       }) do
     instance
     |> Map.put(:follower_status, follow_status(following, following_approved))
     |> Map.put(:followed_status, follow_status(follower, follower_approved))

lib/service/http/utils.ex

@@ -0,0 +1,35 @@
+defmodule Mobilizon.Service.HTTP.Utils do
+  @moduledoc """
+  Utils for HTTP operations
+  """
+
+  @spec get_header(Enum.t(), String.t()) :: String.t() | nil
+  def get_header(headers, key) do
+    key = String.downcase(key)
+
+    case List.keyfind(headers, key, 0) do
+      {^key, value} -> String.downcase(value)
+      nil -> nil
+    end
+  end
+
+  @spec is_content_type?(Enum.t(), String.t() | list(String.t())) :: boolean
+  def is_content_type?(headers, content_type) do
+    headers
+    |> get_header("Content-Type")
+    |> content_type_header_matches(content_type)
+  end
+
+  @spec content_type_header_matches(String.t() | nil, Enum.t()) :: boolean
+  defp content_type_header_matches(header, content_types)
+  defp content_type_header_matches(nil, _content_types), do: false
+
+  defp content_type_header_matches(header, content_type)
+       when is_binary(header) and is_binary(content_type),
+       do: content_type_header_matches(header, [content_type])
+
+  defp content_type_header_matches(header, content_types)
+       when is_binary(header) and is_list(content_types) do
+    Enum.any?(content_types, fn content_type -> String.starts_with?(header, content_type) end)
+  end
+end

lib/service/rich_media/parser.ex

@@ -22,6 +22,7 @@ defmodule Mobilizon.Service.RichMedia.Parser do
   alias Mobilizon.Service.RichMedia.Parsers.Fallback
   alias Plug.Conn.Utils
   require Logger
+  import Mobilizon.Service.HTTP.Utils
 
   defp parsers do
     Mobilizon.Config.get([:rich_media, :parsers])
@@ -74,7 +75,7 @@ defmodule Mobilizon.Service.RichMedia.Parser do
                 opts: @options
               )},
            {:is_html, _response_headers, true} <-
-             {:is_html, response_headers, is_html(response_headers)} do
+             {:is_html, response_headers, is_html?(response_headers)} do
         body
         |> convert_utf8(response_headers)
         |> maybe_parse()
@@ -107,43 +108,21 @@ defmodule Mobilizon.Service.RichMedia.Parser do
   defp get_data_for_media(response_headers, url) do
     data = %{title: get_filename_from_headers(response_headers) || get_filename_from_url(url)}
 
-    if is_image(response_headers) do
+    if is_image?(response_headers) do
       Map.put(data, :image_remote_url, url)
     else
       data
     end
   end
 
-  @spec is_html(Enum.t()) :: boolean
+  @spec is_html?(Enum.t()) :: boolean
-  def is_html(headers) do
+  defp is_html?(headers) do
-    headers
+    is_content_type?(headers, ["text/html", "application/xhtml"])
-    |> get_header("Content-Type")
-    |> content_type_header_matches(["text/html", "application/xhtml"])
   end
 
-  @spec is_image(Enum.t()) :: boolean
+  @spec is_image?(Enum.t()) :: boolean
-  defp is_image(headers) do
+  defp is_image?(headers) do
-    headers
+    is_content_type?(headers, ["image/"])
-    |> get_header("Content-Type")
-    |> content_type_header_matches(["image/"])
-  end
-
-  @spec content_type_header_matches(String.t() | nil, Enum.t()) :: boolean
-  defp content_type_header_matches(header, content_types)
-  defp content_type_header_matches(nil, _content_types), do: false
-
-  defp content_type_header_matches(header, content_types) when is_binary(header) do
-    Enum.any?(content_types, fn content_type -> String.starts_with?(header, content_type) end)
-  end
-
-  @spec get_header(Enum.t(), String.t()) :: String.t() | nil
-  defp get_header(headers, key) do
-    key = String.downcase(key)
-
-    case List.keyfind(headers, key, 0) do
-      {^key, value} -> String.downcase(value)
-      nil -> nil
-    end
   end
 
   @spec get_filename_from_headers(Enum.t()) :: String.t() | nil

lib/service/workers/refresh_instances.ex

@@ -20,21 +20,16 @@ defmodule Mobilizon.Service.Workers.RefreshInstances do
     Instances.refresh()
 
     Instances.all_domains()
-    |> Enum.each(&refresh_instance_actor/1)
+    |> Enum.each(fn %Instance{domain: domain} -> refresh_instance_actor(domain) end)
   end
 
-  @spec refresh_instance_actor(Instance.t()) ::
+  @spec refresh_instance_actor(String.t() | nil) ::
-          {:ok, Mobilizon.Actors.Actor.t()}
+          {:ok, Mobilizon.Actors.Actor.t()} | {:error, Ecto.Changeset.t()} | {:error, atom}
-          | {:error,
+  def refresh_instance_actor(nil) do
-             ActivityPubActor.make_actor_errors()
-             | Mobilizon.Federation.WebFinger.finger_errors()}
-  def refresh_instance_actor(%Instance{domain: nil}) do
     {:error, :not_remote_instance}
   end
 
-  @spec refresh_instance_actor(Instance.t()) ::
+  def refresh_instance_actor(domain) do
-          {:ok, InstanceActor.t()} | {:error, Ecto.Changeset.t()} | {:error, atom}
-  def refresh_instance_actor(%Instance{domain: domain}) do
     %Actor{url: url} = Relay.get_actor()
     %URI{host: host} = URI.new!(url)
 
@@ -48,16 +43,17 @@ defmodule Mobilizon.Service.Workers.RefreshInstances do
         end
 
       with instance_metadata <- fetch_instance_metadata(domain),
-           :ok <- Logger.debug("Ready to save instance actor details"),
+           args <- %{
+             domain: domain,
+             actor_id: actor_id,
+             instance_name: get_in(instance_metadata, ["metadata", "nodeName"]),
+             instance_description: get_in(instance_metadata, ["metadata", "nodeDescription"]),
+             software: get_in(instance_metadata, ["software", "name"]),
+             software_version: get_in(instance_metadata, ["software", "version"])
+           },
+           :ok <- Logger.debug("Ready to save instance actor details #{inspect(args)}"),
            {:ok, %InstanceActor{}} <-
-             Instances.create_instance_actor(%{
+             Instances.create_instance_actor(args) do
-               domain: domain,
-               actor_id: actor_id,
-               instance_name: get_in(instance_metadata, ["metadata", "nodeName"]),
-               instance_description: get_in(instance_metadata, ["metadata", "nodeDescription"]),
-               software: get_in(instance_metadata, ["software", "name"]),
-               software_version: get_in(instance_metadata, ["software", "version"])
-             }) do
         Logger.info("Saved instance actor details for domain #{host}")
       else
         err ->

mix.lock

@@ -4,7 +4,7 @@
   "absinthe_plug": {:hex, :absinthe_plug, "1.5.8", "38d230641ba9dca8f72f1fed2dfc8abd53b3907d1996363da32434ab6ee5d6ab", [:mix], [{:absinthe, "~> 1.5", [hex: :absinthe, repo: "hexpm", optional: false]}, {:plug, "~> 1.4", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "bbb04176647b735828861e7b2705465e53e2cf54ccf5a73ddd1ebd855f996e5a"},
   "argon2_elixir": {:hex, :argon2_elixir, "4.0.0", "7f6cd2e4a93a37f61d58a367d82f830ad9527082ff3c820b8197a8a736648941", [:make, :mix], [{:comeonin, "~> 5.3", [hex: :comeonin, repo: "hexpm", optional: false]}, {:elixir_make, "~> 0.6", [hex: :elixir_make, repo: "hexpm", optional: false]}], "hexpm", "f9da27cf060c9ea61b1bd47837a28d7e48a8f6fa13a745e252556c14f9132c7f"},
   "atomex": {:hex, :atomex, "0.5.1", "706a8241fd6d1719b27a77b6d1192d2f85e6ecc78e6eadab29207d8cb9bb7ae5", [:mix], [{:xml_builder, "~> 2.1", [hex: :xml_builder, repo: "hexpm", optional: false]}], "hexpm", "6248891b5fcab8503982e090eedeeadb757a6311c2ef2e2998b874f7d319ab3f"},
-  "bunt": {:hex, :bunt, "0.2.1", "e2d4792f7bc0ced7583ab54922808919518d0e57ee162901a16a1b6664ef3b14", [:mix], [], "hexpm", "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5"},
+  "bunt": {:hex, :bunt, "1.0.0", "081c2c665f086849e6d57900292b3a161727ab40431219529f13c4ddcf3e7a44", [:mix], [], "hexpm", "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5"},
   "cachex": {:hex, :cachex, "3.6.0", "14a1bfbeee060dd9bec25a5b6f4e4691e3670ebda28c8ba2884b12fe30b36bf8", [:mix], [{:eternal, "~> 1.2", [hex: :eternal, repo: "hexpm", optional: false]}, {:jumper, "~> 1.0", [hex: :jumper, repo: "hexpm", optional: false]}, {:sleeplocks, "~> 1.1", [hex: :sleeplocks, repo: "hexpm", optional: false]}, {:unsafe, "~> 1.0", [hex: :unsafe, repo: "hexpm", optional: false]}], "hexpm", "ebf24e373883bc8e0c8d894a63bbe102ae13d918f790121f5cfe6e485cc8e2e2"},
   "castore": {:hex, :castore, "1.0.5", "9eeebb394cc9a0f3ae56b813459f990abb0a3dedee1be6b27fdb50301930502f", [:mix], [], "hexpm", "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578"},
   "certifi": {:hex, :certifi, "2.12.0", "2d1cca2ec95f59643862af91f001478c9863c2ac9cb6e2f89780bfd8de987329", [:rebar3], [], "hexpm", "ee68d85df22e554040cdb4be100f33873ac6051387baf6a8f6ce82272340ff1c"},
@@ -17,12 +17,12 @@
   "cowboy": {:hex, :cowboy, "2.10.0", "ff9ffeff91dae4ae270dd975642997afe2a1179d94b1887863e43f681a203e26", [:make, :rebar3], [{:cowlib, "2.12.1", [hex: :cowlib, repo: "hexpm", optional: false]}, {:ranch, "1.8.0", [hex: :ranch, repo: "hexpm", optional: false]}], "hexpm", "3afdccb7183cc6f143cb14d3cf51fa00e53db9ec80cdcd525482f5e99bc41d6b"},
   "cowboy_telemetry": {:hex, :cowboy_telemetry, "0.4.0", "f239f68b588efa7707abce16a84d0d2acf3a0f50571f8bb7f56a15865aae820c", [:rebar3], [{:cowboy, "~> 2.7", [hex: :cowboy, repo: "hexpm", optional: false]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "7d98bac1ee4565d31b62d59f8823dfd8356a169e7fcbb83831b8a5397404c9de"},
   "cowlib": {:hex, :cowlib, "2.12.1", "a9fa9a625f1d2025fe6b462cb865881329b5caff8f1854d1cbc9f9533f00e1e1", [:make, :rebar3], [], "hexpm", "163b73f6367a7341b33c794c4e88e7dbfe6498ac42dcd69ef44c5bc5507c8db0"},
-  "credo": {:hex, :credo, "1.7.1", "6e26bbcc9e22eefbff7e43188e69924e78818e2fe6282487d0703652bc20fd62", [:mix], [{:bunt, "~> 0.2.1", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2.8", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2"},
+  "credo": {:hex, :credo, "1.7.2", "fdee3a7cb553d8f2e773569181f0a4a2bb7d192e27e325404cc31b354f59d68c", [:mix], [{:bunt, "~> 0.2.1 or ~> 1.0", [hex: :bunt, repo: "hexpm", optional: false]}, {:file_system, "~> 0.2 or ~> 1.0", [hex: :file_system, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "dd15d6fbc280f6cf9b269f41df4e4992dee6615939653b164ef951f60afcb68e"},
   "credo_code_climate": {:hex, :credo_code_climate, "0.1.0", "1c4efbd11cb0244622ed5f09246b9afbbf796316ce03e78f67db6d81271d2978", [:mix], [{:credo, "~> 1.5", [hex: :credo, repo: "hexpm", optional: false]}, {:jason, "~> 1.2", [hex: :jason, repo: "hexpm", optional: false]}], "hexpm", "75529fe38056f4e229821d604758282838b8397c82e2c12e409fda16b16821ca"},
   "dataloader": {:hex, :dataloader, "2.0.0", "49b42d60b9bb06d761a71d7b034c4b34787957e713d4fae15387a25fcd639112", [:mix], [{:ecto, ">= 3.4.3 and < 4.0.0", [hex: :ecto, repo: "hexpm", optional: true]}, {:opentelemetry_process_propagator, "~> 0.2.1", [hex: :opentelemetry_process_propagator, repo: "hexpm", optional: true]}, {:telemetry, "~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "09d61781b76ce216e395cdbc883ff00d00f46a503e215c22722dba82507dfef0"},
   "db_connection": {:hex, :db_connection, "2.6.0", "77d835c472b5b67fc4f29556dee74bf511bbafecdcaf98c27d27fa5918152086", [:mix], [{:telemetry, "~> 0.4 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "c2f992d15725e721ec7fbc1189d4ecdb8afef76648c746a8e1cad35e3b8a35f3"},
   "decimal": {:hex, :decimal, "2.1.1", "5611dca5d4b2c3dd497dec8f68751f1f1a54755e8ed2a966c2633cf885973ad6", [:mix], [], "hexpm", "53cfe5f497ed0e7771ae1a475575603d77425099ba5faef9394932b35020ffcc"},
-  "dialyxir": {:hex, :dialyxir, "1.4.2", "764a6e8e7a354f0ba95d58418178d486065ead1f69ad89782817c296d0d746a5", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd"},
+  "dialyxir": {:hex, :dialyxir, "1.4.3", "edd0124f358f0b9e95bfe53a9fcf806d615d8f838e2202a9f430d59566b6b53b", [:mix], [{:erlex, ">= 0.2.6", [hex: :erlex, repo: "hexpm", optional: false]}], "hexpm", "bf2cfb75cd5c5006bec30141b131663299c661a864ec7fbbc72dfa557487a986"},
   "digital_token": {:hex, :digital_token, "0.6.0", "13e6de581f0b1f6c686f7c7d12ab11a84a7b22fa79adeb4b50eec1a2d278d258", [:mix], [{:cldr_utils, "~> 2.17", [hex: :cldr_utils, repo: "hexpm", optional: false]}, {:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}], "hexpm", "2455d626e7c61a128b02a4a8caddb092548c3eb613ac6f6a85e4cbb6caddc4d1"},
   "doctor": {:hex, :doctor, "0.21.0", "20ef89355c67778e206225fe74913e96141c4d001cb04efdeba1a2a9704f1ab5", [:mix], [{:decimal, "~> 2.0", [hex: :decimal, repo: "hexpm", optional: false]}], "hexpm", "a227831daa79784eb24cdeedfa403c46a4cb7d0eab0e31232ec654314447e4e0"},
   "earmark_parser": {:hex, :earmark_parser, "1.4.39", "424642f8335b05bb9eb611aa1564c148a8ee35c9c8a8bba6e129d51a3e3c6769", [:mix], [], "hexpm", "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944"},
@@ -74,7 +74,7 @@
   "hammer": {:hex, :hammer, "6.1.0", "f263e3c3e9946bd410ea0336b2abe0cb6260af4afb3a221e1027540706e76c55", [:make, :mix], [{:poolboy, "~> 1.5", [hex: :poolboy, repo: "hexpm", optional: false]}], "hexpm", "b47e415a562a6d072392deabcd58090d8a41182cf9044cdd6b0d0faaaf68ba57"},
   "haversine": {:hex, :haversine, "0.1.0", "14240e90dae07c9459f538d12a811492f655d95fc68f999403503b4f6c4ec522", [:mix], [], "hexpm", "54dc48e895bc18a59437a37026c873634e17b648a64cb87bfafb96f64d607060"},
   "html_entities": {:hex, :html_entities, "0.5.2", "9e47e70598da7de2a9ff6af8758399251db6dbb7eebe2b013f2bbd2515895c3c", [:mix], [], "hexpm", "c53ba390403485615623b9531e97696f076ed415e8d8058b1dbaa28181f4fdcc"},
-  "http_signatures": {:hex, :http_signatures, "0.1.1", "ca7ebc1b61542b163644c8c3b1f0e0f41037d35f2395940d3c6c7deceab41fd8", [:mix], [], "hexpm", "cc3b8a007322cc7b624c0c15eec49ee58ac977254ff529a3c482f681465942a3"},
+  "http_signatures": {:hex, :http_signatures, "0.1.2", "ed1cc7043abcf5bb4f30d68fb7bad9d618ec1a45c4ff6c023664e78b67d9c406", [:mix], [], "hexpm", "f08aa9ac121829dae109d608d83c84b940ef2f183ae50f2dd1e9a8bc619d8be7"},
   "httpoison": {:hex, :httpoison, "1.8.2", "9eb9c63ae289296a544842ef816a85d881d4a31f518a0fec089aaa744beae290", [:mix], [{:hackney, "~> 1.17", [hex: :hackney, repo: "hexpm", optional: false]}], "hexpm", "2bb350d26972e30c96e2ca74a1aaf8293d61d0742ff17f01e0279fef11599921"},
   "icalendar": {:git, "https://github.com/tcitworld/icalendar.git", "1033d922c82a7223db0ec138e2316557b70ff49f", []},
   "idna": {:hex, :idna, "6.1.1", "8a63070e9f7d0c62eb9d9fcb360a7de382448200fbbd1b106cc96d3d8099df8d", [:rebar3], [{:unicode_util_compat, "~> 0.7.0", [hex: :unicode_util_compat, repo: "hexpm", optional: false]}], "hexpm", "92376eb7894412ed19ac475e4a86f7b413c1b9fbb5bd16dccd57934157944cea"},
@@ -110,7 +110,7 @@
   "phoenix_ecto": {:hex, :phoenix_ecto, "4.4.3", "86e9878f833829c3f66da03d75254c155d91d72a201eb56ae83482328dc7ca93", [:mix], [{:ecto, "~> 3.5", [hex: :ecto, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:plug, "~> 1.9", [hex: :plug, repo: "hexpm", optional: false]}], "hexpm", "d36c401206f3011fefd63d04e8ef626ec8791975d9d107f9a0817d426f61ac07"},
   "phoenix_html": {:hex, :phoenix_html, "3.3.3", "380b8fb45912b5638d2f1d925a3771b4516b9a78587249cabe394e0a5d579dc9", [:mix], [{:plug, "~> 1.5", [hex: :plug, repo: "hexpm", optional: true]}], "hexpm", "923ebe6fec6e2e3b3e569dfbdc6560de932cd54b000ada0208b5f45024bdd76c"},
   "phoenix_live_reload": {:hex, :phoenix_live_reload, "1.4.1", "2aff698f5e47369decde4357ba91fc9c37c6487a512b41732818f2204a8ef1d3", [:mix], [{:file_system, "~> 0.2.1 or ~> 0.3", [hex: :file_system, repo: "hexpm", optional: false]}, {:phoenix, "~> 1.4", [hex: :phoenix, repo: "hexpm", optional: false]}], "hexpm", "9bffb834e7ddf08467fe54ae58b5785507aaba6255568ae22b4d46e2bb3615ab"},
-  "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.2", "025391424257d6c1ed2fab5c9fb11b1e5b21a8b47a416659b9a36492217dd5cb", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "381c7f8a5702be838a6bf440a59ea010b458018e1a85cc432e8628641c00f07a"},
+  "phoenix_live_view": {:hex, :phoenix_live_view, "0.20.3", "8b6406bc0a451f295407d7acff7f234a6314be5bbe0b3f90ed82b07f50049878", [:mix], [{:jason, "~> 1.0", [hex: :jason, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6.15 or ~> 1.7.0", [hex: :phoenix, repo: "hexpm", optional: false]}, {:phoenix_html, "~> 3.3 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: false]}, {:phoenix_template, "~> 1.0", [hex: :phoenix_template, repo: "hexpm", optional: false]}, {:phoenix_view, "~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: true]}, {:plug, "~> 1.15", [hex: :plug, repo: "hexpm", optional: false]}, {:telemetry, "~> 0.4.2 or ~> 1.0", [hex: :telemetry, repo: "hexpm", optional: false]}], "hexpm", "a8e4385e05618b424779f894ed2df97d3c7518b7285fcd11979077ae6226466b"},
   "phoenix_pubsub": {:hex, :phoenix_pubsub, "2.1.3", "3168d78ba41835aecad272d5e8cd51aa87a7ac9eb836eabc42f6e57538e3731d", [:mix], [], "hexpm", "bba06bc1dcfd8cb086759f0edc94a8ba2bc8896d5331a1e2c2902bf8e36ee502"},
   "phoenix_swoosh": {:hex, :phoenix_swoosh, "1.2.0", "a544d83fde4a767efb78f45404a74c9e37b2a9c5ea3339692e65a6966731f935", [:mix], [{:finch, "~> 0.8", [hex: :finch, repo: "hexpm", optional: true]}, {:hackney, "~> 1.10", [hex: :hackney, repo: "hexpm", optional: true]}, {:phoenix, "~> 1.6", [hex: :phoenix, repo: "hexpm", optional: true]}, {:phoenix_html, "~> 3.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}, {:phoenix_view, "~> 1.0 or ~> 2.0", [hex: :phoenix_view, repo: "hexpm", optional: false]}, {:swoosh, "~> 1.5", [hex: :swoosh, repo: "hexpm", optional: false]}], "hexpm", "e88d117251e89a16b92222415a6d87b99a96747ddf674fc5c7631de734811dba"},
   "phoenix_template": {:hex, :phoenix_template, "1.0.4", "e2092c132f3b5e5b2d49c96695342eb36d0ed514c5b252a77048d5969330d639", [:mix], [{:phoenix_html, "~> 2.14.2 or ~> 3.0 or ~> 4.0", [hex: :phoenix_html, repo: "hexpm", optional: true]}], "hexpm", "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206"},

mix.nix

@@ -75,12 +75,12 @@ let
 
     bunt = buildMix rec {
       name = "bunt";
-      version = "0.2.1";
+      version = "1.0.0";
 
       src = fetchHex {
         pkg = "bunt";
         version = "${version}";
-        sha256 = "a330bfb4245239787b15005e66ae6845c9cd524a288f0d141c148b02603777a5";
+        sha256 = "dc5f86aa08a5f6fa6b8096f0735c4e76d54ae5c9fa2c143e5a1fc7c1cd9bb6b5";
       };
 
       beamDeps = [];
@@ -101,12 +101,12 @@ let
 
     castore = buildMix rec {
       name = "castore";
-      version = "1.0.4";
+      version = "1.0.5";
 
       src = fetchHex {
         pkg = "castore";
         version = "${version}";
-        sha256 = "9418c1b8144e11656f0be99943db4caf04612e3eaecefb5dae9a2a87565584f8";
+        sha256 = "8d7c597c3e4a64c395980882d4bca3cebb8d74197c590dc272cfd3b6a6310578";
       };
 
       beamDeps = [];
@@ -244,12 +244,12 @@ let
 
     credo = buildMix rec {
       name = "credo";
-      version = "1.7.1";
+      version = "1.7.2";
 
       src = fetchHex {
         pkg = "credo";
         version = "${version}";
-        sha256 = "e9871c6095a4c0381c89b6aa98bc6260a8ba6addccf7f6a53da8849c748a58a2";
+        sha256 = "dd15d6fbc280f6cf9b269f41df4e4992dee6615939653b164ef951f60afcb68e";
       };
 
       beamDeps = [ bunt file_system jason ];
@@ -309,12 +309,12 @@ let
 
     dialyxir = buildMix rec {
       name = "dialyxir";
-      version = "1.4.2";
+      version = "1.4.3";
 
       src = fetchHex {
         pkg = "dialyxir";
         version = "${version}";
-        sha256 = "516603d8067b2fd585319e4b13d3674ad4f314a5902ba8130cd97dc902ce6bbd";
+        sha256 = "bf2cfb75cd5c5006bec30141b131663299c661a864ec7fbbc72dfa557487a986";
       };
 
       beamDeps = [ erlex ];
@@ -348,12 +348,12 @@ let
 
     earmark_parser = buildMix rec {
       name = "earmark_parser";
-      version = "1.4.38";
+      version = "1.4.39";
 
       src = fetchHex {
         pkg = "earmark_parser";
         version = "${version}";
-        sha256 = "2cd0907795aaef0c7e8442e376633c5b3bd6edc8dbbdc539b22f095501c1cdb6";
+        sha256 = "06553a88d1f1846da9ef066b87b57c6f605552cfbe40d20bd8d59cc6bde41944";
       };
 
       beamDeps = [];
@@ -374,12 +374,12 @@ let
 
     ecto = buildMix rec {
       name = "ecto";
-      version = "3.11.0";
+      version = "3.11.1";
 
       src = fetchHex {
         pkg = "ecto";
         version = "${version}";
-        sha256 = "7769dad267ef967310d6e988e92d772659b11b09a0c015f101ce0fff81ce1f81";
+        sha256 = "ebd3d3772cd0dfcd8d772659e41ed527c28b2a8bde4b00fe03e0463da0f1983b";
       };
 
       beamDeps = [ decimal jason telemetry ];
@@ -400,12 +400,12 @@ let
 
     ecto_dev_logger = buildMix rec {
       name = "ecto_dev_logger";
-      version = "0.9.0";
+      version = "0.10.0";
 
       src = fetchHex {
         pkg = "ecto_dev_logger";
         version = "${version}";
-        sha256 = "2e8bc98b4ae4fcc7108896eef7da5a109afad829f4fb2eb46d677fdc9101c2d5";
+        sha256 = "a55e58bad5d5c9b8ef2a3c3347dbdf7efa880a5371cf1457e44b41f489a43927";
       };
 
       beamDeps = [ ecto jason ];
@@ -439,12 +439,12 @@ let
 
     ecto_sql = buildMix rec {
       name = "ecto_sql";
-      version = "3.11.0";
+      version = "3.11.1";
 
       src = fetchHex {
         pkg = "ecto_sql";
         version = "${version}";
-        sha256 = "77aa3677169f55c2714dda7352d563002d180eb33c0dc29cd36d39c0a1a971f5";
+        sha256 = "ce14063ab3514424276e7e360108ad6c2308f6d88164a076aac8a387e1fea634";
       };
 
       beamDeps = [ db_connection ecto postgrex telemetry ];
@@ -530,12 +530,12 @@ let
 
     ex_cldr_calendars = buildMix rec {
       name = "ex_cldr_calendars";
-      version = "1.22.1";
+      version = "1.23.0";
 
       src = fetchHex {
         pkg = "ex_cldr_calendars";
         version = "${version}";
-        sha256 = "e7408cd9e8318b2ef93b76728e84484ddc3ea6d7c894fbc811c54122a7140169";
+        sha256 = "06d2407e699032d5cdc515593b7ce7869f10ce28e98a4ed68d9b21e5001036d4";
       };
 
       beamDeps = [ ex_cldr_numbers ex_doc jason ];
@@ -608,12 +608,12 @@ let
 
     ex_doc = buildMix rec {
       name = "ex_doc";
-      version = "0.30.9";
+      version = "0.31.0";
 
       src = fetchHex {
         pkg = "ex_doc";
         version = "${version}";
-        sha256 = "d7aaaf21e95dc5cddabf89063327e96867d00013963eadf2c6ad135506a8bc10";
+        sha256 = "5350cafa6b7f77bdd107aa2199fe277acf29d739aba5aee7e865fc680c62a110";
       };
 
       beamDeps = [ earmark_parser makeup_elixir makeup_erlang ];
@@ -699,12 +699,12 @@ let
 
     expo = buildMix rec {
       name = "expo";
-      version = "0.4.1";
+      version = "0.5.1";
 
       src = fetchHex {
         pkg = "expo";
         version = "${version}";
-        sha256 = "2ff7ba7a798c8c543c12550fa0e2cbc81b95d4974c65855d8d15ba7b37a1ce47";
+        sha256 = "68a4233b0658a3d12ee00d27d37d856b1ba48607e7ce20fd376958d0ba6ce92b";
       };
 
       beamDeps = [];
@@ -868,12 +868,12 @@ let
 
     gettext = buildMix rec {
       name = "gettext";
-      version = "0.23.1";
+      version = "0.24.0";
 
       src = fetchHex {
         pkg = "gettext";
         version = "${version}";
-        sha256 = "19d744a36b809d810d610b57c27b934425859d158ebd56561bc41f7eeb8795db";
+        sha256 = "bdf75cdfcbe9e4622dd18e034b227d77dd17f0f133853a1c73b97b3d6c770e8b";
       };
 
       beamDeps = [ expo ];
@@ -972,12 +972,12 @@ let
 
     http_signatures = buildMix rec {
       name = "http_signatures";
-      version = "0.1.1";
+      version = "0.1.2";
 
       src = fetchHex {
         pkg = "http_signatures";
         version = "${version}";
-        sha256 = "cc3b8a007322cc7b624c0c15eec49ee58ac977254ff529a3c482f681465942a3";
+        sha256 = "f08aa9ac121829dae109d608d83c84b940ef2f183ae50f2dd1e9a8bc619d8be7";
       };
 
       beamDeps = [];
@@ -1128,12 +1128,12 @@ let
 
     makeup_erlang = buildMix rec {
       name = "makeup_erlang";
-      version = "0.1.2";
+      version = "0.1.3";
 
       src = fetchHex {
         pkg = "makeup_erlang";
         version = "${version}";
-        sha256 = "f3f5a1ca93ce6e092d92b6d9c049bcda58a3b617a8d888f8e7231c85630e8108";
+        sha256 = "b78dc853d2e670ff6390b605d807263bf606da3c82be37f9d7f68635bd886fc9";
       };
 
       beamDeps = [ makeup ];
@@ -1336,12 +1336,12 @@ let
 
     oban = buildMix rec {
       name = "oban";
-      version = "2.16.3";
+      version = "2.17.1";
 
       src = fetchHex {
         pkg = "oban";
         version = "${version}";
-        sha256 = "4d8a7fb62f63cf2f2080c78954425f5fd8916ef57196b7f79b5bc657abb2ac5f";
+        sha256 = "c02686ada7979b00e259c0efbafeae2749f8209747b3460001fe695c5bdbeee6";
       };
 
       beamDeps = [ ecto_sql jason postgrex telemetry ];
@@ -1427,12 +1427,12 @@ let
 
     phoenix_live_view = buildMix rec {
       name = "phoenix_live_view";
-      version = "0.20.1";
+      version = "0.20.3";
 
       src = fetchHex {
         pkg = "phoenix_live_view";
         version = "${version}";
-        sha256 = "be494fd1215052729298b0e97d5c2ce8e719c00854b82cd8cf15c1cd7fcf6294";
+        sha256 = "a8e4385e05618b424779f894ed2df97d3c7518b7285fcd11979077ae6226466b";
       };
 
       beamDeps = [ jason phoenix phoenix_html phoenix_template phoenix_view plug telemetry ];
@@ -1466,12 +1466,12 @@ let
 
     phoenix_template = buildMix rec {
       name = "phoenix_template";
-      version = "1.0.3";
+      version = "1.0.4";
 
       src = fetchHex {
         pkg = "phoenix_template";
         version = "${version}";
-        sha256 = "16f4b6588a4152f3cc057b9d0c0ba7e82ee23afa65543da535313ad8d25d8e2c";
+        sha256 = "2c0c81f0e5c6753faf5cca2f229c9709919aba34fab866d3bc05060c9c444206";
       };
 
       beamDeps = [ phoenix_html ];
@@ -1544,12 +1544,12 @@ let
 
     postgrex = buildMix rec {
       name = "postgrex";
-      version = "0.17.3";
+      version = "0.17.4";
 
       src = fetchHex {
         pkg = "postgrex";
         version = "${version}";
-        sha256 = "946cf46935a4fdca7a81448be76ba3503cff082df42c6ec1ff16a4bdfbfb098d";
+        sha256 = "6458f7d5b70652bc81c3ea759f91736c16a31be000f306d3c64bcdfe9a18b3cc";
       };
 
       beamDeps = [ db_connection decimal jason ];
@@ -1739,12 +1739,12 @@ let
 
     swoosh = buildMix rec {
       name = "swoosh";
-      version = "1.14.1";
+      version = "1.14.3";
 
       src = fetchHex {
         pkg = "swoosh";
         version = "${version}";
-        sha256 = "87da72260b4351678f96aec61db5c2acc8a88cda2cf2c4f534eb4c9c461350c7";
+        sha256 = "6c565103fc8f086bdd96e5c948660af8e20922b7a90a75db261f06a34f805c8b";
       };
 
       beamDeps = [ cowboy gen_smtp hackney jason mime plug plug_cowboy telemetry ];
@@ -1791,12 +1791,12 @@ let
 
     tls_certificate_check = buildRebar3 rec {
       name = "tls_certificate_check";
-      version = "1.20.0";
+      version = "1.21.0";
 
       src = fetchHex {
         pkg = "tls_certificate_check";
         version = "${version}";
-        sha256 = "ab57b74b1a63dc5775650699a3ec032ec0065005eff1f020818742b7312a8426";
+        sha256 = "6cee6cffc35a390840d48d463541d50746a7b0e421acaadb833cfc7961e490e7";
       };
 
       beamDeps = [ ssl_verify_fun ];
@@ -1804,12 +1804,12 @@ let
 
     tz_world = buildMix rec {
       name = "tz_world";
-      version = "1.3.1";
+      version = "1.3.2";
 
       src = fetchHex {
         pkg = "tz_world";
         version = "${version}";
-        sha256 = "901ed2b4a4430ecab3765244da4a19e6f19141867c2ab3753924919b87ed2224";
+        sha256 = "d1a345e07b3378c4c902ad54fbd5d54c8c3dd55dba883b7407fe57bcec45ff2a";
       };
 
       beamDeps = [ castore certifi geo jason ];

package.json

@@ -114,7 +114,7 @@
     "@vitejs/plugin-vue": "^4.0.0",
     "@vitest/coverage-v8": "^0.34.1",
     "@vitest/ui": "^0.34.1",
-    "@vue/eslint-config-prettier": "^8.0.0",
+    "@vue/eslint-config-prettier": "^9.0.0",
     "@vue/eslint-config-typescript": "^12.0.0",
     "@vue/test-utils": "^2.0.2",
     "eslint": "^8.21.0",

src/components/Account/IdentityPicker.vue

@@ -60,16 +60,11 @@ import { useCurrentUserIdentities } from "@/composition/apollo/actor";
 import { computed } from "vue";
 import AccountCircle from "vue-material-design-icons/AccountCircle.vue";
 import { useI18n } from "vue-i18n";
-import { useHead } from "@unhead/vue";
 
 const { identities } = useCurrentUserIdentities();
 
 const { t } = useI18n({ useScope: "global" });
 
-useHead({
-  title: computed(() => t("Identities")),
-});
-
 const props = defineProps<{
   modelValue: IPerson;
 }>();

src/components/Comment/CommentTree.vue

@@ -95,7 +95,7 @@
 
 <script lang="ts" setup>
 import EventComment from "@/components/Comment/EventComment.vue";
-import IdentityPickerWrapper from "@/views/Account/IdentityPickerWrapper.vue";
+import IdentityPickerWrapper from "@/components/Account/IdentityPickerWrapper.vue";
 import { CommentModeration } from "@/types/enums";
 import { CommentModel, IComment } from "../../types/comment.model";
 import {

src/components/Event/EventActionSection.vue

@@ -340,7 +340,7 @@ import { IActor, IPerson } from "@/types/actor";
 import { IEvent } from "@/types/event.model";
 import ParticipationSection from "@/components/Participation/ParticipationSection.vue";
 import ReportModal from "@/components/Report/ReportModal.vue";
-import IdentityPicker from "@/views/Account/IdentityPicker.vue";
+import IdentityPicker from "@/components/Account/IdentityPicker.vue";
 import { EventJoinOptions, ParticipantRole, MemberRole } from "@/types/enums";
 import { GRAPHQL_API_ENDPOINT } from "@/api/_entrypoint";
 import { computed, defineAsyncComponent, inject, onMounted, ref } from "vue";

src/components/core/MaterialIcon.vue

@@ -262,6 +262,8 @@ const icons: Record<string, () => Promise<any>> = {
     import(`../../../node_modules/vue-material-design-icons/PencilOutline.vue`),
   Apps: () =>
     import(`../../../node_modules/vue-material-design-icons/Apps.vue`),
+  Server: () =>
+    import(`../../../node_modules/vue-material-design-icons/Server.vue`),
 };
 
 const props = withDefaults(

src/views/Admin/InstancesView.vue

@@ -72,11 +72,11 @@
             name: RouteName.INSTANCE,
             params: { domain: instance.domain },
           }"
-          class="flex items-center mb-2 rounded bg-mbz-yellow-alt-300 hover:bg-mbz-yellow-alt-200 dark:bg-mbz-purple-600 dark:hover:bg-mbz-purple-700 p-4 flex-wrap justify-center gap-x-2 gap-y-3"
+          class="min-w-0 flex items-center mb-2 rounded bg-mbz-yellow-alt-300 hover:bg-mbz-yellow-alt-200 dark:bg-mbz-purple-600 dark:hover:bg-mbz-purple-700 p-4 flex-wrap md:flex-nowrap justify-center gap-x-2 gap-y-3"
           v-for="instance in instances.elements"
           :key="instance.domain"
         >
-          <div class="grow overflow-hidden flex items-center gap-1">
+          <div class="flex-1 overflow-hidden flex items-center gap-1">
             <img
               class="w-12"
               v-if="instance.software === 'Mobilizon'"
@@ -104,7 +104,7 @@
 
             <div class="">
               <h3
-                class="text-lg truncate font-bold text-slate-800 dark:text-slate-100"
+                class="text-lg truncate font-bold line-clamp-1 text-slate-800 dark:text-slate-100"
                 v-if="instance.instanceName"
               >
                 {{ instance.instanceName }}
@@ -115,52 +115,62 @@
               >
                 {{ instance.domain }}
               </h3>
-              <p
+              <div>
-                v-if="instance.instanceName"
+                <div class="flex flex-wrap gap-x-2 gap-y-1">
-                class="inline-flex gap-2 text-slate-700 dark:text-slate-300"
+                  <p
-              >
+                    v-if="instance.instanceName"
-                <span class="capitalize" v-if="instance.software">{{
+                    class="min-w-0 inline-flex gap-1 truncate text-slate-700 dark:text-slate-300"
-                  instance.software
+                  >
-                }}</span>
+                    <o-icon icon="web" />
-                -
+                    <span>{{ instance.domain }}</span>
-                <span>{{ instance.domain }}</span>
+                  </p>
-              </p>
+                  <p
-              <p
+                    v-if="instance.software"
-                v-else-if="instance.software"
+                    class="capitalize text-slate-700 dark:text-slate-300 inline-flex gap-1"
-                class="capitalize text-slate-700 dark:text-slate-300"
+                  >
-              >
+                    <o-icon icon="server" />
-                {{ instance.software }}
+                    {{ instance.software }}
-              </p>
+                  </p>
-              <span
+                </div>
-                class="text-sm"
+                <div>
-                v-if="instance.followedStatus === InstanceFollowStatus.APPROVED"
+                  <p
-              >
+                    class="inline-flex gap-1 text-slate-700 dark:text-slate-300"
-                <o-icon icon="inbox-arrow-down" />
+                    v-if="
-                {{ t("Followed") }}</span
+                      instance.followedStatus === InstanceFollowStatus.APPROVED
-              >
+                    "
-              <span
+                  >
-                class="text-sm"
+                    <o-icon icon="inbox-arrow-down" />
-                v-else-if="
+                    {{ t("Followed") }}
-                  instance.followedStatus === InstanceFollowStatus.PENDING
+                  </p>
-                "
+                  <p
-              >
+                    class="inline-flex gap-1 text-slate-700 dark:text-slate-300"
-                <o-icon icon="inbox-arrow-down" />
+                    v-else-if="
-                {{ t("Followed, pending response") }}</span
+                      instance.followedStatus === InstanceFollowStatus.PENDING
-              >
+                    "
-              <span
+                  >
-                class="text-sm"
+                    <o-icon icon="inbox-arrow-down" />
-                v-if="instance.followerStatus == InstanceFollowStatus.APPROVED"
+                    {{ t("Followed, pending response") }}
-              >
+                  </p>
-                <o-icon icon="inbox-arrow-up" />
+                  <p
-                {{ t("Follows us") }}</span
+                    class="inline-flex gap-1 text-slate-700 dark:text-slate-300"
-              >
+                    v-if="
-              <span
+                      instance.followerStatus == InstanceFollowStatus.APPROVED
-                class="text-sm"
+                    "
-                v-if="instance.followerStatus == InstanceFollowStatus.PENDING"
+                  >
-              >
+                    <o-icon icon="inbox-arrow-up" />
-                <o-icon icon="inbox-arrow-up" />
+                    {{ t("Follows us") }}
-                {{ t("Follows us, pending approval") }}</span
+                  </p>
-              >
+                  <p
+                    class="inline-flex gap-1 text-slate-700 dark:text-slate-300"
+                    v-else-if="
+                      instance.followerStatus == InstanceFollowStatus.PENDING
+                    "
+                  >
+                    <o-icon icon="inbox-arrow-up" />
+                    {{ t("Follows us, pending approval") }}
+                  </p>
+                </div>
+              </div>
             </div>
           </div>
           <div class="flex-none flex gap-3 ltr:ml-3 rtl:mr-3">

test/federation/node_info_test.exs

@@ -24,7 +24,12 @@ defmodule Mobilizon.Federation.NodeInfoTest do
           url: "https://event-federation.eu/.well-known/nodeinfo"
         },
         _opts ->
-          {:ok, %Tesla.Env{status: 200, body: nodeinfo_data}}
+          {:ok,
+           %Tesla.Env{
+             status: 200,
+             body: nodeinfo_data,
+             headers: [{"content-type", "application/json"}]
+           }}
       end)
 
       assert "https://event-federation.eu/actor-relay" ==
@@ -76,7 +81,12 @@ defmodule Mobilizon.Federation.NodeInfoTest do
           url: "https://mobilizon.fr/.well-known/nodeinfo"
         },
         _opts ->
-          {:ok, %Tesla.Env{status: 200, body: nodeinfo_end_point_data}}
+          {:ok,
+           %Tesla.Env{
+             status: 200,
+             body: nodeinfo_end_point_data,
+             headers: [{"content-type", "application/json"}]
+           }}
       end)
 
       WebfingerClientMock
@@ -86,7 +96,12 @@ defmodule Mobilizon.Federation.NodeInfoTest do
           url: "https://mobilizon.fr/.well-known/nodeinfo/2.1"
         },
         _opts ->
-          {:ok, %Tesla.Env{status: 200, body: nodeinfo_data}}
+          {:ok,
+           %Tesla.Env{
+             status: 200,
+             body: nodeinfo_data,
+             headers: [{"content-type", "application/json"}]
+           }}
       end)
 
       assert {:ok, data} = NodeInfo.nodeinfo("mobilizon.fr")
@@ -107,7 +122,12 @@ defmodule Mobilizon.Federation.NodeInfoTest do
           url: "https://event-federation.eu/.well-known/nodeinfo"
         },
         _opts ->
-          {:ok, %Tesla.Env{status: 200, body: nodeinfo_end_point_data}}
+          {:ok,
+           %Tesla.Env{
+             status: 200,
+             body: nodeinfo_end_point_data,
+             headers: [{"content-type", "application/json"}]
+           }}
       end)
 
       WebfingerClientMock
@@ -117,7 +137,12 @@ defmodule Mobilizon.Federation.NodeInfoTest do
           url: "https://event-federation.eu/wp-json/activitypub/1.0/nodeinfo"
         },
         _opts ->
-          {:ok, %Tesla.Env{status: 200, body: nodeinfo_wp_data}}
+          {:ok,
+           %Tesla.Env{
+             status: 200,
+             body: nodeinfo_wp_data,
+             headers: [{"content-type", "application/json"}]
+           }}
       end)
 
       assert {:ok, data} = NodeInfo.nodeinfo("event-federation.eu")
@@ -138,7 +163,12 @@ defmodule Mobilizon.Federation.NodeInfoTest do
           url: "https://somewhere.tld/.well-known/nodeinfo"
         },
         _opts ->
-          {:ok, %Tesla.Env{status: 200, body: nodeinfo_end_point_data}}
+          {:ok,
+           %Tesla.Env{
+             status: 200,
+             body: nodeinfo_end_point_data,
+             headers: [{"content-type", "application/json"}]
+           }}
       end)
 
       assert {:error, :no_node_info_endpoint_found} = NodeInfo.nodeinfo("somewhere.tld")
@@ -169,7 +199,12 @@ defmodule Mobilizon.Federation.NodeInfoTest do
           url: "https://mobilizon.fr/.well-known/nodeinfo"
         },
         _opts ->
-          {:ok, %Tesla.Env{status: 200, body: nodeinfo_end_point_data}}
+          {:ok,
+           %Tesla.Env{
+             status: 200,
+             body: nodeinfo_end_point_data,
+             headers: [{"content-type", "application/json"}]
+           }}
       end)
 
       WebfingerClientMock

test/service/workers/refresh_instances_test.exs

@@ -5,7 +5,6 @@ defmodule Mobilizon.Service.Workers.RefreshInstancesTest do
 
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Federation.ActivityPub.Relay
-  alias Mobilizon.Instances.Instance
   alias Mobilizon.Service.Workers.RefreshInstances
 
   use Mobilizon.DataCase
@@ -14,7 +13,7 @@ defmodule Mobilizon.Service.Workers.RefreshInstancesTest do
     test "unless if local actor" do
       # relay = Mobilizon.Web.Relay.get_actor()
       assert {:error, :not_remote_instance} ==
-               RefreshInstances.refresh_instance_actor(%Instance{domain: nil})
+               RefreshInstances.refresh_instance_actor(nil)
     end
 
     test "unless if local relay actor" do
@@ -22,7 +21,7 @@ defmodule Mobilizon.Service.Workers.RefreshInstancesTest do
       %URI{host: domain} = URI.new!(url)
 
       assert {:error, :not_remote_instance} ==
-               RefreshInstances.refresh_instance_actor(%Instance{domain: domain})
+               RefreshInstances.refresh_instance_actor(domain)
     end
   end
 end