hj/pleroma
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

AP refactoring.

Browse source
This commit is contained in:
Roger Braun 2017-05-16 15:31:11 +02:00
commit 70024632ba
12 changed files with 334 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

2
test/support/builders/activity_builder.ex
View file

@ -5,7 +5,7 @@ defmodule Pleroma.Builders.ActivityBuilder do
def build(data \\ %{}, opts \\ %{}) do
user = opts[:user] || Pleroma.Factory.insert(:user)
activity = %{
"id" => Pleroma.Web.ActivityPub.ActivityPub.generate_object_id,
"id" => Pleroma.Web.ActivityPub.Utils.generate_object_id,
"actor" => user.ap_id,
"to" => ["https://www.w3.org/ns/activitystreams#Public"],
"object" => %{

8
test/support/factory.ex
View file

@ -19,7 +19,7 @@ defmodule Pleroma.Factory do
data = %{
"type" => "Note",
"content" => text,
"id" => Pleroma.Web.ActivityPub.ActivityPub.generate_object_id,
"id" => Pleroma.Web.ActivityPub.Utils.generate_object_id,
"actor" => user.ap_id,
"to" => ["https://www.w3.org/ns/activitystreams#Public"],
"published_at" => DateTime.utc_now() |> DateTime.to_iso8601,
@ -36,7 +36,7 @@ defmodule Pleroma.Factory do
def note_activity_factory do
note = insert(:note)
data = %{
"id" => Pleroma.Web.ActivityPub.ActivityPub.generate_activity_id,
"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id,
"type" => "Create",
"actor" => note.data["actor"],
"to" => note.data["to"],
@ -55,7 +55,7 @@ defmodule Pleroma.Factory do
user = insert(:user)
data = %{
"id" => Pleroma.Web.ActivityPub.ActivityPub.generate_activity_id,
"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id,
"actor" => user.ap_id,
"type" => "Like",
"object" => note_activity.data["object"]["id"],
@ -72,7 +72,7 @@ defmodule Pleroma.Factory do
followed = insert(:user)
data = %{
"id" => Pleroma.Web.ActivityPub.ActivityPub.generate_activity_id,
"id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id,
"actor" => follower.ap_id,
"type" => "Follow",
"object" => followed.ap_id,