moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Revert "Mastodon API: Fake support for loading filters"

See merge request pleroma/pleroma!348
This commit is contained in:
Haelwenn 2018-09-19 03:53:25 +00:00
parent 22c366a85f f4fcea5258
commit 47c9b972b9
2 changed files with 0 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View File

@ -1189,8 +1189,4 @@ def suggestions(%{assigns: %{user: user}} = conn, _) do
json(conn, []) json(conn, [])
end end
end end
def filters(conn, _) do
json(conn, [])
end
end end

2
lib/pleroma/web/router.ex
View File

@ -172,8 +172,6 @@ defmodule Pleroma.Web.Router do
delete("/filters/:id", MastodonAPIController, :delete_filter) delete("/filters/:id", MastodonAPIController, :delete_filter)
get("/suggestions", MastodonAPIController, :suggestions) get("/suggestions", MastodonAPIController, :suggestions)
get("/filters", MastodonAPIController, :filters)
end end
scope "/api/web", Pleroma.Web.MastodonAPI do scope "/api/web", Pleroma.Web.MastodonAPI do