mirrors/pleroma
1
0
Fork 0
mirror of https://git.pleroma.social/pleroma/pleroma.git synced 2024-12-22 16:16:34 +00:00
Code Issues Projects Releases Wiki Activity

Federate object id for posts in ostatus.

Browse source 
This is because ostatus doens't have an id for the activities.
This commit is contained in:
Roger Braun 2017-04-30 11:55:19 +02:00
parent 84027ff00b
commit 62607f37dc
4 changed files with 8 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
lib/pleroma/web/ostatus/activity_representer.ex
View file

@ -3,13 +3,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
require Logger
defp get_in_reply_to(%{"object" => %{ "inReplyTo" => in_reply_to}}) do
with %Activity{data: %{"id" => id}} <- Activity.get_create_activity_by_object_ap_id(in_reply_to) do
[{:"thr:in-reply-to", [ref: to_charlist(id)], []}]
else _e ->
Logger.debug("Couldn't find replied-to activity:")
Logger.debug(in_reply_to)
[]
end
[{:"thr:in-reply-to", [ref: to_charlist(in_reply_to)], []}]
end
defp get_in_reply_to(_), do: []
@ -32,7 +26,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenter do
[
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/note']},
{:"activity:verb", ['http://activitystrea.ms/schema/1.0/post']},
{:id, h.(activity.data["id"])},
{:id, h.(activity.data["object"]["id"])}, # For notes, federate the object id.
{:title, ['New note by #{user.nickname}']},
{:content, [type: 'html'], h.(activity.data["object"]["content"])},
{:published, h.(inserted_at)},

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

@ -69,6 +69,7 @@ defmodule Pleroma.Web.OStatus do
id = string_from_xpath("/entry/id", entry)
object = %{
"id" => id,
"type" => "Note",
"to" => to,
"content" => content_html,
@ -85,7 +86,7 @@ defmodule Pleroma.Web.OStatus do
object
end
ActivityPub.create(to, actor, context, object, %{"id" => id}, date)
ActivityPub.create(to, actor, context, object, %{}, date)
end
def find_or_make_user(uri) do

6
test/web/ostatus/activity_representer_test.exs
View file

@ -18,7 +18,7 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
expected = """
<activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
<id>#{note_activity.data["id"]}</id>
<id>#{note_activity.data["object"]["id"]}</id>
<title>New note by #{user.nickname}</title>
<content type="html">#{note_activity.data["object"]["content"]}</content>
<published>#{inserted_at}</published>
@ -53,14 +53,14 @@ defmodule Pleroma.Web.OStatus.ActivityRepresenterTest do
expected = """
<activity:object-type>http://activitystrea.ms/schema/1.0/note</activity:object-type>
<activity:verb>http://activitystrea.ms/schema/1.0/post</activity:verb>
<id>#{answer.data["id"]}</id>
<id>#{answer.data["object"]["id"]}</id>
<title>New note by #{user.nickname}</title>
<content type="html">#{answer.data["object"]["content"]}</content>
<published>#{inserted_at}</published>
<updated>#{updated_at}</updated>
<ostatus:conversation>#{answer.data["context"]}</ostatus:conversation>
<link href="#{answer.data["context"]}" rel="ostatus:conversation" />
<thr:in-reply-to ref="#{note.data["id"]}" />
<thr:in-reply-to ref="#{note.data["object"]["id"]}" />
"""
tuple = ActivityRepresenter.to_simple_form(answer, user)

2
test/web/ostatus/ostatus_test.exs
View file

@ -7,8 +7,8 @@ defmodule Pleroma.Web.OStatusTest do
{:ok, [activity]} = OStatus.handle_incoming(incoming)
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"]["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["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"]