Correctly handle event update

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

test/mobilizon/actors/actors_test.exs

@@ -270,10 +270,8 @@ defmodule Mobilizon.ActorsTest do
       assert %Actor{} = actor
       assert actor.summary == "some updated description"
       assert actor.name == "some updated name"
-      assert actor.domain == "some updated domain"
       assert actor.keys == "some updated keys"
       refute actor.suspended
-      assert actor.preferred_username == "some updated username"
     end
 
     test "update_actor/2 with valid data updates the actor and it's media files", %{
@@ -310,10 +308,8 @@ defmodule Mobilizon.ActorsTest do
       assert %Actor{} = actor
       assert actor.summary == "some updated description"
       assert actor.name == "some updated name"
-      assert actor.domain == "some updated domain"
       assert actor.keys == "some updated keys"
       refute actor.suspended
-      assert actor.preferred_username == "some updated username"
 
       refute File.exists?(
                Mobilizon.CommonConfig.get!([MobilizonWeb.Uploaders.Local, :uploads]) <>

test/mobilizon/service/activity_pub/activity_pub_test.exs

@@ -9,6 +9,7 @@ defmodule Mobilizon.Service.ActivityPub.ActivityPubTest do
   import Mobilizon.Factory
 
   alias Mobilizon.Events
+  alias Mobilizon.Events.Event
   alias Mobilizon.Actors.Actor
   alias Mobilizon.Actors
   alias Mobilizon.Service.HTTPSignatures.Signature
@@ -137,11 +138,14 @@ defmodule Mobilizon.Service.ActivityPub.ActivityPubTest do
   end
 
   describe "update" do
+    @updated_actor_summary "This is an updated actor"
+
     test "it creates an update activity with the new actor data" do
       actor = insert(:actor)
       actor_data = MobilizonWeb.ActivityPub.ActorView.render("actor.json", %{actor: actor})
+      actor_data = Map.put(actor_data, "summary", @updated_actor_summary)
 
-      {:ok, update, _} =
+      {:ok, update, updated_actor} =
         ActivityPub.update(%{
           actor: actor_data["url"],
           to: [actor.url <> "/followers"],
@@ -153,6 +157,42 @@ defmodule Mobilizon.Service.ActivityPub.ActivityPubTest do
       assert update.data["to"] == [actor.url <> "/followers"]
       assert update.data["object"]["id"] == actor_data["id"]
       assert update.data["object"]["type"] == actor_data["type"]
+      assert update.data["object"]["summary"] == @updated_actor_summary
+
+      refute updated_actor.summary == actor.summary
+
+      {:ok, %Actor{} = database_actor} = Mobilizon.Actors.get_actor_by_url(actor.url)
+      assert database_actor.summary == @updated_actor_summary
+      assert database_actor.preferred_username == actor.preferred_username
+    end
+
+    @updated_start_time DateTime.utc_now() |> DateTime.truncate(:second)
+
+    test "it creates an update activity with the new event data" do
+      actor = insert(:actor)
+      event = insert(:event, organizer_actor: actor)
+      event_data = Mobilizon.Service.ActivityPub.Converters.Event.model_to_as(event)
+      event_data = Map.put(event_data, "startTime", @updated_start_time)
+
+      {:ok, update, updated_event} =
+        ActivityPub.update(%{
+          actor: actor.url,
+          to: [actor.url <> "/followers"],
+          cc: [],
+          object: event_data
+        })
+
+      assert update.data["actor"] == actor.url
+      assert update.data["to"] == [actor.url <> "/followers"]
+      assert update.data["object"]["id"] == event_data["id"]
+      assert update.data["object"]["type"] == event_data["type"]
+      assert update.data["object"]["startTime"] == @updated_start_time
+
+      refute updated_event.begins_on == event.begins_on
+
+      %Event{} = database_event = Mobilizon.Events.get_event_by_url(event.url)
+      assert database_event.begins_on == @updated_start_time
+      assert database_event.title == event.title
     end
   end
 end

test/mobilizon/service/activity_pub/converters/actor_test.exs

@@ -17,7 +17,7 @@ defmodule Mobilizon.Service.ActivityPub.Converters.ActorTest do
       actor =
         ActorConverter.as_to_model_data(%{
           "type" => "Person",
-          "preferred_username" => "test_account"
+          "preferredUsername" => "test_account"
         })
 
       assert actor["type"] == :Person

test/mobilizon/service/activity_pub/transmogrifier_test.exs

@@ -330,7 +330,7 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
       assert data["object"] == comment.url
     end
 
-    test "it works for incoming update activities" do
+    test "it works for incoming update activities on actors" do
       data = File.read!("test/fixtures/mastodon-post-activity.json") |> Jason.decode!()
 
       {:ok, %Activity{data: data, local: false}, _} = Transmogrifier.handle_incoming(data)
@@ -349,11 +349,37 @@ defmodule Mobilizon.Service.ActivityPub.TransmogrifierTest do
       {:ok, %Activity{data: data, local: false}, _} = Transmogrifier.handle_incoming(update_data)
 
       {:ok, %Actor{} = actor} = Actors.get_actor_by_url(data["actor"])
-      assert actor.name == "gargle"
+      assert actor.name == "nextsoft"
 
       assert actor.summary == "<p>Some bio</p>"
     end
 
+    test "it works for incoming update activities on events" do
+      data = File.read!("test/fixtures/mobilizon-post-activity.json") |> Jason.decode!()
+
+      {:ok, %Activity{data: data, local: false}, _} = Transmogrifier.handle_incoming(data)
+      update_data = File.read!("test/fixtures/mastodon-update.json") |> Jason.decode!()
+
+      object =
+        data["object"]
+        |> Map.put("actor", data["actor"])
+        |> Map.put("name", "My updated event")
+        |> Map.put("id", data["object"]["id"])
+        |> Map.put("type", "Event")
+
+      update_data =
+        update_data
+        |> Map.put("actor", data["actor"])
+        |> Map.put("object", object)
+
+      {:ok, %Activity{data: data, local: false}, _} = Transmogrifier.handle_incoming(update_data)
+
+      %Event{} = event = Events.get_event_by_url(data["object"]["id"])
+      assert event.title == "My updated event"
+
+      assert event.description == data["object"]["content"]
+    end
+
     #     test "it works for incoming update activities which lock the account" do
     #       data = File.read!("test/fixtures/mastodon-post-activity.json") |> Jason.decode!()