X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fsupport%2Fbuilders%2Factivity_builder.ex;h=6e5a8e0594aab4a41e2980837aceca7b6158899e;hb=52b1b0e45dbc0835cc81530cae0e85cb1264c905;hp=0f9cd0d15cae388bc0122bfa47cbab75f6aa9586;hpb=f6547f7b7fa72a9730773012394c522ac6b17398;p=akkoma diff --git a/test/support/builders/activity_builder.ex b/test/support/builders/activity_builder.ex index 0f9cd0d15..6e5a8e059 100644 --- a/test/support/builders/activity_builder.ex +++ b/test/support/builders/activity_builder.ex @@ -1,18 +1,21 @@ defmodule Pleroma.Builders.ActivityBuilder do - alias Pleroma.Builders.UserBuilder alias Pleroma.Web.ActivityPub.ActivityPub def build(data \\ %{}, opts \\ %{}) do user = opts[:user] || Pleroma.Factory.insert(:user) + activity = %{ - "id" => 1, + "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(), "actor" => user.ap_id, "to" => ["https://www.w3.org/ns/activitystreams#Public"], + "type" => "Create", "object" => %{ "type" => "Note", - "content" => "test" + "content" => "test", + "to" => ["https://www.w3.org/ns/activitystreams#Public"] } } + Map.merge(activity, data) end @@ -22,8 +25,8 @@ defmodule Pleroma.Builders.ActivityBuilder do end def insert_list(times, data \\ %{}, opts \\ %{}) do - Enum.map(1..times, fn (n) -> - {:ok, activity} = insert(Map.merge(data, %{"id" => n})) + Enum.map(1..times, fn _n -> + {:ok, activity} = insert(data, opts) activity end) end @@ -32,7 +35,7 @@ defmodule Pleroma.Builders.ActivityBuilder do user = Pleroma.Factory.insert(:user) public = build(%{"id" => 1}, %{user: user}) - non_public = build(%{"id" => 2, "to" => []}, %{user: user}) + non_public = build(%{"id" => 2, "to" => [user.follower_address]}, %{user: user}) {:ok, public} = ActivityPub.insert(public) {:ok, non_public} = ActivityPub.insert(non_public)