Merge branch '394_user_tags' into 'develop'

[#394] User tags Closes #394 See merge request pleroma/pleroma!508
2018-12-07 18:25:38 +00:00 · 2018-12-07 18:25:38 +00:00 · 94d8f1ab30
commit 94d8f1ab30
parent da4315b5ef 1cea97df64
10 changed files with 168 additions and 7 deletions
--- a/lib/pleroma/web/mastodon_api/views/account_view.ex
+++ b/lib/pleroma/web/mastodon_api/views/account_view.ex
@ -58,6 +58,11 @@ defmodule Pleroma.Web.MastodonAPI.AccountView do
        note: "",
        privacy: user_info.default_scope,
        sensitive: false
+      },
+
+      # Pleroma extension
+      pleroma: %{
+        tags: user.tags
      }
    }
  end