From c4f7f3e26ecd867d1d99238b056b8d11bb52a2a1 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Fri, 24 Apr 2020 12:59:19 +0000
Subject: [PATCH] And some more view calls added

---
 mod/display.php          |  6 +-----
 src/Model/Profile.php    | 20 ++++----------------
 static/dbview.config.php |  2 ++
 3 files changed, 7 insertions(+), 21 deletions(-)

diff --git a/mod/display.php b/mod/display.php
index 107e666d48..a06d8a7239 100644
--- a/mod/display.php
+++ b/mod/display.php
@@ -116,11 +116,7 @@ function display_init(App $a)
 		$nickname = str_replace(Strings::normaliseLink(DI::baseUrl()) . '/profile/', '', Strings::normaliseLink($profiledata['url']));
 
 		if (!empty($a->user['nickname']) && $nickname != $a->user['nickname']) {
-			$profile = DBA::fetchFirst("SELECT `profile`.* , `contact`.`avatar-date` AS picdate, `user`.* FROM `profile`
-				INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
-				WHERE `user`.`nickname` = ? AND `contact`.`self` LIMIT 1",
-				$nickname
-			);
+			$profile = DBA::selectFirst('owner-view', [], ['nickname' => $nickname]);
 			if (DBA::isResult($profile)) {
 				$profiledata = $profile;
 			}
diff --git a/src/Model/Profile.php b/src/Model/Profile.php
index 867a6db4fb..ec862947ba 100644
--- a/src/Model/Profile.php
+++ b/src/Model/Profile.php
@@ -234,19 +234,7 @@ class Profile
 	 */
 	public static function getByNickname($nickname, $uid = 0)
 	{
-		$profile = DBA::fetchFirst(
-			"SELECT `contact`.`id` AS `contact_id`, `contact`.`photo` AS `contact_photo`,
-				`contact`.`thumb` AS `contact_thumb`, `contact`.`micro` AS `contact_micro`,
-				`profile`.*,
-				`contact`.`avatar-date` AS picdate, `contact`.`addr`, `contact`.`url`, `user`.*
-			FROM `profile`
-			INNER JOIN `contact` on `contact`.`uid` = `profile`.`uid` AND `contact`.`self`
-			INNER JOIN `user` ON `profile`.`uid` = `user`.`uid`
-			WHERE `user`.`nickname` = ? AND `profile`.`uid` = ? LIMIT 1",
-			$nickname,
-			intval($uid)
-		);
-
+		$profile = DBA::selectFirst('owner-view', [], ['nickname' => $nickname, 'uid' => $uid]);
 		return $profile;
 	}
 
@@ -399,9 +387,9 @@ class Profile
 				'fullname' => $profile['name'],
 				'firstname' => $firstname,
 				'lastname' => $lastname,
-				'photo300' => $profile['contact_photo'] ?? '',
-				'photo100' => $profile['contact_thumb'] ?? '',
-				'photo50' => $profile['contact_micro'] ?? '',
+				'photo300' => $profile['photo'] ?? '',
+				'photo100' => $profile['thumb'] ?? '',
+				'photo50' => $profile['micro'] ?? '',
 			];
 		} else {
 			$diaspora = false;
diff --git a/static/dbview.config.php b/static/dbview.config.php
index 0fd4048ca7..06f7d3aa95 100755
--- a/static/dbview.config.php
+++ b/static/dbview.config.php
@@ -103,6 +103,8 @@ return [
 			"name-date" => ["contact", "name-date"],
 			"uri-date" => ["contact", "uri-date"],
 			"avatar-date" => ["contact", "avatar-date"],
+			"contact_id" => ["contact", "id"], /// @todo Replaces all uses of "contact_id" with "id"
+			"picdate" => ["contact", "avatar-date"], /// @todo Replaces all uses of "picdate" with "avatar-date"
 			"term-date" => ["contact", "term-date"],
 			"last-item" => ["contact", "last-item"],			
 			"lastitem_date" => ["contact", "last-item"], /// @todo Replaces all uses of "lastitem_date" with "last-item"