Federate follow salmons.

This commit is contained in:
Roger Braun 2017-05-07 14:45:37 +02:00
parent 95ab0dc3c5
commit a41aa4e489
3 changed files with 75 additions and 0 deletions

View File

@ -118,6 +118,34 @@ def to_simple_form(%{data: %{"type" => "Announce"}} = activity, user, with_autho
] ++ mentions ++ author ] ++ mentions ++ author
end end
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
author = if with_author, do: [{:author, UserRepresenter.to_simple_form(user)}], else: []
mentions = activity.data["to"] |> get_mentions
[
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/activity']},
{:"activity:verb", ['http://activitystrea.ms/schema/1.0/follow']},
{:id, h.(activity.data["id"])},
{:title, ['#{user.nickname} started following #{activity.data["object"]}']},
{:content, [type: 'html'], ['#{user.nickname} started following #{activity.data["object"]}']},
{:published, h.(inserted_at)},
{:updated, h.(updated_at)},
{:"activity:object", [
{:"activity:object-type", ['http://activitystrea.ms/schema/1.0/person']},
{:id, h.(activity.data["object"])},
{:uri, h.(activity.data["object"])},
]},
{:link, [rel: 'self', type: ['application/atom+xml'], href: h.(activity.data["id"])], []},
] ++ mentions ++ author
end
def wrap_with_entry(simple_form) do def wrap_with_entry(simple_form) do
[{ [{
:entry, [ :entry, [

View File

@ -139,10 +139,13 @@ def follow(%User{} = follower, params) do
{:ok, activity} <- ActivityPub.insert(%{ {:ok, activity} <- ActivityPub.insert(%{
"type" => "Follow", "type" => "Follow",
"actor" => follower.ap_id, "actor" => follower.ap_id,
"to" => [followed.ap_id],
"object" => followed.ap_id, "object" => followed.ap_id,
"published" => make_date() "published" => make_date()
}) })
do do
# TODO move all this to ActivityPub
Pleroma.Web.Federator.enqueue(:publish, activity)
{:ok, follower, followed, activity} {:ok, follower, followed, activity}
else else
err -> err err -> err

View File

@ -124,6 +124,7 @@ test "a like activity" do
user = insert(:user) user = insert(:user)
{:ok, like, _note} = ActivityPub.like(user, note) {:ok, like, _note} = ActivityPub.like(user, note)
# TODO: Are these the correct dates?
updated_at = like.updated_at updated_at = like.updated_at
|> NaiveDateTime.to_iso8601 |> NaiveDateTime.to_iso8601
inserted_at = like.inserted_at inserted_at = like.inserted_at
@ -155,6 +156,49 @@ test "a like activity" do
assert clean(res) == clean(expected) assert clean(res) == clean(expected)
end end
test "a follow activity" do
follower = insert(:user)
followed = insert(:user)
{:ok, activity} = ActivityPub.insert(%{
"type" => "Follow",
"actor" => follower.ap_id,
"object" => followed.ap_id,
"to" => [followed.ap_id]
})
# TODO: Are these the correct dates?
updated_at = activity.updated_at
|> NaiveDateTime.to_iso8601
inserted_at = activity.inserted_at
|> NaiveDateTime.to_iso8601
tuple = ActivityRepresenter.to_simple_form(activity, follower)
refute is_nil(tuple)
res = :xmerl.export_simple_content(tuple, :xmerl_xml) |> IO.iodata_to_binary
expected = """
<activity:object-type>http://activitystrea.ms/schema/1.0/activity</activity:object-type>
<activity:verb>http://activitystrea.ms/schema/1.0/follow</activity:verb>
<id>#{activity.data["id"]}</id>
<title>#{follower.nickname} started following #{activity.data["object"]}</title>
<content type="html"> #{follower.nickname} started following #{activity.data["object"]}</content>
<published>#{inserted_at}</published>
<updated>#{updated_at}</updated>
<activity:object>
<activity:object-type>http://activitystrea.ms/schema/1.0/person</activity:object-type>
<id>#{activity.data["object"]}</id>
<uri>#{activity.data["object"]}</uri>
</activity:object>
<link rel="self" type="application/atom+xml" href="#{activity.data["id"]}"/>
<link rel="mentioned" ostatus:object-type="http://activitystrea.ms/schema/1.0/person" href="#{activity.data["object"]}"/>
"""
assert clean(res) == clean(expected)
end
test "an unknown activity" do test "an unknown activity" do
tuple = ActivityRepresenter.to_simple_form(%Activity{}, nil) tuple = ActivityRepresenter.to_simple_form(%Activity{}, nil)
assert is_nil(tuple) assert is_nil(tuple)