Merge branch 'oauth2' into 'develop'

[akkoma] / lib / pleroma / web / ostatus / user_representer.ex

diff --git a/lib/pleroma/web/ostatus/user_representer.ex b/lib/pleroma/web/ostatus/user_representer.ex
index 66fc6e05388ad3ebf3200c70ac15ad0485b8431c..273d7524a8795fbe0c545500788e15f6c9df31ed 100644 (file)
--- a/lib/pleroma/web/ostatus/user_representer.ex
+++ b/lib/pleroma/web/ostatus/user_representer.ex
@@ -1,14 +1,20 @@
 defmodule Pleroma.Web.OStatus.UserRepresenter do
   alias Pleroma.User
-  def to_tuple(user, wrapper \\ :author) do
-    {
-      wrapper, [
-        { :id, user.ap_id },
-        { :"activity:object", "http://activitystrea.ms/schema/1.0/person" },
-        { :uri, user.ap_id },
-        { :name, user.nickname },
-        { :link, %{rel: "avatar", href: User.avatar_url(user)}}
-      ]
-    }
+  def to_simple_form(user) do
+    ap_id = to_charlist(user.ap_id)
+    nickname = to_charlist(user.nickname)
+    name = to_charlist(user.name)
+    bio = to_charlist(user.bio)
+    avatar_url = to_charlist(User.avatar_url(user))
+    [
+      {:id, [ap_id]},
+      {:"activity:object", ['http://activitystrea.ms/schema/1.0/person']},
+      {:uri, [ap_id]},
+      {:"poco:preferredUsername", [nickname]},
+      {:"poco:displayName", [name]},
+      {:"poco:note", [bio]},
+      {:name, [nickname]},
+      {:link, [rel: 'avatar', href: avatar_url], []}
+    ]
   end
 end