diff options
author | lain <lain@soykaf.club> | 2019-03-11 15:18:32 +0100 |
---|---|---|
committer | lain <lain@soykaf.club> | 2019-03-11 15:18:32 +0100 |
commit | 3474066f6dc98003583dcd8537028b515be0e126 (patch) | |
tree | 92000dca3b13571cd76aed35534fec6ca48401db /lib | |
parent | 2c8deecdd2f75c6cdf1089e4266bedb8be55539c (diff) | |
download | pleroma-3474066f6dc98003583dcd8537028b515be0e126.tar.gz pleroma-3474066f6dc98003583dcd8537028b515be0e126.zip |
MastoAPI Accounts: Add fetching by nickname.
This is to make it easier for the frontends to handle domain.com/users/nickname
urls.
Diffstat (limited to 'lib')
-rw-r--r-- | lib/pleroma/web/mastodon_api/mastodon_api_controller.ex | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex index 26921d386..e7ca96114 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -131,8 +131,8 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do json(conn, account) end - def user(%{assigns: %{user: for_user}} = conn, %{"id" => id}) do - with %User{} = user <- Repo.get(User, id), + def user(%{assigns: %{user: for_user}} = conn, %{"id" => nickname_or_id}) do + with %User{} = user <- User.get_cached_by_nickname_or_id(nickname_or_id), true <- User.auth_active?(user) || user.id == for_user.id || User.superuser?(for_user) do account = AccountView.render("account.json", %{user: user, for: for_user}) json(conn, account) |