Correctly handle event update

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

lib/service/activity_pub/activity_pub.ex

@@ -39,21 +39,16 @@ defmodule Mobilizon.Service.ActivityPub do
   @doc """
   Wraps an object into an activity
   """
-  @spec create_activity(map(), boolean()) :: {:ok, %Activity{}} | {:error, any()}
+  @spec create_activity(map(), boolean()) :: {:ok, %Activity{}}
   def create_activity(map, local \\ true) when is_map(map) do
     with map <- lazy_put_activity_defaults(map) do
-      activity = %Activity{
-        data: map,
-        local: local,
-        actor: map["actor"],
-        recipients: get_recipients(map)
-      }
-
-      # Notification.create_notifications(activity)
-      # stream_out(activity)
-      {:ok, activity}
-    else
-      error -> {:error, error}
+      {:ok,
+       %Activity{
+         data: map,
+         local: local,
+         actor: map["actor"],
+         recipients: get_recipients(map)
+       }}
     end
   end
 
@@ -196,7 +191,7 @@ defmodule Mobilizon.Service.ActivityPub do
            "object" => object
          },
          {:ok, activity} <- create_activity(data, local),
-         {:ok, object} <- insert_full_object(data),
+         {:ok, object} <- update_object(object["id"], data),
          :ok <- maybe_federate(activity) do
       {:ok, activity, object}
     end

lib/service/activity_pub/converters/actor.ex

@@ -15,12 +15,30 @@ defmodule Mobilizon.Service.ActivityPub.Converters.Actor do
   @impl Converter
   @spec as_to_model_data(map()) :: map()
   def as_to_model_data(object) do
+    avatar =
+      object["icon"]["url"] &&
+        %{
+          "name" => object["icon"]["name"] || "avatar",
+          "url" => object["icon"]["url"]
+        }
+
+    banner =
+      object["image"]["url"] &&
+        %{
+          "name" => object["image"]["name"] || "banner",
+          "url" => object["image"]["url"]
+        }
+
     %{
       "type" => String.to_existing_atom(object["type"]),
-      "preferred_username" => object["preferred_username"],
+      "preferred_username" => object["preferredUsername"],
       "summary" => object["summary"],
       "url" => object["url"],
-      "name" => object["name"]
+      "name" => object["name"],
+      "avatar" => avatar,
+      "banner" => banner,
+      "keys" => object["publicKey"]["publicKeyPem"],
+      "manually_approves_followers" => object["manuallyApprovesFollowers"]
     }
   end
 

lib/service/activity_pub/converters/event.ex

@@ -57,6 +57,7 @@ defmodule Mobilizon.Service.ActivityPub.Converters.Event do
         "organizer_actor_id" => actor_id,
         "picture_id" => picture_id,
         "begins_on" => object["startTime"],
+        "ends_on" => object["endTime"],
         "category" => object["category"],
         "url" => object["id"],
         "uuid" => object["uuid"],
@@ -173,7 +174,8 @@ defmodule Mobilizon.Service.ActivityPub.Converters.Event do
       "startTime" => event.begins_on |> date_to_string(),
       "endTime" => event.ends_on |> date_to_string(),
       "tag" => event.tags |> build_tags(),
-      "id" => event.url
+      "id" => event.url,
+      "url" => event.url
     }
 
     res =

lib/service/activity_pub/transmogrifier.ex

@@ -295,19 +295,15 @@ defmodule Mobilizon.Service.ActivityPub.Transmogrifier do
         %{"type" => "Update", "object" => %{"type" => object_type} = object, "actor" => _actor_id} =
           data
       )
-      when object_type in ["Person", "Application", "Service", "Organization"] do
+      when object_type in ["Person", "Group", "Application", "Service", "Organization"] do
     case Actors.get_actor_by_url(object["id"]) do
-      {:ok, %Actor{url: url}} ->
-        {:ok, new_actor_data} = ActivityPub.actor_data_from_actor_object(object)
-
-        Actors.insert_or_update_actor(new_actor_data)
-
+      {:ok, %Actor{url: actor_url}} ->
         ActivityPub.update(%{
           local: false,
           to: data["to"] || [],
           cc: data["cc"] || [],
           object: object,
-          actor: url
+          actor: actor_url
         })
 
       e ->
@@ -316,6 +312,28 @@ defmodule Mobilizon.Service.ActivityPub.Transmogrifier do
     end
   end
 
