Add address input and refactor federation stuff

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

lib/service/activity_pub/converters/address.ex

@@ -0,0 +1,58 @@
+defmodule Mobilizon.Service.ActivityPub.Converters.Address do
+  @moduledoc """
+  Flag converter
+
+  This module allows to convert reports from ActivityStream format to our own internal one, and back.
+
+  Note: Reports are named Flag in AS.
+  """
+  alias Mobilizon.Addresses.Address, as: AddressModel
+  alias Mobilizon.Service.ActivityPub.Converter
+
+  @behaviour Converter
+
+  @doc """
+  Converts an AP object data to our internal data structure
+  """
+  @impl Converter
+  @spec as_to_model_data(map()) :: map()
+  def as_to_model_data(object) do
+    res = %{
+      "description" => object["name"],
+      "url" => object["url"]
+    }
+
+    res =
+      if is_nil(object["address"]) do
+        res
+      else
+        Map.merge(res, %{
+          "country" => object["address"]["addressCountry"],
+          "postal_code" => object["address"]["postalCode"],
+          "region" => object["address"]["addressRegion"],
+          "street" => object["address"]["streetAddress"],
+          "locality" => object["address"]["addressLocality"]
+        })
+      end
+
+    if is_nil(object["geo"]) do
+      res
+    else
+      geo = %Geo.Point{
+        coordinates: {object["geo"]["latitude"], object["geo"]["longitude"]},
+        srid: 4326
+      }
+
+      Map.put(res, "geom", geo)
+    end
+  end
+
+  @doc """
+  Convert an event struct to an ActivityStream representation
+  """
+  @impl Converter
+  @spec model_to_as(AddressModel.t()) :: map()
+  def model_to_as(%AddressModel{} = _address) do
+    nil
+  end
+end

lib/service/activity_pub/converters/event.ex

@@ -12,19 +12,28 @@ defmodule Mobilizon.Service.ActivityPub.Converters.Event do
   alias Mobilizon.Service.ActivityPub.Converter
   alias Mobilizon.Events
   alias Mobilizon.Events.Tag
+  alias Mobilizon.Addresses
+  alias Mobilizon.Addresses.Address
 
   @behaviour Converter
 
+  require Logger
+
   @doc """
   Converts an AP object data to our internal data structure
   """
   @impl Converter
   @spec as_to_model_data(map()) :: map()
   def as_to_model_data(object) do
-    with {:ok, %Actor{id: actor_id}} <- Actors.get_actor_by_url(object["actor"]),
-         tags <- fetch_tags(object["tag"]) do
+    Logger.debug("event as_to_model_data")
+
+    with {:actor, {:ok, %Actor{id: actor_id}}} <-
+           {:actor, Actors.get_actor_by_url(object["actor"])},
+         {:address, address_id} <-
+           {:address, get_address(object["location"])},
+         {:tags, tags} <- {:tags, fetch_tags(object["tag"])} do
       picture_id =
-        with true <- Map.has_key?(object, "attachment"),
+        with true <- Map.has_key?(object, "attachment") && length(object["attachment"]) > 0,
              %Picture{id: picture_id} <-
                Media.get_picture_by_url(
                  object["attachment"]
@@ -38,27 +47,64 @@ defmodule Mobilizon.Service.ActivityPub.Converters.Event do
           _ -> nil
         end
 
-      %{
-        "title" => object["name"],
-        "description" => object["content"],
-        "organizer_actor_id" => actor_id,
-        "picture_id" => picture_id,
-        "begins_on" => object["begins_on"],
-        "category" => object["category"],
-        "url" => object["id"],
-        "uuid" => object["uuid"],
-        "tags" => tags
-      }
+      {:ok,
+       %{
+         "title" => object["name"],
+         "description" => object["content"],
+         "organizer_actor_id" => actor_id,
+         "picture_id" => picture_id,
+         "begins_on" => object["startTime"],
+         "category" => object["category"],
+         "url" => object["id"],
+         "uuid" => object["uuid"],
+         "tags" => tags,
+         "physical_address_id" => address_id
+       }}
+    else
+      err ->
+        {:error, err}
+    end
+  end
+
+  defp get_address(%{"id" => url} = map) when is_map(map) and is_binary(url) do
+    Logger.debug("Address with an URL, let's check against our own database")
+
+    case Addresses.get_address_by_url(url) do
+      %Address{id: address_id} ->
+        address_id
+
+      _ ->
+        Logger.debug("not in our database, let's try to create it")
+        map = Map.put(map, "url", map["id"])
+        do_get_address(map)
+    end
+  end
+
+  defp get_address(map) when is_map(map) do
+    do_get_address(map)
+  end
+
+  defp get_address(nil), do: nil
+
+  defp do_get_address(map) do
+    map = Mobilizon.Service.ActivityPub.Converters.Address.as_to_model_data(map)
+
+    case Addresses.create_address(map) do
+      {:ok, %Address{id: address_id}} ->
+        address_id
+
+      _ ->
+        nil
     end
   end
 
   defp fetch_tags(tags) do
     Enum.reduce(tags, [], fn tag, acc ->
-      case Events.get_or_create_tag(tag) do
-        {:ok, %Tag{} = tag} ->
-          acc ++ [tag]
-
-        _ ->
+      with true <- tag["type"] == "Hashtag",
+           {:ok, %Tag{} = tag} <- Events.get_or_create_tag(tag) do
+        acc ++ [tag]
+      else
+        _err ->
           acc
       end
     end)