hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Make outgoing salmons work.

Browse source
This commit is contained in:
Roger Braun 2017-05-01 13:14:58 +02:00
commit 6843755834
8 changed files with 117 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

5
lib/pleroma/user.ex
View file

@ -121,7 +121,7 @@ defmodule Pleroma.User do
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
@ -137,7 +137,8 @@ defmodule Pleroma.User do
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