From f4fcea5258a5dbffdf8929887251c64e32c2fd3e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20K=C3=BChl?= <martin.kuehl@gmail.com>
Date: Tue, 18 Sep 2018 11:57:33 +0200
Subject: [PATCH] Revert "Mastodon API: Fake support for loading filters"
This reverts commit c1d07da4e18cc2acd11a5a131e1482aec5996552.
The fake support was superseded by 6e030129fb33926e6a5bd75c27af6f657f9da2a5 which actually implements the faked filters API.
This change removes the fake support and ensures that the actual implementation is used.
---
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 4 ----
lib/pleroma/web/router.ex | 2 --
2 files changed, 6 deletions(-)
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index e5d4245c4..031fc1a5d 100644
--- 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
index 856679899..d324efb7e 100644
--- 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