X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fsupport%2Ffactory.ex;h=eca73725dccea2839fb8f2172bbd2c3e7808b491;hb=1a001588e80e1ff7088472e3faaf754617d63973;hp=d7c16f0e0997edd92e609a4bdf00032064ef1d21;hpb=cef4a4d7095eae474c0bebaa4b0fb0001f140672;p=akkoma

diff --git a/test/support/factory.ex b/test/support/factory.ex
index d7c16f0e0..eca73725d 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -7,9 +7,9 @@ defmodule Pleroma.Factory do
       email: sequence(:email, &"user#{&1}@example.com"),
       nickname: sequence(:nickname, &"nick#{&1}"),
       password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
-      bio: sequence(:bio, &"Tester Number #{&1}"),
+      bio: sequence(:bio, &"Tester Number #{&1}")
     }
-    %{ user | ap_id: Pleroma.User.ap_id(user) }
+    %{ user | ap_id: Pleroma.User.ap_id(user), follower_address: Pleroma.User.ap_followers(user) }
   end
 
   def note_factory do
@@ -19,12 +19,14 @@ 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,
+      "published" => DateTime.utc_now() |> DateTime.to_iso8601,
       "likes" => [],
-      "like_count" => 0
+      "like_count" => 0,
+      "context" => "2hu",
+      "tag" => ["2hu"]
     }
 
     %Pleroma.Object{
@@ -35,12 +37,13 @@ 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"],
       "object" => note.data,
-      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601
+      "published" => DateTime.utc_now() |> DateTime.to_iso8601,
+      "context" => note.data["context"]
     }
 
     %Pleroma.Activity{
@@ -53,7 +56,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"],
@@ -65,6 +68,23 @@ defmodule Pleroma.Factory do
     }
   end
 
+  def follow_activity_factory do
+    follower = insert(:user)
+    followed = insert(:user)
+
+    data = %{
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id,
+      "actor" => follower.ap_id,
+      "type" => "Follow",
+      "object" => followed.ap_id,
+      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601
+    }
+
+    %Pleroma.Activity{
+      data: data
+    }
+  end
+
   def websub_subscription_factory do
     %Pleroma.Web.Websub.WebsubServerSubscription{
       topic: "http://example.org",
@@ -74,4 +94,14 @@ defmodule Pleroma.Factory do
       state: "requested"
     }
   end
+
+  def websub_client_subscription_factory do
+    %Pleroma.Web.Websub.WebsubClientSubscription{
+      topic: "http://example.org",
+      secret: "here's a secret",
+      valid_until: nil,
+      state: "requested",
+      subscribers: []
+    }
+  end
 end