diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-09-17 13:03:46 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-09-17 13:03:46 +0200 |
| commit | 6d5bd4dcc0b5c323718c70a6815a7f46e314d74b (patch) | |
| tree | 5f15ef206ff2c50960e31bc3c2ac023e23d6d9a6 | |
| parent | 6877d7aaad43c3b45d5dd7e13578186563a6fb95 (diff) | |
| download | pleroma-6d5bd4dcc0b5c323718c70a6815a7f46e314d74b.tar.gz | |
TwitterAPI: Use correct endpoint for tag timeline.
| -rw-r--r-- | lib/pleroma/web/router.ex | 2 | ||||
| -rw-r--r-- | test/web/twitter_api/twitter_api_controller_test.exs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 9eb27b879..38ad3ebcb 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -120,7 +120,7 @@ defmodule Pleroma.Web.Router do end get "/search", TwitterAPI.Controller, :search - get "/statusnet/tags/:tag", TwitterAPI.Controller, :public_and_external_timeline + get "/statusnet/tags/timeline/:tag", TwitterAPI.Controller, :public_and_external_timeline get "/externalprofile/show", TwitterAPI.Controller, :external_profile end diff --git a/test/web/twitter_api/twitter_api_controller_test.exs b/test/web/twitter_api/twitter_api_controller_test.exs index 14b9cf47a..a62947018 100644 --- a/test/web/twitter_api/twitter_api_controller_test.exs +++ b/test/web/twitter_api/twitter_api_controller_test.exs @@ -500,7 +500,7 @@ defmodule Pleroma.Web.TwitterAPI.ControllerTest do {:ok, _} = CommonAPI.post(user_two, %{"status" => "This isn't"}) conn = conn - |> get("/api/statusnet/tags/2hu.json") + |> get("/api/statusnet/tags/timeline/2hu.json") assert [status] = json_response(conn, 200) assert status["id"] == activity.id |