Add address input and refactor federation stuff

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

lib/mobilizon_web/resolvers/address.ex

@@ -11,7 +11,7 @@ defmodule MobilizonWeb.Resolvers.Address do
   Search an address
   """
   @spec search(map(), map(), map()) :: {:ok, list(Address.t())}
-  def search(_parent, %{query: query}, %{context: %{ip: ip}}) do
+  def search(_parent, %{query: query, page: _page, limit: _limit}, %{context: %{ip: ip}}) do
     country = Geolix.lookup(ip) |> Map.get(:country, nil)
 
     local_addresses = Task.async(fn -> Addresses.search_addresses(query, country: country) end)

lib/mobilizon_web/resolvers/comment.ex

@@ -11,14 +11,10 @@ defmodule MobilizonWeb.Resolvers.Comment do
   def create_comment(_parent, %{text: comment, actor_username: username}, %{
         context: %{current_user: %User{} = _user}
       }) do
-    with {:ok, %Activity{data: %{"object" => %{"type" => "Note"} = object}}} <-
+    with {:ok, %Activity{data: %{"object" => %{"type" => "Note"} = _object}},
+          %Comment{} = comment} <-
            Comments.create_comment(username, comment) do
-      {:ok,
-       %Comment{
-         text: object["content"],
-         url: object["id"],
-         uuid: object["uuid"]
-       }}
+      {:ok, comment}
     end
   end
 

lib/mobilizon_web/resolvers/event.ex

@@ -3,6 +3,8 @@ defmodule MobilizonWeb.Resolvers.Event do
   Handles the event-related GraphQL calls
   """
   alias Mobilizon.Activity
+  alias Mobilizon.Addresses
+  alias Mobilizon.Addresses.Address
   alias Mobilizon.Events
   alias Mobilizon.Events.{Event, Participant}
   alias Mobilizon.Media.Picture
@@ -190,25 +192,10 @@ defmodule MobilizonWeb.Resolvers.Event do
   """
   def create_event(_parent, args, %{context: %{current_user: _user}} = _resolution) do
     with {:ok, args} <- save_attached_picture(args),
-         {:ok, %Activity{data: %{"object" => %{"type" => "Event"} = object}}} <-
+         {:ok, args} <- save_physical_address(args),
+         {:ok, %Activity{data: %{"object" => %{"type" => "Event"} = _object}}, %Event{} = event} <-
            MobilizonWeb.API.Events.create_event(args) do
-      res = %{
-        title: object["name"],
-        description: object["content"],
-        uuid: object["uuid"],
-        url: object["id"]
-      }
-
-      res =
-        if Map.has_key?(object, "attachment"),
-          do:
-            Map.put(res, :picture, %{
-              name: object["attachment"] |> hd() |> Map.get("name"),
-              url: object["attachment"] |> hd() |> Map.get("url") |> hd() |> Map.get("href")
-            }),
-          else: res
-
-      {:ok, res}
+      {:ok, event}
     end
   end
 
@@ -237,6 +224,25 @@ defmodule MobilizonWeb.Resolvers.Event do
   @spec save_attached_picture(map()) :: {:ok, map()}
   defp save_attached_picture(args), do: {:ok, args}
 
+  @spec save_physical_address(map()) :: {:ok, map()}
+  defp save_physical_address(%{physical_address: %{url: physical_address_url}} = args) do
+    with %Address{} = address <- Addresses.get_address_by_url(physical_address_url),
+         args <- Map.put(args, :physical_address, address) do
+      {:ok, args}
+    end
+  end
+
+  #  @spec save_physical_address(map()) :: {:ok, map()}
+  #  defp save_physical_address(%{physical_address: address} = args) do
+  #    with {:ok, %Address{} = address} <- Addresses.create_address(address),
+  #         args <- Map.put(args, :physical_address, address) do
+  #      {:ok, args}
+  #    end
+  #  end
+
+  @spec save_physical_address(map()) :: {:ok, map()}
+  defp save_physical_address(args), do: {:ok, args}
+
   @doc """
   Delete an event
   """

lib/mobilizon_web/resolvers/group.ex

@@ -47,20 +47,15 @@ defmodule MobilizonWeb.Resolvers.Group do
            :ok,
            %Activity{
              data: %{
-               "object" => %{"type" => "Group"} = object
+               "object" => %{"type" => "Group"} = _object
              }
-           }
+           },
+           %Actor{} = group
          } <-
            MobilizonWeb.API.Groups.create_group(args) do
       {
         :ok,
-        %Actor{
-          preferred_username: object["preferredUsername"],
-          summary: object["summary"],
-          type: :Group,
-          #  uuid: object["uuid"],
-          url: object["id"]
-        }
+        group
       }
     end