From d2feb1ff7fec312d00d66ca0c41357f9baabef07 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 16 Jan 2021 07:49:20 +0000
Subject: [PATCH] Making the test work

---
 database.sql             | 12 ++++++------
 include/api.php          |  2 +-
 static/dbview.config.php | 12 ++++++------
 3 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/database.sql b/database.sql
index 8d0d3594c9..226c151335 100644
--- a/database.sql
+++ b/database.sql
@@ -1628,18 +1628,18 @@ CREATE VIEW `post-view` AS SELECT
 	`parent-item-author`.`name` AS `parent-author-name`,
 	`parent-item-author`.`network` AS `parent-author-network`
 	FROM `item`
-			LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			LEFT JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
-			LEFT JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
-			LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
+			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
+			STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
 			LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
 			LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
 			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
 			LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id`
 			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `item`.`uri-id` AND `item`.`origin`
 			LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
-			LEFT JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
-			LEFT JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`;
+			STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
+			STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`;
 
 --
 -- VIEW category-view
diff --git a/include/api.php b/include/api.php
index 26a377821e..b649d22481 100644
--- a/include/api.php
+++ b/include/api.php
@@ -2041,7 +2041,7 @@ function api_statuses_repeat($type)
 	Logger::log('API: api_statuses_repeat: '.$id);
 
 	$fields = ['uri-id', 'network', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
-	$item = Post::selectFirst($fields, ['id' => $id, 'private' => [Item::PUBLIC, Item::UNLISTED]]);
+	$item = Item::selectFirst($fields, ['id' => $id, 'private' => [Item::PUBLIC, Item::UNLISTED]]);
 
 	if (DBA::isResult($item) && $item['body'] != "") {
 		if (in_array($item['network'], [Protocol::ACTIVITYPUB, Protocol::DFRN, Protocol::TWITTER])) {
diff --git a/static/dbview.config.php b/static/dbview.config.php
index 1772ff9ad2..b0bf7ed615 100644
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -175,18 +175,18 @@
 			"parent-author-network" => ["parent-item-author", "network"], 
 		],
 		"query" => "FROM `item`
-			LEFT JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
-			LEFT JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
-			LEFT JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
-			LEFT JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
+			STRAIGHT_JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
+			STRAIGHT_JOIN `contact` AS `author` ON `author`.`id` = `item`.`author-id`
+			STRAIGHT_JOIN `contact` AS `owner` ON `owner`.`id` = `item`.`owner-id`
+			STRAIGHT_JOIN `contact` AS `causer` ON `causer`.`id` = `item`.`causer-id`
 			LEFT JOIN `verb` ON `verb`.`id` = `item`.`vid`
 			LEFT JOIN `event` ON `event`.`id` = `item`.`event-id`
 			LEFT JOIN `diaspora-interaction` ON `diaspora-interaction`.`uri-id` = `item`.`uri-id`
 			LEFT JOIN `item-content` ON `item-content`.`uri-id` = `item`.`uri-id`
 			LEFT JOIN `post-delivery-data` ON `post-delivery-data`.`uri-id` = `item`.`uri-id` AND `item`.`origin`
 			LEFT JOIN `permissionset` ON `permissionset`.`id` = `item`.`psid`
-			LEFT JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
-			LEFT JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`"
+			STRAIGHT_JOIN `item` AS `parent-item` ON `parent-item`.`id` = `item`.`parent`
+			STRAIGHT_JOIN `contact` AS `parent-item-author` ON `parent-item-author`.`id` = `parent-item`.`author-id`"
 	],
 	"category-view" => [
 		"fields" => [