diff options
| author | Maksim Pechnikov <parallel588@gmail.com> | 2020-07-30 08:52:13 +0300 |
|---|---|---|
| committer | Maksim Pechnikov <parallel588@gmail.com> | 2020-07-30 08:52:13 +0300 |
| commit | cff7bb5cd4b9e564e94a7e7f4e11c6f9ebf5bc36 (patch) | |
| tree | 021c25a91263cfd9e67ad017bacf3cba41699c3b /lib/pleroma/web/feed/user_controller.ex | |
| parent | cd2423d7f5c082d49fb429708bb8476342b35136 (diff) | |
| parent | a6d3bb5f30697cafc5dd9acf490bde7e2f33f5f8 (diff) | |
| download | pleroma-cff7bb5cd4b9e564e94a7e7f4e11c6f9ebf5bc36.tar.gz | |
Merge branch 'develop' into issue/1933-update-dependency
Diffstat (limited to 'lib/pleroma/web/feed/user_controller.ex')
| -rw-r--r-- | lib/pleroma/web/feed/user_controller.ex | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/pleroma/web/feed/user_controller.ex b/lib/pleroma/web/feed/user_controller.ex index d56f43818..9cd334a33 100644 --- a/lib/pleroma/web/feed/user_controller.ex +++ b/lib/pleroma/web/feed/user_controller.ex @@ -47,7 +47,7 @@ defmodule Pleroma.Web.Feed.UserController do "atom" end - with {_, %User{} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do + with {_, %User{local: true} = user} <- {:fetch_user, User.get_cached_by_nickname(nickname)} do activities = %{ type: ["Create"], @@ -71,6 +71,7 @@ defmodule Pleroma.Web.Feed.UserController do render_error(conn, :not_found, "Not found") end + def errors(conn, {:fetch_user, %User{local: false}}), do: errors(conn, {:error, :not_found}) def errors(conn, {:fetch_user, nil}), do: errors(conn, {:error, :not_found}) def errors(conn, _) do |