Merge branch 'features/pleroma-tan-mastofe' into 'develop'

mastodon_api_controller.ex: Add pleroma-tan to initial_state See merge request pleroma/pleroma!1018
2019-04-04 07:34:20 +00:00 · 2019-04-04 07:34:20 +00:00 · c900ff39af
parent 3f8be270c6 af0065a71f
commit c900ff39af
1 changed files with 2 additions and 1 deletions
--- a/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
+++ b/lib/pleroma/web/mastodon_api/mastodon_api_controller.ex
@ -1121,7 +1121,8 @@ def index(%{assigns: %{user: user}} = conn, _params) do
            auto_play_gif: false,
            display_sensitive_media: false,
            reduce_motion: false,
-            max_toot_chars: limit
+            max_toot_chars: limit,
+            mascot: "/images/pleroma-fox-tan-smol.png"
          },
          rights: %{
            delete_others_notice: present?(user.info.is_moderator),