diff options
| author | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-05-20 16:12:55 +0100 |
|---|---|---|
| committer | Sadposter <hannah+pleroma@coffee-and-dreams.uk> | 2019-05-20 16:12:55 +0100 |
| commit | daeae8e2e7c506b72c66dea6ac790408f948ec16 (patch) | |
| tree | 866e49c75e2da559cd2e7f314f8138d9c522d2aa /lib/pleroma/web | |
| parent | d835810610e5e7660a56d305bc8509e38c642942 (diff) | |
| download | pleroma-daeae8e2e7c506b72c66dea6ac790408f948ec16.tar.gz | |
Move default mascot configuration to `config/`
Diffstat (limited to 'lib/pleroma/web')
| -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 d7f095a1f..1ec0f30a1 100644 --- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex +++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex @@ -736,7 +736,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do end def get_mascot(%{assigns: %{user: user}} = conn, _params) do - %{info: %{mascot: mascot}} = user + mascot = User.get_mascot(user) conn |> json(mascot) @@ -1364,7 +1364,7 @@ defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do display_sensitive_media: false, reduce_motion: false, max_toot_chars: limit, - mascot: Map.get(user.info.mascot, "url", "/images/pleroma-fox-tan-smol.png") + mascot: User.get_mascot(user)["url"] }, rights: %{ delete_others_notice: present?(user.info.is_moderator), |