Merge remote-tracking branch 'origin/develop' into benchmark-finishing

[akkoma] / lib / pleroma / filter.ex

diff --git a/lib/pleroma/filter.ex b/lib/pleroma/filter.ex
index 308bd70e1956c02fe224249e44c9d6c2382ede4b..c8714158208fed5f715db7c8f227372ceb46e1ce 100644 (file)
--- a/lib/pleroma/filter.ex
+++ b/lib/pleroma/filter.ex
@@ -4,11 +4,15 @@
 
 defmodule Pleroma.Filter do
   use Ecto.Schema
-  import Ecto.{Changeset, Query}
-  alias Pleroma.{User, Repo}
+
+  import Ecto.Changeset
+  import Ecto.Query
+
+  alias Pleroma.Repo
+  alias Pleroma.User
 
   schema "filters" do
-    belongs_to(:user, User, type: Pleroma.FlakeId)
+    belongs_to(:user, User, type: FlakeId.Ecto.CompatType)
     field(:filter_id, :integer)
     field(:hide, :boolean, default: false)
     field(:whole_word, :boolean, default: true)
@@ -34,7 +38,8 @@ defmodule Pleroma.Filter do
     query =
       from(
         f in Pleroma.Filter,
-        where: f.user_id == ^user_id
+        where: f.user_id == ^user_id,
+        order_by: [desc: :id]
       )
 
     Repo.all(query)