+  def handle_incoming(
+        %{"type" => "Update", "object" => %{"type" => "Event"} = object, "actor" => actor} =
+          _update
+      ) do
+    with {:ok, %{"actor" => existing_organizer_actor_url} = _existing_event_data} <-
+           fetch_obj_helper_as_activity_streams(object),
+         {:ok, %Actor{url: actor_url}} <- actor |> Utils.get_url() |> Actors.get_actor_by_url(),
+         true <- Utils.get_url(existing_organizer_actor_url) == actor_url do
+      ActivityPub.update(%{
+        local: false,
+        to: object["to"] || [],
+        cc: object["cc"] || [],
+        object: object,
+        actor: actor_url
+      })
+    else
+      e ->
+        Logger.debug(inspect(e))
+        :error
+    end
+  end
+
   def handle_incoming(
         %{
           "type" => "Undo",

lib/service/activity_pub/utils.ex

@@ -29,6 +29,8 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
   alias MobilizonWeb.Router.Helpers, as: Routes
   alias MobilizonWeb.Endpoint
 
+  @actor_types ["Group", "Person", "Application"]
+
   # Some implementations send the actor URI as the actor field, others send the entire actor object,
   # so figure out what the actor's URI is based on what we have.
   def get_url(%{"id" => id}), do: id
@@ -119,7 +121,7 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
   @doc """
   Inserts a full object if it is contained in an activity.
   """
-  def insert_full_object(%{"object" => %{"type" => "Event"} = object_data})
+  def insert_full_object(%{"object" => %{"type" => "Event"} = object_data, "type" => "Create"})
       when is_map(object_data) do
     with {:ok, object_data} <-
            Converters.Event.as_to_model_data(object_data),
@@ -128,7 +130,7 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
     end
   end
 
-  def insert_full_object(%{"object" => %{"type" => "Group"} = object_data})
+  def insert_full_object(%{"object" => %{"type" => "Group"} = object_data, "type" => "Create"})
       when is_map(object_data) do
     with object_data <-
            Map.put(object_data, "preferred_username", object_data["preferredUsername"]),
@@ -140,7 +142,7 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
   @doc """
   Inserts a full object if it is contained in an activity.
   """
-  def insert_full_object(%{"object" => %{"type" => "Note"} = object_data})
+  def insert_full_object(%{"object" => %{"type" => "Note"} = object_data, "type" => "Create"})
       when is_map(object_data) do
     with data <- Converters.Comment.as_to_model_data(object_data),
          {:ok, %Comment{} = comment} <- Events.create_comment(data) do
@@ -177,6 +179,39 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
 
   def insert_full_object(_), do: {:ok, nil}
 
+  @doc """
+  Update an object
+  """
+  @spec update_object(struct(), map()) :: {:ok, struct()} | any()
+  def update_object(object, object_data)
+
+  def update_object(event_url, %{
+        "object" => %{"type" => "Event"} = object_data,
+        "type" => "Update"
+      })
+      when is_map(object_data) do
+    with {:event_not_found, %Event{} = event} <-
+           {:event_not_found, Events.get_event_by_url(event_url)},
+         {:ok, object_data} <- Converters.Event.as_to_model_data(object_data),
+         {:ok, %Event{} = event} <- Events.update_event(event, object_data) do
+      {:ok, event}
+    end
+  end
+
+  def update_object(actor_url, %{
+        "object" => %{"type" => type_actor} = object_data,
+        "type" => "Update"
+      })
+      when is_map(object_data) and type_actor in @actor_types do
+    with {:ok, %Actor{} = actor} <- Actors.get_actor_by_url(actor_url),
+         object_data <- Converters.Actor.as_to_model_data(object_data),
+         {:ok, %Actor{} = actor} <- Actors.update_actor(actor, object_data) do
+      {:ok, actor}
+    end
+  end
+
+  def update_object(_, _), do: {:ok, nil}
+
   #### Like-related helpers
 
   #  @doc """
@@ -264,7 +299,8 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
           String.t(),
           map(),
           list(),
-          map()
+          map(),
+          String.t()
         ) :: map()
   def make_event_data(
         actor,
@@ -273,10 +309,12 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
         content_html,
         picture \\ nil,
         tags \\ [],
-        metadata \\ %{}
+        metadata \\ %{},
+        uuid \\ nil,
+        url \\ nil
       ) do
     Logger.debug("Making event data")
-    uuid = Ecto.UUID.generate()
+    uuid = uuid || Ecto.UUID.generate()
 
     res = %{
       "type" => "Event",
@@ -285,9 +323,10 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
       "content" => content_html,
       "name" => title,
       "startTime" => metadata.begins_on,
+      "endTime" => metadata.ends_on,
       "category" => metadata.category,
       "actor" => actor,
-      "id" => Routes.page_url(Endpoint, :event, uuid),
+      "id" => url || Routes.page_url(Endpoint, :event, uuid),
       "uuid" => uuid,
       "tag" =>
         tags |> Enum.uniq() |> Enum.map(fn tag -> %{"type" => "Hashtag", "name" => "##{tag}"} end)
@@ -505,7 +544,7 @@ defmodule Mobilizon.Service.ActivityPub.Utils do
         activity_id,
         public
       )
-      when type in ["Group", "Person", "Application"] do
+      when type in @actor_types do
     do_make_announce_data(actor_url, actor_followers_url, url, url, activity_id, public)
   end