projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Add avatar updating from incoming messages.
[akkoma]
/
lib
/
pleroma
/
user.ex
diff --git
a/lib/pleroma/user.ex
b/lib/pleroma/user.ex
index c264d7e90994560824d88c7557fc43d7bbbe3eef..01cbfe796379d864b997796a3879e731095ed4c9 100644
(file)
--- a/
lib/pleroma/user.ex
+++ b/
lib/pleroma/user.ex
@@
-121,7
+121,7
@@
defmodule Pleroma.User do
def get_cached_by_nickname(nickname) do
key = "nickname:#{nickname}"
def get_cached_by_nickname(nickname) do
key = "nickname:#{nickname}"
- Cachex.get!(:user_cache, key, fallback: fn(_) ->
Repo.get_by(User, nickname:
nickname) end)
+ Cachex.get!(:user_cache, key, fallback: fn(_) ->
get_or_fetch_by_nickname(
nickname) end)
end
def get_by_nickname(nickname) do
end
def get_by_nickname(nickname) do
@@
-137,7
+137,8
@@
defmodule Pleroma.User do
with %User{} = user <- get_by_nickname(nickname) do
user
else _e ->
with %User{} = user <- get_by_nickname(nickname) do
user
else _e ->
- with {:ok, user} <- OStatus.make_user(nickname) do
+ with [nick, domain] <- String.split(nickname, "@"),
+ {:ok, user} <- OStatus.make_user(nickname) do
user
else _e -> nil
end
user
else _e -> nil
end