hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

TwitterAPI: Add /users/show.

Browse source
This commit is contained in:
eal 2017-11-14 17:34:48 +02:00
commit f9828e578c
3 changed files with 54 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

1
lib/pleroma/web/router.ex
View file

@ -140,6 +140,7 @@ defmodule Pleroma.Web.Router do
get "/statuses/networkpublic_timeline", TwitterAPI.Controller, :public_and_external_timeline
get "/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
get "/qvitter/statuses/user_timeline", TwitterAPI.Controller, :user_timeline
get "/users/show", TwitterAPI.Controller, :show_user
get "/statuses/show/:id", TwitterAPI.Controller, :fetch_status
get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation

13
lib/pleroma/web/twitter_api/twitter_api_controller.ex
View file

@ -65,6 +65,19 @@ defmodule Pleroma.Web.TwitterAPI.Controller do
|> json_reply(200, json)
end
def show_user(conn, params) do
with {:ok, shown} <- TwitterAPI.get_user(params) do
if user = conn.assigns.user do
render conn, UserView, "show.json", %{user: shown, for: user}
else
render conn, UserView, "show.json", %{user: shown}
end
else
{:error, msg} ->
bad_request_reply(conn, msg)
end
end
def user_timeline(%{assigns: %{user: user}} = conn, params) do
case TwitterAPI.get_user(user, params) do
{:ok, target_user} ->