hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Move default mascot configuration to config/

Browse source
This commit is contained in:
Sadposter 2019-05-20 16:12:55 +01:00
commit daeae8e2e7
No known key found for this signature in database
GPG key ID: 6F3BAD60DE190290
5 changed files with 46 additions and 15 deletions
Download patch file Download diff file Expand all files Collapse all files

4
lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
View file

@ -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),