X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FContact%2FRelation.php;h=5616148fa0183e2d774d3c70f585c80218faced9;hb=1d00947bcde4b75cec21c9bf813ef8f109bafc1b;hp=b8fd3aa95b671bdc22611024b2743ecfded4f36b;hpb=2a2e1a9e1271a85165fb6116999bca2fe1a71327;p=friendica.git

diff --git a/src/Model/Contact/Relation.php b/src/Model/Contact/Relation.php
index b8fd3aa95b..5616148fa0 100644
--- a/src/Model/Contact/Relation.php
+++ b/src/Model/Contact/Relation.php
@@ -260,6 +260,59 @@ class Relation
 		return true;
 	}
 
+	/**
+	 * Check if the cached suggestion is outdated
+	 *
+	 * @param integer $uid
+	 * @return boolean
+	 */
+	static public function areSuggestionsOutdated(int $uid): bool
+	{
+		return DI::pConfig()->get($uid, 'suggestion', 'last_update') + 3600 < time();
+	}
+
+	/**
+	 * Update contact suggestions for a given user
+	 *
+	 * @param integer $uid
+	 * @return void
+	 */
+	static public function updateCachedSuggestions(int $uid)
+	{
+		if (!self::areSuggestionsOutdated($uid)) {
+			return;
+		}
+
+		DBA::delete('account-suggestion', ['uid' => $uid, 'ignore' => false]);
+
+		foreach (self::getSuggestions($uid) as $contact) {
+			DBA::insert('account-suggestion', ['uri-id' => $contact['uri-id'], 'uid' => $uid, 'level' => 1], Database::INSERT_IGNORE);
+		}
+
+		DI::pConfig()->set($uid, 'suggestion', 'last_update', time());
+	}
+
+	/**
+	 * Returns a cached array of suggested contacts for given user id
+	 *
+	 * @param int $uid   User id
+	 * @param int $start optional, default 0
+	 * @param int $limit optional, default 80
+	 * @return array
+	 */
+	static public function getCachedSuggestions(int $uid, int $start = 0, int $limit = 80): array
+	{
+		$condition = ["`uid` = ? AND `uri-id` IN (SELECT `uri-id` FROM `account-suggestion` WHERE NOT `ignore` AND `uid` = ?)", 0, $uid];
+		$params = ['limit' => [$start, $limit]];
+		$cached = DBA::selectToArray('contact', [], $condition, $params);
+
+		if (!empty($cached)) {
+			return $cached;
+		} else {
+			return self::getSuggestions($uid, $start, $limit);
+		}
+	}
+
 	/**
 	 * Returns an array of suggested contacts for given user id
 	 *
@@ -270,6 +323,10 @@ class Relation
 	 */
 	static public function getSuggestions(int $uid, int $start = 0, int $limit = 80): array
 	{
+		if ($uid == 0) {
+			return [];
+		}
+
 		$cid = Contact::getPublicIdByUserId($uid);
 		$totallimit = $start + $limit;
 		$contacts = [];
@@ -284,12 +341,13 @@ class Relation
 		$results = DBA::select('contact', [], ["`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` IN
 				(SELECT `cid` FROM `contact-relation` WHERE `relation-cid` = ?)
 					AND NOT `cid` IN (SELECT `id` FROM `contact` WHERE `uid` = ? AND `nurl` IN
-						(SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))))
-			AND NOT `hidden` AND `network` IN (?, ?, ?, ?)",
+						(SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))) AND `id` = `cid`)
+			AND NOT `hidden` AND `network` IN (?, ?, ?, ?)
+			AND NOT `uri-id` IN (SELECT `uri-id` FROM `account-suggestion` WHERE `uri-id` = `contact`.`uri-id` AND `uid` = ?)",
 			$cid,
 			0,
 			$uid, Contact::FRIEND, Contact::SHARING,
-			Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus,
+			Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus, $uid
 			], [
 				'order' => ['last-item' => true],
 				'limit' => $totallimit,
@@ -314,10 +372,11 @@ class Relation
 			["`id` IN (SELECT `cid` FROM `contact-relation` WHERE `relation-cid` IN
 				(SELECT `relation-cid` FROM `contact-relation` WHERE `cid` = ?)
 					AND NOT `cid` IN (SELECT `id` FROM `contact` WHERE `uid` = ? AND `nurl` IN
-						(SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))))
-			AND NOT `hidden` AND `network` IN (?, ?, ?, ?)",
+						(SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))) AND `id` = `cid`)
+			AND NOT `hidden` AND `network` IN (?, ?, ?, ?)
+			AND NOT `uri-id` IN (SELECT `uri-id` FROM `account-suggestion` WHERE `uri-id` = `contact`.`uri-id` AND `uid` = ?)",
 			$cid, 0, $uid, Contact::FRIEND, Contact::SHARING,
-			Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus],
+			Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus, $uid],
 			['order' => ['last-item' => true], 'limit' => $totallimit]
 		);
 
@@ -335,9 +394,10 @@ class Relation
 		// The query returns contacts that follow the given user but aren't followed by that user.
 		$results = DBA::select('contact', [],
 			["`nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` = ?)
-			AND NOT `hidden` AND `uid` = ? AND `network` IN (?, ?, ?, ?)",
+			AND NOT `hidden` AND `uid` = ? AND `network` IN (?, ?, ?, ?)
+			AND NOT `uri-id` IN (SELECT `uri-id` FROM `account-suggestion` WHERE `uri-id` = `contact`.`uri-id` AND `uid` = ?)",
 			$uid, Contact::FOLLOWER, 0, 
-			Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus],
+			Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus, $uid],
 			['order' => ['last-item' => true], 'limit' => $totallimit]
 		);
 
@@ -354,10 +414,11 @@ class Relation
 
 		// The query returns any contact that isn't followed by that user.
 		$results = DBA::select('contact', [],
-			["NOT `nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?))
-			AND NOT `hidden` AND `uid` = ? AND `network` IN (?, ?, ?, ?)",
+			["NOT `nurl` IN (SELECT `nurl` FROM `contact` WHERE `uid` = ? AND `rel` IN (?, ?) AND `nurl` = `nurl`)
+			AND NOT `hidden` AND `uid` = ? AND `network` IN (?, ?, ?, ?)
+			AND NOT `uri-id` IN (SELECT `uri-id` FROM `account-suggestion` WHERE `uri-id` = `contact`.`uri-id` AND `uid` = ?)",
 			$uid, Contact::FRIEND, Contact::SHARING, 0, 
-			Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus],
+			Protocol::ACTIVITYPUB, Protocol::DFRN, $diaspora, $ostatus, $uid],
 			['order' => ['last-item' => true], 'limit' => $totallimit]
 		);