logo

pleroma

My custom branche(s) on git.pleroma.social/pleroma/pleroma
commit: 6342fcd5dca2fc4c1241163a406ca78103082048
parent: 25f9d7a5396b12e30e087346a09614ff2ceeb263
Author: Roger Braun <roger@rogerbraun.net>
Date:   Thu,  8 Jun 2017 16:44:12 +0200

Save correct date for incoming notes.

Diffstat:

Mlib/pleroma/web/ostatus/handlers/note_handler.ex1+
Mtest/web/ostatus/ostatus_test.exs1+
2 files changed, 2 insertions(+), 0 deletions(-)

diff --git a/lib/pleroma/web/ostatus/handlers/note_handler.ex b/lib/pleroma/web/ostatus/handlers/note_handler.ex @@ -66,6 +66,7 @@ defmodule Pleroma.Web.OStatus.NoteHandler do date <- XML.string_from_xpath("//published", entry), note <- TwitterAPI.Utils.make_note_data(actor.ap_id, to, context, content_html, attachments, inReplyToActivity, []), note <- note |> Map.put("id", id) |> Map.put("tag", tags), + note <- note |> Map.put("published", date), # TODO: Handle this case in make_note_data note <- (if inReplyTo && !inReplyToActivity, do: note |> Map.put("inReplyTo", inReplyTo), else: note) do diff --git a/test/web/ostatus/ostatus_test.exs b/test/web/ostatus/ostatus_test.exs @@ -19,6 +19,7 @@ defmodule Pleroma.Web.OStatusTest do assert activity.data["object"]["type"] == "Note" assert activity.data["object"]["id"] == "tag:gs.example.org:4040,2017-04-23:noticeId=29:objectType=note" assert activity.data["published"] == "2017-04-23T14:51:03+00:00" + assert activity.data["object"]["published"] == "2017-04-23T14:51:03+00:00" assert activity.data["context"] == "tag:gs.example.org:4040,2017-04-23:objectType=thread:nonce=f09e22f58abd5c7b" assert "http://pleroma.example.org:4000/users/lain3" in activity.data["to"] assert activity.local == false