[#468] Merged `upstream/develop`, resolved conflicts.

[akkoma] / lib / pleroma / list.ex

diff --git a/lib/pleroma/list.ex b/lib/pleroma/list.ex
index a75dc006ee6a661fc6b0f729e07068df8dad97dc..55c4cf6df16fde340043cd4a214363828cadcebc 100644 (file)
--- a/lib/pleroma/list.ex
+++ b/lib/pleroma/list.ex
@@ -4,11 +4,16 @@
 
 defmodule Pleroma.List do
   use Ecto.Schema
-  import Ecto.{Changeset, Query}
-  alias Pleroma.{User, Repo, Activity}
+
+  import Ecto.Query
+  import Ecto.Changeset
+
+  alias Pleroma.Activity
+  alias Pleroma.Repo
+  alias Pleroma.User
 
   schema "lists" do
-    belongs_to(:user, Pleroma.User)
+    belongs_to(:user, User, type: Pleroma.FlakeId)
     field(:title, :string)
     field(:following, {:array, :string}, default: [])