projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'bugfix/oauth-scopes-join' into 'develop'
[akkoma]
/
lib
/
pleroma
/
web
/
twitter_api
/
twitter_api.ex
diff --git
a/lib/pleroma/web/twitter_api/twitter_api.ex
b/lib/pleroma/web/twitter_api/twitter_api.ex
index db521a3ad09599568d52dc597c2b1e469e8dc6e4..ab6470d7847443e060787d41970a12aefb6e49d0 100644
(file)
--- a/
lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/
lib/pleroma/web/twitter_api/twitter_api.ex
@@
-216,7
+216,7
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
{:ok, token_record} <- Pleroma.PasswordResetToken.create_token(user) do
user
|> UserEmail.password_reset_email(token_record.token)
{:ok, token_record} <- Pleroma.PasswordResetToken.create_token(user) do
user
|> UserEmail.password_reset_email(token_record.token)
- |> Mailer.deliver()
+ |> Mailer.deliver
_async
()
else
false ->
{:error, "bad user identifier"}
else
false ->
{:error, "bad user identifier"}
@@
-229,18
+229,10
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
end
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} ->
def get_user(user \\ nil, params) do
case params do
%{"user_id" => user_id} ->
- case target =
get_by_id_or_nickname
(user_id) do
+ case target =
User.get_cached_by_nickname_or_id
(user_id) do
nil ->
{:error, "No user with such user_id"}
nil ->
{:error, "No user with such user_id"}