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

[akkoma] / lib / pleroma / list.ex

diff --git a/lib/pleroma/list.ex b/lib/pleroma/list.ex
index 2c799bc334a2042b4ff20950205ec490aebcefaa..55c4cf6df16fde340043cd4a214363828cadcebc 100644 (file)
--- a/lib/pleroma/list.ex
+++ b/lib/pleroma/list.ex
@@ -1,14 +1,19 @@
 # Pleroma: A lightweight social networking server
-# Copyright © 2017-2018 Pleroma Authors <https://pleroma.social/>
+# Copyright © 2017-2019 Pleroma Authors <https://pleroma.social/>
 # SPDX-License-Identifier: AGPL-3.0-only
 
 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: [])