moon
/
spc-pleroma
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Keep ostatus id as activity id.

This commit is contained in:
Roger Braun 2017-04-30 09:25:46 +02:00
parent a16da387d2
commit 8a0d2b33d8
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/pleroma/web/ostatus/ostatus.ex
View File

@ -63,6 +63,7 @@ def handle_note(entry, doc \\ nil) do
to = to ++ mentions to = to ++ mentions
date = string_from_xpath("/entry/published", entry) date = string_from_xpath("/entry/published", entry)
id = string_from_xpath("/entry/id", entry)
object = %{ object = %{
"type" => "Note", "type" => "Note",
@ -81,7 +82,7 @@ def handle_note(entry, doc \\ nil) do
object object
end end
ActivityPub.create(to, actor, context, object, %{}, date) ActivityPub.create(to, actor, context, object, %{"id" => id}, date)
end end
def find_or_make_user(uri) do def find_or_make_user(uri) do

1
test/web/ostatus/ostatus_test.exs
View File

@ -7,6 +7,7 @@ test "handle incoming note - GS, Salmon" do
{:ok, [activity]} = OStatus.handle_incoming(incoming) {:ok, [activity]} = OStatus.handle_incoming(incoming)
assert activity.data["type"] == "Create" assert activity.data["type"] == "Create"
assert activity.data["id"] == "tag:gs.example.org:4040,2017-04-23:noticeId=29:objectType=note"
assert activity.data["object"]["type"] == "Note" assert activity.data["object"]["type"] == "Note"
assert activity.data["published"] == "2017-04-23T14:51:03+00:00" assert activity.data["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 activity.data["context"] == "tag:gs.example.org:4040,2017-04-23:objectType=thread:nonce=f09e22f58abd5c7b"