diff options
| author | Roger Braun <roger@rogerbraun.net> | 2017-05-24 13:53:31 +0200 |
|---|---|---|
| committer | Roger Braun <roger@rogerbraun.net> | 2017-05-24 13:54:25 +0200 |
| commit | 94e980d6b4ab91ee37c30b266eb91e748e23861c (patch) | |
| tree | f34c7f1b7f7bff8a439af4d553946f6d5cb0394f /lib | |
| parent | 869e5ccfe1defb4b1a711729f75b7893f6f82573 (diff) | |
| download | pleroma-94e980d6b4ab91ee37c30b266eb91e748e23861c.tar.gz | |
Output proper published data in ostatus.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/pleroma/web/ostatus/activity_representer.ex | 30 |
1 files changed, 10 insertions, 20 deletions
diff --git a/lib/pleroma/web/ostatus/activity_representer.ex b/lib/pleroma/web/ostatus/activity_representer.ex index ccf71218c..aa13cd62b 100644 --- a/lib/pleroma/web/ostatus/activity_representer.ex +++ b/lib/pleroma/web/ostatus/activity_representer.ex @@ -28,10 +28,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do def to_simple_form(%{data: %{"object" => %{"type" => "Note"}}} = activity, user, with_author) do h = fn(str) -> [to_charlist(str)] end - updated_at = activity.updated_at - |> NaiveDateTime.to_iso8601 - inserted_at = activity.inserted_at - |> NaiveDateTime.to_iso8601 + updated_at = activity.data["published"] + inserted_at = activity.data["published"] attachments = Enum.map(activity.data["object"]["attachment"] || [], fn(attachment) -> url = hd(attachment["url"]) @@ -62,10 +60,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do def to_simple_form(%{data: %{"type" => "Like"}} = activity, user, with_author) do h = fn(str) -> [to_charlist(str)] end - updated_at = activity.updated_at - |> NaiveDateTime.to_iso8601 - inserted_at = activity.inserted_at - |> NaiveDateTime.to_iso8601 + updated_at = activity.data["published"] + inserted_at = activity.data["published"] in_reply_to = get_in_reply_to(activity.data) author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: [] @@ -92,10 +88,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do def to_simple_form(%{data: %{"type" => "Announce"}} = activity, user, with_author) do h = fn(str) -> [to_charlist(str)] end - updated_at = activity.updated_at - |> NaiveDateTime.to_iso8601 - inserted_at = activity.inserted_at - |> NaiveDateTime.to_iso8601 + updated_at = activity.data["published"] + inserted_at = activity.data["published"] in_reply_to = get_in_reply_to(activity.data) author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: [] @@ -124,10 +118,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do def to_simple_form(%{data: %{"type" => "Follow"}} = activity, user, with_author) do h = fn(str) -> [to_charlist(str)] end - updated_at = activity.updated_at - |> NaiveDateTime.to_iso8601 - inserted_at = activity.inserted_at - |> NaiveDateTime.to_iso8601 + updated_at = activity.data["published"] + inserted_at = activity.data["published"] author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: [] @@ -153,10 +145,8 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do def to_simple_form(%{data: %{"type" => "Undo"}} = activity, user, with_author) do h = fn(str) -> [to_charlist(str)] end - updated_at = activity.updated_at - |> NaiveDateTime.to_iso8601 - inserted_at = activity.inserted_at - |> NaiveDateTime.to_iso8601 + updated_at = activity.data["published"] + inserted_at = activity.data["published"] author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: [] follow_activity = Activity.get_by_ap_id(activity.data["object"]) |