Refactor media upload

Use Upload Media logic from Pleroma

Backend changes for picture upload

Move AS <-> Model conversion to separate module

Front changes

Downgrade apollo-client: https://github.com/Akryum/vue-apollo/issues/577

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

lib/mobilizon/actors/actor.ex

@@ -33,6 +33,7 @@ defmodule Mobilizon.Actors.Actor do
   alias Mobilizon.Users.User
   alias Mobilizon.Actors.{Actor, Follower, Member}
   alias Mobilizon.Events.{Event, FeedToken}
+  alias Mobilizon.Media.File
 
   alias MobilizonWeb.Router.Helpers, as: Routes
   alias MobilizonWeb.Endpoint
@@ -62,8 +63,6 @@ defmodule Mobilizon.Actors.Actor do
     field(:openness, Mobilizon.Actors.ActorOpennessEnum, default: :moderated)
     field(:visibility, Mobilizon.Actors.ActorVisibilityEnum, default: :private)
     field(:suspended, :boolean, default: false)
-    field(:avatar_url, :string)
-    field(:banner_url, :string)
     # field(:openness, Mobilizon.Actors.ActorOpennessEnum, default: :moderated)
     has_many(:followers, Follower, foreign_key: :target_actor_id)
     has_many(:followings, Follower, foreign_key: :actor_id)
@@ -71,6 +70,8 @@ defmodule Mobilizon.Actors.Actor do
     many_to_many(:memberships, Actor, join_through: Member)
     belongs_to(:user, User)
     has_many(:feed_tokens, FeedToken, foreign_key: :actor_id)
+    embeds_one(:avatar, File)
+    embeds_one(:banner, File)
 
     timestamps()
   end
@@ -93,11 +94,11 @@ defmodule Mobilizon.Actors.Actor do
       :keys,
       :manually_approves_followers,
       :suspended,
-      :avatar_url,
-      :banner_url,
       :user_id
     ])
     |> build_urls()
+    |> cast_embed(:avatar)
+    |> cast_embed(:banner)
     |> unique_username_validator()
     |> validate_required([:preferred_username, :keys, :suspended, :url])
     |> unique_constraint(:preferred_username, name: :actors_preferred_username_domain_type_index)
@@ -119,10 +120,11 @@ defmodule Mobilizon.Actors.Actor do
       :suspended,
       :url,
       :type,
-      :avatar_url,
       :user_id
     ])
     |> build_urls()
+    |> cast_embed(:avatar)
+    |> cast_embed(:banner)
     # Needed because following constraint can't work for domain null values (local)
     |> unique_username_validator()
     |> unique_constraint(:preferred_username, name: :actors_preferred_username_domain_type_index)
@@ -152,9 +154,7 @@ defmodule Mobilizon.Actors.Actor do
         :summary,
         :preferred_username,
         :keys,
-        :manually_approves_followers,
-        :avatar_url,
-        :banner_url
+        :manually_approves_followers
       ])
       |> validate_required([
         :url,
@@ -165,6 +165,8 @@ defmodule Mobilizon.Actors.Actor do
         :preferred_username,
         :keys
       ])
+      |> cast_embed(:avatar)
+      |> cast_embed(:banner)
       # Needed because following constraint can't work for domain null values (local)
       |> unique_username_validator()
       |> unique_constraint(:preferred_username, name: :actors_preferred_username_domain_type_index)
@@ -193,10 +195,10 @@ defmodule Mobilizon.Actors.Actor do
       :name,
       :domain,
       :summary,
-      :preferred_username,
-      :avatar_url,
-      :banner_url
+      :preferred_username
     ])
+    |> cast_embed(:avatar)
+    |> cast_embed(:banner)
     |> build_urls(:Group)
     |> put_change(:domain, nil)
     |> put_change(:keys, Actors.create_keys())

lib/mobilizon/actors/actors.ex

@@ -11,7 +11,7 @@ defmodule Mobilizon.Actors do
   alias Mobilizon.Actors.{Actor, Bot, Member, Follower}
 
   alias Mobilizon.Service.ActivityPub
-  # import Exgravatar
+  require Logger
 
   @doc false
   def data() do
@@ -57,9 +57,12 @@ defmodule Mobilizon.Actors do
   end
 
   # Get actor by ID and preload organized events, followers and followings
-  @spec get_actor_with_everything(integer()) :: Ecto.Query
+  @spec get_actor_with_everything(integer()) :: Ecto.Query.t()
   defp do_get_actor_with_everything(id) do
-    from(a in Actor, where: a.id == ^id, preload: [:organized_events, :followers, :followings])
+    from(a in Actor,
+      where: a.id == ^id,
+      preload: [:organized_events, :followers, :followings]
+    )
   end
 
   @doc """
@@ -239,24 +242,29 @@ defmodule Mobilizon.Actors do
   """
   @spec insert_or_update_actor(map(), boolean()) :: {:ok, Actor.t()}
   def insert_or_update_actor(data, preload \\ false) do
-    cs = Actor.remote_actor_creation(data)
+    cs =
+      data
+      |> Actor.remote_actor_creation()
 
-    {:ok, actor} =
-      Repo.insert(
-        cs,
-        on_conflict: [
-          set: [
-            keys: data.keys,
-            avatar_url: data.avatar_url,
-            banner_url: data.banner_url,
-            name: data.name,
-            summary: data.summary
-          ]
-        ],
-        conflict_target: [:url]
-      )
-
-    if preload, do: {:ok, Repo.preload(actor, [:followers])}, else: {:ok, actor}
+    with {:ok, actor} <-
+           Repo.insert(
+             cs,
+             on_conflict: [
+               set: [
+                 keys: data.keys,
+                 name: data.name,
+                 summary: data.summary
+               ]
+             ],
+             conflict_target: [:url]
+           ) do
+      actor = if preload, do: Repo.preload(actor, [:followers]), else: actor
+      {:ok, actor}
+    else
+      err ->
+        Logger.error(inspect(err))
+        {:error, err}
+    end
   end
 
   #  def increase_event_count(%Actor{} = actor) do
@@ -291,7 +299,8 @@ defmodule Mobilizon.Actors do
         {:error, :actor_not_found}
 
       actor ->
-        if preload, do: {:ok, Repo.preload(actor, [:followers])}, else: {:ok, actor}
+        actor = if preload, do: Repo.preload(actor, [:followers]), else: actor
+        {:ok, actor}
     end
   end
 
@@ -371,7 +380,11 @@ defmodule Mobilizon.Actors do
   """
   @spec get_local_actor_by_name(String.t()) :: Actor.t() | nil
   def get_local_actor_by_name(name) do
-    Repo.one(from(a in Actor, where: a.preferred_username == ^name and is_nil(a.domain)))
+    Repo.one(
+      from(a in Actor,
+        where: a.preferred_username == ^name and is_nil(a.domain)
+      )
+    )
   end
 
   @doc """
@@ -435,6 +448,7 @@ defmodule Mobilizon.Actors do
             {:ok, actor}
 
           _ ->
+            Logger.error("Could not fetch by AP id")
             {:error, "Could not fetch by AP id"}
         end
     end