aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoger Braun <roger@rogerbraun.net>2017-04-30 15:05:16 +0200
committerRoger Braun <roger@rogerbraun.net>2017-04-30 15:05:16 +0200
commita173fb9e417cbb4fc7694672dd31bce90a3f9099 (patch)
tree231902a8804ebb1bed84d9778e15e6fa1ed6ec09
parentbb1d08a47c34c70d42f6c3afa08232765a24884d (diff)
downloadpleroma-a173fb9e417cbb4fc7694672dd31bce90a3f9099.tar.gz
Get users fresh, might so we don't make new keys all the time.
-rw-r--r--lib/pleroma/user.ex4
-rw-r--r--lib/pleroma/web/web_finger/web_finger.ex2
2 files changed, 5 insertions, 1 deletions
diff --git a/lib/pleroma/user.ex b/lib/pleroma/user.ex
index 49ba9b22e..2c297433a 100644
--- a/lib/pleroma/user.ex
+++ b/lib/pleroma/user.ex
@@ -123,6 +123,10 @@ defmodule Pleroma.User do
Cachex.get!(:user_cache, key, fallback: fn(_) -> Repo.get_by(User, nickname: nickname) end)
end
+ def get_cached_by_nickname(nickname) do
+ Repo.get_by(User, nickname: nickname)
+ end
+
def get_cached_user_info(user) do
key = "user_info:#{user.id}"
Cachex.get!(:user_cache, key, fallback: fn(_) -> user_info(user) end)
diff --git a/lib/pleroma/web/web_finger/web_finger.ex b/lib/pleroma/web/web_finger/web_finger.ex
index 13e3baad6..7ceca042b 100644
--- a/lib/pleroma/web/web_finger/web_finger.ex
+++ b/lib/pleroma/web/web_finger/web_finger.ex
@@ -20,7 +20,7 @@ defmodule Pleroma.Web.WebFinger do
regex = ~r/(acct:)?(?<username>\w+)@#{host}/
case Regex.named_captures(regex, resource) do
%{"username" => username} ->
- user = User.get_cached_by_nickname(username)
+ user = User.get_by_nickname(username)
{:ok, represent_user(user)}
_ -> nil
end