X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FFContact.php;h=006a37a608510b3d3453a8ffb0ab4504d25ae94a;hb=87673fd0c52b40d1100fd46c648c786bab3750cf;hp=0fc4633275284d761ecc4fc4f8d7135bc90f781b;hpb=9ac284ec3a01af8687015bc8ba7583662d61485f;p=friendica.git

diff --git a/src/Model/FContact.php b/src/Model/FContact.php
index 0fc4633275..006a37a608 100644
--- a/src/Model/FContact.php
+++ b/src/Model/FContact.php
@@ -24,9 +24,7 @@ namespace Friendica\Model;
 use Friendica\Core\Logger;
 use Friendica\Core\Protocol;
 use Friendica\Database\DBA;
-use Friendica\DI;
 use Friendica\Network\Probe;
-use Friendica\Protocol\Activity;
 use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Strings;
 
@@ -121,75 +119,11 @@ class FContact
 	{
 		Logger::info('fcontact', ['guid' => $fcontact_guid]);
 
-		$r = q(
-			"SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
-			DBA::escape(Protocol::DIASPORA),
-			DBA::escape($fcontact_guid)
-		);
-
-		if (DBA::isResult($r)) {
-			return $r[0]['url'];
+		$fcontact = DBA::selectFirst('fcontact', ['url'], ["`url` != ? AND `network` = ? AND `guid` = ?", '', Protocol::DIASPORA, $fcontact_guid]);
+		if (DBA::isResult($fcontact)) {
+			return $fcontact['url'];
 		}
 
 		return null;
 	}
-
-	/**
-	 * Suggest a given contact to a given user from a given contact
-	 *
-	 * @param integer $uid
-	 * @param integer $cid
-	 * @param integer $from_cid
-	 * @return bool   Was the adding successful?
-	 */
-	public static function addSuggestion(int $uid, int $cid, int $from_cid, string $note = '')
-	{
-		$owner = User::getOwnerDataById($uid);
-		$contact = Contact::getById($cid);
-		$from_contact = Contact::getById($from_cid);
-
-		if (DBA::exists('contact', ['nurl' => Strings::normaliseLink($contact['url']), 'uid' => $uid])) {
-			return false;
-		}
-
-		$fcontact = self::getByURL($contact['url'], null, $contact['network']);
-		if (empty($fcontact)) {
-			Logger::warning('FContact had not been found', ['fcontact' => $contact['url']]);
-			return false;
-		}
-
-		$fid = $fcontact['id'];
-
-		// Quit if we already have an introduction for this person
-		if (DBA::exists('intro', ['uid' => $uid, 'fid' => $fid])) {
-			return false;
-		}
-
-		$suggest = [];
-		$suggest['uid'] = $uid;
-		$suggest['cid'] = $from_cid;
-		$suggest['url'] = $contact['url'];
-		$suggest['name'] = $contact['name'];
-		$suggest['photo'] = $contact['photo'];
-		$suggest['request'] = $contact['request'];
-		$suggest['title'] = '';
-		$suggest['body'] = $note;
-
-		$hash = Strings::getRandomHex();
-		$fields = ['uid' => $suggest['uid'], 'fid' => $fid, 'contact-id' => $suggest['cid'], 
-			'note' => $suggest['body'], 'hash' => $hash, 'datetime' => DateTimeFormat::utcNow(), 'blocked' => false];
-		DBA::insert('intro', $fields);
-
-		notification([
-			'type'  => Notification\Type::SUGGEST,
-			'otype' => Notification\ObjectType::INTRO,
-			'verb'  => Activity::REQ_FRIEND,
-			'uid'   => $owner['uid'],
-			'cid'   => $from_contact['uid'],
-			'item'  => $suggest,
-			'link'  => DI::baseUrl().'/notifications/intros',
-		]);
-
-		return true;
-	}
 }