Add admin interface to manage instances subscriptions

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

lib/mobilizon_web/api/follows.ex

@@ -12,8 +12,8 @@ defmodule MobilizonWeb.API.Follows do
 
   def follow(%Actor{} = follower, %Actor{} = followed) do
     case ActivityPub.follow(follower, followed) do
-      {:ok, activity, _} ->
-        {:ok, activity}
+      {:ok, activity, follow} ->
+        {:ok, activity, follow}
 
       e ->
         Logger.warn("Error while following actor: #{inspect(e)}")
@@ -23,8 +23,8 @@ defmodule MobilizonWeb.API.Follows do
 
   def unfollow(%Actor{} = follower, %Actor{} = followed) do
     case ActivityPub.unfollow(follower, followed) do
-      {:ok, activity, _} ->
-        {:ok, activity}
+      {:ok, activity, follow} ->
+        {:ok, activity, follow}
 
       e ->
         Logger.warn("Error while unfollowing actor: #{inspect(e)}")
@@ -33,15 +33,35 @@ defmodule MobilizonWeb.API.Follows do
   end
 
   def accept(%Actor{} = follower, %Actor{} = followed) do
+    Logger.debug("We're trying to accept a follow")
+
     with %Follower{approved: false} = follow <-
            Actors.is_following(follower, followed),
-         {:ok, %Activity{} = activity, %Follower{approved: true}} <-
+         {:ok, %Activity{} = activity, %Follower{approved: true} = follow} <-
            ActivityPub.accept(
              :follow,
              follow,
-             %{approved: true}
+             true
            ) do
-      {:ok, activity}
+      {:ok, activity, follow}
+    else
+      %Follower{approved: true} ->
+        {:error, "Follow already accepted"}
+    end
+  end
+
+  def reject(%Actor{} = follower, %Actor{} = followed) do
+    Logger.debug("We're trying to reject a follow")
+
+    with %Follower{} = follow <-
+           Actors.is_following(follower, followed),
+         {:ok, %Activity{} = activity, %Follower{} = follow} <-
+           ActivityPub.reject(
+             :follow,
+             follow,
+             true
+           ) do
+      {:ok, activity, follow}
     else
       %Follower{approved: true} ->
         {:error, "Follow already accepted"}

lib/mobilizon_web/api/groups.ex

@@ -17,7 +17,8 @@ defmodule MobilizonWeb.API.Groups do
            args |> Map.get(:preferred_username) |> HtmlSanitizeEx.strip_tags() |> String.trim(),
          {:existing_group, nil} <-
            {:existing_group, Actors.get_local_group_by_title(preferred_username)},
-         {:ok, %Activity{} = activity, %Actor{} = group} <- ActivityPub.create(:group, args, true) do
+         {:ok, %Activity{} = activity, %Actor{} = group} <-
+           ActivityPub.create(:group, args, true, %{"actor" => args.creator_actor.url}) do
       {:ok, activity, group}
     else
       {:existing_group, _} ->

lib/mobilizon_web/api/participations.ex

@@ -4,7 +4,6 @@ defmodule MobilizonWeb.API.Participations do
   """
 
   alias Mobilizon.Actors.Actor
-  alias Mobilizon.Events
   alias Mobilizon.Events.{Event, Participant}
   alias Mobilizon.Service.ActivityPub
   alias MobilizonWeb.Email.Participation
@@ -36,16 +35,13 @@ defmodule MobilizonWeb.API.Participations do
          %Participant{} = participation,
          %Actor{} = moderator
        ) do
-    with {:ok, activity, _} <-
+    with {:ok, activity, %Participant{role: :participant} = participation} <-
            ActivityPub.accept(
              :join,
              participation,
-             %{role: :participant},
              true,
-             %{"to" => [moderator.url]}
+             %{"actor" => moderator.url}
            ),
-         {:ok, %Participant{role: :participant} = participation} <-
-           Events.update_participant(participation, %{"role" => :participant}),
          :ok <- Participation.send_emails_to_local_user(participation) do
       {:ok, activity, participation}
     end
@@ -55,17 +51,12 @@ defmodule MobilizonWeb.API.Participations do
          %Participant{} = participation,
          %Actor{} = moderator
        ) do
-    with {:ok, activity, _} <-
+    with {:ok, activity, %Participant{role: :rejected} = participation} <-
            ActivityPub.reject(
-             %{
-               to: [participation.actor.url],
-               actor: moderator.url,
-               object: participation.url
-             },
-             "#{MobilizonWeb.Endpoint.url()}/reject/join/#{participation.id}"
+             :join,
+             participation,
+             %{"actor" => moderator.url}
            ),
-         {:ok, %Participant{role: :rejected} = participation} <-
-           Events.update_participant(participation, %{"role" => :rejected}),
          :ok <- Participation.send_emails_to_local_user(participation) do
       {:ok, activity, participation}
     end

lib/mobilizon_web/api/reports.ex

@@ -17,7 +17,7 @@ defmodule MobilizonWeb.API.Reports do
   Create a report/flag on an actor, and optionally on an event or on comments.
   """
   def report(args) do
-    case {:make_activity, ActivityPub.flag(args, Map.get(args, :local, false) == false)} do
+    case {:make_activity, ActivityPub.flag(args, Map.get(args, :forward, false) == true)} do
       {:make_activity, {:ok, %Activity{} = activity, %Report{} = report}} ->
         {:ok, activity, report}