sergiotarxz/Pleroma
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

TwitterAPI: Use correct endpoint for tag timeline.

Browse Source
This commit is contained in:
Roger Braun 2017-09-17 13:03:46 +02:00
parent 6877d7aaad
commit 6d5bd4dcc0
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -120,7 +120,7 @@ def user_fetcher(username) do
end end
get "/search", TwitterAPI.Controller, :search 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 get "/externalprofile/show", TwitterAPI.Controller, :external_profile
end end

2
test/web/twitter_api/twitter_api_controller_test.exs
View File

@ -500,7 +500,7 @@ test "it returns the tags timeline" do
{:ok, _} = CommonAPI.post(user_two, %{"status" => "This isn't"}) {:ok, _} = CommonAPI.post(user_two, %{"status" => "This isn't"})
conn = conn conn = conn
|> get("/api/statusnet/tags/2hu.json") |> get("/api/statusnet/tags/timeline/2hu.json")
assert [status] = json_response(conn, 200) assert [status] = json_response(conn, 200)
assert status["id"] == activity.id assert status["id"] == activity.id