renaming back and reject nil on create

3 files changed, 3 insertions, 2 deletions

diff --git a/lib/pleroma/filter.ex b/lib/pleroma/filter.ex
index 98cb575a9..5d6df9530 100644
--- a/lib/pleroma/filter.ex
+++ b/lib/pleroma/filter.ex
@@ -110,7 +110,7 @@ defmodule Pleroma.Filter do
     __MODULE__
     |> get_active()
     |> get_irreversible()
-    |> get_by_user(user)
+    |> get_filters(user)
     |> compose_regex(format)
   end
 
diff --git a/lib/pleroma/notification.ex b/lib/pleroma/notification.ex
index d439f51bc..fcb2144ae 100644
--- a/lib/pleroma/notification.ex
+++ b/lib/pleroma/notification.ex
@@ -352,6 +352,7 @@ defmodule Pleroma.Notification do
     end
   end
 
+  @spec create_notifications(Activity.t(), keyword()) :: {:ok, [Notification.t()] | []}
   def create_notifications(activity, options \\ [])
 
   def create_notifications(%Activity{data: %{"to" => _, "type" => "Create"}} = activity, options) do
diff --git a/lib/pleroma/web/mastodon_api/controllers/filter_controller.ex b/lib/pleroma/web/mastodon_api/controllers/filter_controller.ex
index db1ff3189..abbf0ce02 100644
--- a/lib/pleroma/web/mastodon_api/controllers/filter_controller.ex
+++ b/lib/pleroma/web/mastodon_api/controllers/filter_controller.ex
@@ -22,7 +22,7 @@ defmodule Pleroma.Web.MastodonAPI.FilterController do
 
   @doc "GET /api/v1/filters"
   def index(%{assigns: %{user: user}} = conn, _) do
-    filters = Filter.get_by_user(Filter, user)
+    filters = Filter.get_filters(user)
 
     render(conn, "index.json", filters: filters)
   end