TwitterAPI: Use correct endpoint for tag timeline.

diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex
index 9eb27b87957e85396ce4d362a556b392cf3d9ced..38ad3ebcbe7b072c21177b18691b458eec40a923 100644 (file)
--- 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 14b9cf47a7878842246b8a2597abf3b80fd0918f..a62947018ebe6338b025414d93fd47e4de645008 100644 (file)
--- 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