Merge branch 'feature/emoji-in-local-users' into 'develop'

Add emoji to local user profiles. Closes #202 See merge request pleroma/pleroma!271
2018-08-26 23:24:41 +00:00 · 2018-08-26 23:24:41 +00:00 · 63094cfd3e
commit 63094cfd3e
parent 927be2c62b 86dca39640
5 changed files with 61 additions and 2 deletions
--- a/lib/pleroma/web/activity_pub/views/user_view.ex
+++ b/lib/pleroma/web/activity_pub/views/user_view.ex
@ -42,7 +42,8 @@ defmodule Pleroma.Web.ActivityPub.UserView do
      "image" => %{
        "type" => "Image",
        "url" => User.banner_url(user)
-      }
+      },
+      "tag" => user.info["source_data"]["tag"] || []
    }
    |> Map.merge(Utils.make_json_ld_header())
  end