pleroma

commit: 47c9b972b9ef5133f588fdcdc4eeda00888d269e
parent: 22c366a85f2a41c1344b863446491c866c47a8a4
Author: Haelwenn <git.pleroma.social@hacktivis.me>
Date:   Wed, 19 Sep 2018 03:53:25 +0000

Merge branch 'fix/fake-filters' into 'develop'

Revert "Mastodon API: Fake support for loading filters"

See merge request pleroma/pleroma!348
Diffstat:
M
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
4
----
M
lib/pleroma/web/router.ex
2
--

2 files changed, 0 insertions(+), 6 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@@ -1189,8 +1189,4 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
       json(conn, [])
     end
   end
-
-  def filters(conn, _) do
-    json(conn, [])
-  end
 end
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
@@ -172,8 +172,6 @@ defmodule Pleroma.Web.Router do
     delete("/filters/:id", MastodonAPIController, :delete_filter)
 
     get("/suggestions", MastodonAPIController, :suggestions)
-
-    get("/filters", MastodonAPIController, :filters)
   end
 
   scope "/api/web", Pleroma.Web.MastodonAPI do