diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/router.ex | 1 | ||||
| -rw-r--r-- | lib/pleroma/web/twitter_api/twitter_api.ex | 10 |
2 files changed, 10 insertions, 1 deletions
diff --git a/lib/pleroma/web/router.ex b/lib/pleroma/web/router.ex index 07c1f8028..5f78ff97f 100644 --- a/lib/pleroma/web/router.ex +++ b/lib/pleroma/web/router.ex @@ -33,6 +33,7 @@ defmodule Pleroma.Web.Router do get "/statuses/public_and_external_timeline", TwitterAPI.Controller, :public_and_external_timeline 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 "/statuses/show/:id", TwitterAPI.Controller, :fetch_status get "/statusnet/conversation/:id", TwitterAPI.Controller, :fetch_conversation diff --git a/lib/pleroma/web/twitter_api/twitter_api.ex b/lib/pleroma/web/twitter_api/twitter_api.ex index 6eb69f815..cf9610723 100644 --- a/lib/pleroma/web/twitter_api/twitter_api.ex +++ b/lib/pleroma/web/twitter_api/twitter_api.ex @@ -215,10 +215,18 @@ defmodule Pleroma.Web.TwitterAPI.TwitterAPI do end end + def get_by_id_or_nickname(id_or_nickname) do + if !is_integer(id_or_nickname) && :error == Integer.parse(id_or_nickname) do + Repo.get_by(User, nickname: id_or_nickname) + else + Repo.get(User, id_or_nickname) + end + end + def get_user(user \\ nil, params) do case params do %{"user_id" => user_id} -> - case target = Repo.get(User, user_id) do + case target = get_by_id_or_nickname(user_id) do nil -> {:error, "No user with such user_id"} _ -> |