projects
/
akkoma
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move default mascot configuration to `config/`
[akkoma]
/
lib
/
pleroma
/
web
/
mastodon_api
/
mastodon_api_controller.ex
diff --git
a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
index d7f095a1fdbc34722ced6b8ab5cbfc547b34ca22..1ec0f30a1ecb74e1b04ff8714becaccc7526b3f2 100644
(file)
--- 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
end
def get_mascot(%{assigns: %{user: user}} = conn, _params) do
- %{info: %{mascot: mascot}} = user
+ mascot = User.get_mascot(user)
conn
|> json(mascot)
conn
|> json(mascot)
@@
-1364,7
+1364,7
@@
defmodule Pleroma.Web.MastodonAPI.MastodonAPIController do
display_sensitive_media: false,
reduce_motion: false,
max_toot_chars: limit,
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),
},
rights: %{
delete_others_notice: present?(user.info.is_moderator),