X-Git-Url: http://git.squeep.com/?a=blobdiff_plain;f=test%2Fsupport%2Ffactory.ex;h=6c48d390f04a791b4608cdf87afe269de137c7b8;hb=b5d8213e701a525903f4ac6b0654fdb1ed68b300;hp=7f378915ed93c76ba525de0c8149e8e494cd53a6;hpb=690085158184e6ab216ac11b316191a7cb5ebafc;p=akkoma

diff --git a/test/support/factory.ex b/test/support/factory.ex
index 7f378915e..6c48d390f 100644
--- a/test/support/factory.ex
+++ b/test/support/factory.ex
@@ -9,20 +9,27 @@ defmodule Pleroma.Factory do
       password_hash: Comeonin.Pbkdf2.hashpwsalt("test"),
       bio: sequence(:bio, &"Tester Number #{&1}")
     }
-    %{ user | ap_id: Pleroma.User.ap_id(user), follower_address: Pleroma.User.ap_followers(user), following: [Pleroma.User.ap_id(user)] }
+
+    %{
+      user
+      | ap_id: Pleroma.User.ap_id(user),
+        follower_address: Pleroma.User.ap_followers(user),
+        following: [Pleroma.User.ap_id(user)]
+    }
   end
 
   def note_factory do
     text = sequence(:text, &"This is :moominmamma: note #{&1}")
 
     user = insert(:user)
+
     data = %{
       "type" => "Note",
       "content" => text,
-      "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id,
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_object_id(),
       "actor" => user.ap_id,
       "to" => ["https://www.w3.org/ns/activitystreams#Public"],
-      "published" => DateTime.utc_now() |> DateTime.to_iso8601,
+      "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
       "likes" => [],
       "like_count" => 0,
       "context" => "2hu",
@@ -38,21 +45,50 @@ defmodule Pleroma.Factory do
     }
   end
 
+  def direct_note_factory do
+    user2 = insert(:user)
+
+    %Pleroma.Object{data: data} = note_factory()
+    %Pleroma.Object{data: Map.merge(data, %{"to" => [user2.ap_id]})}
+  end
+
+  def direct_note_activity_factory do
+    dm = insert(:direct_note)
+
+    data = %{
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
+      "type" => "Create",
+      "actor" => dm.data["actor"],
+      "to" => dm.data["to"],
+      "object" => dm.data,
+      "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
+      "context" => dm.data["context"]
+    }
+
+    %Pleroma.Activity{
+      data: data,
+      actor: data["actor"],
+      recipients: data["to"]
+    }
+  end
+
   def note_activity_factory do
     note = insert(:note)
+
     data = %{
-      "id" => Pleroma.Web.ActivityPub.Utils.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" => DateTime.utc_now() |> DateTime.to_iso8601,
+      "published" => DateTime.utc_now() |> DateTime.to_iso8601(),
       "context" => note.data["context"]
     }
 
     %Pleroma.Activity{
       data: data,
-      actor: data["actor"]
+      actor: data["actor"],
+      recipients: data["to"]
     }
   end
 
@@ -61,11 +97,11 @@ defmodule Pleroma.Factory do
     user = insert(:user)
 
     data = %{
-      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id,
+      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id(),
       "actor" => user.ap_id,
       "type" => "Like",
       "object" => note_activity.data["object"]["id"],
-      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601
+      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601()
     }
 
     %Pleroma.Activity{
@@ -78,15 +114,16 @@ defmodule Pleroma.Factory do
     followed = insert(:user)
 
     data = %{
-      "id" => Pleroma.Web.ActivityPub.Utils.generate_activity_id,
+      "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
+      "published_at" => DateTime.utc_now() |> DateTime.to_iso8601()
     }
 
     %Pleroma.Activity{
-      data: data
+      data: data,
+      actor: follower.ap_id
     }
   end
 
@@ -95,7 +132,7 @@ defmodule Pleroma.Factory do
       topic: "http://example.org",
       callback: "http://example/org/callback",
       secret: "here's a secret",
-      valid_until: NaiveDateTime.add(NaiveDateTime.utc_now, 100),
+      valid_until: NaiveDateTime.add(NaiveDateTime.utc_now(), 100),
       state: "requested"
     }
   end
@@ -109,4 +146,15 @@ defmodule Pleroma.Factory do
       subscribers: []
     }
   end
+
+  def oauth_app_factory do
+    %Pleroma.Web.OAuth.App{
+      client_name: "Some client",
+      redirect_uris: "https://example.com/callback",
+      scopes: "read",
+      website: "https://example.com",
+      client_id: "aaabbb==",
+      client_secret: "aaa;/&bbb"
+    }
+  end
 end