projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge remote-tracking branch 'origin/develop' into feature/bbs
[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 8e44dbeb88ca5a47a217f4452f5d9611a9f3f2f6..3a777464784078dda93c10e388a8c41d11463e02 100644
(file)
--- a/
lib/pleroma/web/twitter_api/twitter_api.ex
+++ b/
lib/pleroma/web/twitter_api/twitter_api.ex
@@
-240,7
+240,7
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
%{"screen_name" => nickname} ->
end
%{"screen_name" => nickname} ->
- case User.get_by_nickname(nickname) do
+ case User.get_
cached_
by_nickname(nickname) do
nil -> {:error, "No user with such screen_name"}
target -> {:ok, target}
end
nil -> {:error, "No user with such screen_name"}
target -> {:ok, target}
end
@@
-293,7
+293,7
@@
defmodule Pleroma.Web.TwitterAPI.TwitterAPI do
end
def get_external_profile(for_user, uri) do
end
def get_external_profile(for_user, uri) do
- with
%User{} = user
<- User.get_or_fetch(uri) do
+ with
{:ok, %User{} = user}
<- User.get_or_fetch(uri) do
{:ok, UserView.render("show.json", %{user: user, for: for_user})}
else
_e ->
{:ok, UserView.render("show.json", %{user: user, for: for_user})}
else
_e ->