X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=tests%2Fdatasets%2Fapi.fixture.php;h=407629709d780bd23532fefd72ee12f324dbde9e;hb=0cd8c78e2d2624b95f79a7546d04a628281d1c64;hp=fb11ae3476460f234a7153befa6de496fd574bf2;hpb=2ee14bf5fe6642d0083d43404451b6b1fa5ce4ce;p=friendica.git

diff --git a/tests/datasets/api.fixture.php b/tests/datasets/api.fixture.php
index fb11ae3476..407629709d 100644
--- a/tests/datasets/api.fixture.php
+++ b/tests/datasets/api.fixture.php
@@ -19,6 +19,8 @@
  *
  */
 
+use Friendica\Model\Notification;
+
 return [
 	// Empty these tables
 	'cache',
@@ -70,6 +72,7 @@ return [
 			'blocked' => 0,
 			'rel'     => 1,
 			'network' => 'dfrn',
+			'location' => 'DFRN',
 		],
 		// Having the same name and nick allows us to test
 		// the fallback to api_get_nick() in api_get_user()
@@ -85,6 +88,7 @@ return [
 			'blocked' => 0,
 			'rel'     => 0,
 			'network' => 'dfrn',
+			'location' => 'DFRN',
 		],
 		[
 			'id'      => 44,
@@ -98,21 +102,226 @@ return [
 			'blocked' => 0,
 			'rel'     => 2,
 			'network' => 'dfrn',
+			'location' => 'DFRN',
+		],
+		[
+			'id'      => 45,
+			'uid'     => 0,
+			'name'    => 'Friend contact',
+			'nick'    => 'friendcontact',
+			'self'    => 0,
+			'nurl'    => 'http://localhost/profile/friendcontact',
+			'url'     => 'http://localhost/profile/friendcontact',
+			'pending' => 0,
+			'blocked' => 0,
+			'rel'     => 2,
+			'network' => 'dfrn',
+			'location' => 'DFRN',
+		],
+		[
+			'id'      => 46,
+			'uid'     => 42,
+			'name'    => 'Mutual contact',
+			'nick'    => 'mutualcontact',
+			'self'    => 0,
+			'nurl'    => 'http://localhost/profile/mutualcontact',
+			'url'     => 'http://localhost/profile/mutualcontact',
+			'pending' => 0,
+			'blocked' => 0,
+			'rel'     => 3,
+			'network' => 'dfrn',
+			'location' => 'DFRN',
+		],
+		[
+			'id'      => 47,
+			'uid'     => 0,
+			'name'    => 'Mutual contact',
+			'nick'    => 'mutualcontact',
+			'self'    => 0,
+			'nurl'    => 'http://localhost/profile/mutualcontact',
+			'url'     => 'http://localhost/profile/mutualcontact',
+			'pending' => 0,
+			'blocked' => 0,
+			'rel'     => 2,
+			'network' => 'dfrn',
+			'location' => 'DFRN',
+		],
+	],
+	'item-uri'    => [
+		[
+			'id'   => 1,
+			'uri'  => '1',
+			'guid' => '1',
+		],
+		[
+			'id'   => 2,
+			'uri'  => '2',
+			'guid' => '2',
+		],
+		[
+			'id'   => 3,
+			'uri'  => '3',
+			'guid' => '3',
+		],
+		[
+			'id'   => 4,
+			'uri'  => '4',
+			'guid' => '4',
+		],
+		[
+			'id'   => 5,
+			'uri'  => '5',
+			'guid' => '5',
+		],
+		[
+			'id'   => 6,
+			'uri'  => '6',
+			'guid' => '6',
+		],
+	],
+	'post-content' => [
+		[
+			'uri-id' => 1,
+			'body'   => 'Parent status',
+			'plink'  => 'http://localhost/display/1',
+		],
+		[
+			'uri-id' => 2,
+			'body'   => 'Reply',
+			'plink'  => 'http://localhost/display/2',
+		],
+		[
+			'uri-id' => 3,
+			'body'   => 'Other user status',
+			'plink'  => 'http://localhost/display/3',
+		],
+		[
+			'uri-id' => 4,
+			'body'   => 'Friend user reply',
+			'plink'  => 'http://localhost/display/4',
+		],
+		[
+			'uri-id' => 5,
+			'body'   => '[share]Shared status[/share]',
+			'plink'  => 'http://localhost/display/5',
+		],
+		[
+			'uri-id' => 6,
+			'body'   => 'Friend user status',
+			'plink'  => 'http://localhost/display/6',
+		],
+	],
+	'post-thread'  => [
+		[
+			'uri-id'     => 1,
+			'author-id'  => 42,
+			'owner-id'   => 42,
+			'causer-id'  => 42,
+			'network' => 'dfrn',
+		],
+		[
+			'uri-id'     => 3,
+			'author-id'  => 43,
+			'owner-id'   => 43,
+			'causer-id'  => 43,
+			'network' => 'dfrn',
+		],
+		[
+			'uri-id'     => 6,
+			'author-id'  => 44,
+			'owner-id'   => 44,
+			'causer-id'  => 44,
+			'network' => 'dfrn',
+		],
+	],
+	'post-thread-user'  => [
+		[
+			'uri-id'     => 1,
+			'uid'        => 42,
+			'wall'       => 1,
 		],
+		[
+			'uri-id'     => 3,
+			'uid'        => 42,
+			'wall'       => 1,
+		],
+		[
+			'uri-id'     => 6,
+			'uid'        => 42,
+			'wall'       => 1,
+		],
+	],
+	'post-user' => [
+		[
+			'id'          => 1,
+			'uri-id'      => 1,
+			'uid'         => 42,
+			'contact-id'  => 42,
+			'unseen'      => 1,
+			'origin'      => 1,
+		],
+		[
+			'id'          => 2,
+			'uri-id'      => 2,
+			'uid'         => 42,
+			'contact-id'  => 42,
+			'unseen'      => 0,
+			'origin'      => 1,
+		],
+		[
+			'id'          => 3,
+			'uri-id'      => 3,
+			'uid'         => 42,
+			'contact-id'  => 43,
+			'unseen'      => 0,
+			'origin'      => 1,
+		],
+		[
+			'id'          => 4,
+			'uri-id'      => 4,
+			'uid'         => 42,
+			'contact-id'  => 44,
+			'unseen'      => 0,
+			'origin'      => 1,
+		],
+		[
+			'id'          => 5,
+			'uri-id'      => 5,
+			'uid'         => 42,
+			'contact-id'  => 42,
+			'unseen'      => 0,
+			'origin'      => 1,
+		],
+		[
+			'id'          => 6,
+			'uri-id'      => 6,
+			'uid'         => 42,
+			'contact-id'  => 44,
+			'unseen'      => 0,
+			'origin'      => 1,
+		],
+
 	],
 	'item'    => [
 		[
 			'id'          => 1,
 			'uri-id'      => 1,
+			'uri'         => '1',
 			'visible'     => 1,
 			'contact-id'  => 42,
 			'author-id'   => 42,
 			'owner-id'    => 42,
+			'causer-id'   => 42,
 			'uid'         => 42,
 			'verb'        => 'http://activitystrea.ms/schema/1.0/post',
 			'unseen'      => 1,
-			'body'        => 'Parent status',
 			'parent'      => 1,
+			'parent-uri-id' => 1,
+			'parent-uri'  => '1',
+			'thr-parent-id' => 1,
+			'thr-parent'  => '1',
+			'private'     => 0,
+			'gravity'     => GRAVITY_PARENT,
 			'author-link' => 'http://localhost/profile/selfcontact',
 			'wall'        => 1,
 			'starred'     => 1,
@@ -121,72 +330,104 @@ return [
 			'allow_gid'   => '',
 			'deny_cid'    => '',
 			'deny_gid'    => '',
+			'guid'        => '1',
 		],
 		[
 			'id'          => 2,
 			'uri-id'      => 2,
+			'uri'         => '2',
 			'visible'     => 1,
 			'contact-id'  => 42,
 			'author-id'   => 42,
 			'owner-id'    => 42,
+			'causer-id'   => 42,
 			'uid'         => 42,
 			'verb'        => 'http://activitystrea.ms/schema/1.0/post',
 			'unseen'      => 0,
-			'body'        => 'Reply',
 			'parent'      => 1,
+			'parent-uri-id' => 1,
+			'parent-uri'  => '1',
+			'thr-parent-id' => 1,
+			'thr-parent'  => '1',
+			'private'     => 0,
+			'gravity'     => GRAVITY_COMMENT,
 			'author-link' => 'http://localhost/profile/selfcontact',
 			'wall'        => 1,
 			'starred'     => 0,
 			'origin'      => 1,
+			'guid'        => '2',
 		],
 		[
-
 			'id'          => 3,
 			'uri-id'      => 3,
+			'uri'         => '3',
 			'visible'     => 1,
 			'contact-id'  => 43,
 			'author-id'   => 43,
 			'owner-id'    => 42,
+			'causer-id'   => 43,
 			'uid'         => 42,
 			'verb'        => 'http://activitystrea.ms/schema/1.0/post',
 			'unseen'      => 0,
-			'body'        => 'Other user status',
 			'parent'      => 3,
+			'parent-uri-id' => 3,
+			'parent-uri'  => '3',
+			'thr-parent-id' => 3,
+			'thr-parent'  => '3',
+			'private'     => 0,
+			'gravity'     => GRAVITY_PARENT,
 			'author-link' => 'http://localhost/profile/othercontact',
 			'wall'        => 1,
 			'starred'     => 0,
 			'origin'      => 1,
+			'guid'        => '3',
 		],
 		[
 			'id'          => 4,
 			'uri-id'      => 4,
+			'uri'         => '4',
 			'visible'     => 1,
 			'contact-id'  => 44,
 			'author-id'   => 44,
 			'owner-id'    => 42,
+			'causer-id'   => 44,
 			'uid'         => 42,
 			'verb'        => 'http://activitystrea.ms/schema/1.0/post',
 			'unseen'      => 0,
 			'body'        => 'Friend user reply',
 			'parent'      => 1,
+			'parent-uri-id' => 1,
+			'parent-uri'  => '1',
+			'thr-parent-id' => 1,
+			'thr-parent'  => '1',
+			'private'     => 0,
+			'gravity'     => GRAVITY_COMMENT,
 			'author-link' => 'http://localhost/profile/othercontact',
 			'wall'        => 1,
 			'starred'     => 0,
 			'origin'      => 1,
+			'guid'        => '4',
 		],
 		[
 
 			'id'          => 5,
 			'uri-id'      => 5,
+			'uri'         => '5',
 			'visible'     => 1,
 			'contact-id'  => 42,
 			'author-id'   => 42,
 			'owner-id'    => 42,
+			'causer-id'   => 42,
 			'uid'         => 42,
 			'verb'        => 'http://activitystrea.ms/schema/1.0/post',
 			'unseen'      => 0,
-			'body'        => '[share]Shared status[/share]',
 			'parent'      => 1,
+			'parent-uri-id' => 1,
+			'parent-uri'  => '1',
+			'thr-parent-id' => 1,
+			'thr-parent'  => '1',
+			'private'     => 0,
+			'gravity'     => GRAVITY_COMMENT,
 			'author-link' => 'http://localhost/profile/othercontact',
 			'wall'        => 1,
 			'starred'     => 0,
@@ -195,23 +436,32 @@ return [
 			'allow_gid'   => '',
 			'deny_cid'    => '',
 			'deny_gid'    => '',
+			'guid'        => '5',
 		],
 		[
 			'id'          => 6,
 			'uri-id'      => 6,
+			'uri'         => '6',
 			'visible'     => 1,
 			'contact-id'  => 44,
 			'author-id'   => 44,
 			'owner-id'    => 42,
+			'causer-id'   => 44,
 			'uid'         => 42,
 			'verb'        => 'http://activitystrea.ms/schema/1.0/post',
 			'unseen'      => 0,
-			'body'        => 'Friend user status',
 			'parent'      => 6,
+			'parent-uri-id' => 6,
+			'parent-uri'  => '6',
+			'thr-parent-id' => 6,
+			'thr-parent'  => '6',
+			'private'     => 0,
+			'gravity'     => GRAVITY_PARENT,
 			'author-link' => 'http://localhost/profile/othercontact',
 			'wall'        => 1,
 			'starred'     => 0,
 			'origin'      => 1,
+			'guid'        => '6',
 		],
 	],
 	'notify' => [
@@ -228,40 +478,11 @@ return [
 			'iid' => 4,
 			'seen' => 0,
 			'verb' => '',
-			'otype' => 'item',
+			'otype' => Notification\ObjectType::ITEM,
 			'name_cache' => 'Reply to',
 			'msg_cache' => 'A test reply from an item',
 		],
 	],
-	'thread'  => [
-		[
-			'iid'        => 1,
-			'visible'    => 1,
-			'contact-id' => 42,
-			'author-id'  => 42,
-			'owner-id'   => 42,
-			'uid'        => 42,
-			'wall'       => 1,
-		],
-		[
-			'iid'        => 3,
-			'visible'    => 1,
-			'contact-id' => 43,
-			'author-id'  => 43,
-			'owner-id'   => 43,
-			'uid'        => 0,
-			'wall'       => 1,
-		],
-		[
-			'iid'        => 6,
-			'visible'    => 1,
-			'contact-id' => 44,
-			'author-id'  => 44,
-			'owner-id'   => 44,
-			'uid'        => 0,
-			'wall'       => 1,
-		],
-	],
 	'profile' => [
 		[
 			'id' => 1,