aboutsummaryrefslogtreecommitdiff
path: root/lib/pleroma/web/twitter_api/twitter_api.ex
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-06-12 17:12:55 +0200
committerRoger Braun <roger@rogerbraun.net>2017-06-12 17:12:55 +0200
commiteb18b9ebba51c4b1180afaddf4e8a88e161f8f10 (patch)
treeaa2c4d94fa566524f2b2a1622fccd7beea7821a6 /lib/pleroma/web/twitter_api/twitter_api.ex
parenta1cabeea4aad2101361b35c47c1bc03e033b4d7c (diff)
downloadpleroma-eb18b9ebba51c4b1180afaddf4e8a88e161f8f10.tar.gz
Enable user timelines.
Diffstat (limited to 'lib/pleroma/web/twitter_api/twitter_api.ex')
-rw-r--r--lib/pleroma/web/twitter_api/twitter_api.ex10
1 files changed, 9 insertions, 1 deletions
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"}
_ ->