X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModel%2FFContact.php;h=6812f5fd09d87ef1070c21a1f570ef6c3aa5e205;hb=6dbbd081795fa1c8fe57db2248ac162efeeada88;hp=2be8aa906c9e0bf02ee7ba473bc5366df3e653dc;hpb=2bfd9851d30b56821e042c6882db84ec62fd8a2a;p=friendica.git diff --git a/src/Model/FContact.php b/src/Model/FContact.php index 2be8aa906c..6812f5fd09 100644 --- a/src/Model/FContact.php +++ b/src/Model/FContact.php @@ -1,6 +1,6 @@ $network, 'addr' => $handle]); + $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]); if (!DBA::isResult($person)) { $urls = [$handle, str_replace('http://', 'https://', $handle), Strings::normaliseLink($handle)]; - $person = DBA::selectFirst('fcontact', [], ['network' => $network, 'url' => $urls]); + $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'url' => $urls]); } if (DBA::isResult($person)) { @@ -61,7 +58,7 @@ class FContact $update = true; } - if ($person["guid"] == "") { + if (empty($person['guid']) || empty($person['uri-id'])) { $update = true; } } @@ -73,14 +70,14 @@ class FContact if ($update) { Logger::info('create or refresh', ['handle' => $handle]); - $r = Probe::uri($handle, $network); + $data = Probe::uri($handle, Protocol::DIASPORA); // Note that Friendica contacts will return a "Diaspora person" // if Diaspora connectivity is enabled on their server - if ($r && ($r["network"] === $network)) { - self::updateFContact($r); + if ($data['network'] ?? '' === Protocol::DIASPORA) { + self::updateFromProbeArray($data); - $person = self::getByURL($handle, false, $network); + $person = self::getByURL($handle, false); } } @@ -93,14 +90,27 @@ class FContact * @param array $arr The fcontact data * @throws \Exception */ - private static function updateFContact($arr) + public static function updateFromProbeArray($arr) { + $uriid = ItemURI::insert(['uri' => $arr['url'], 'guid' => $arr['guid']]); + + $contact = Contact::getByUriId($uriid, ['id']); + if (!empty($contact['id'])) { + $last_interaction = DateTimeFormat::utc('now - 180 days'); + + $interacted = DBA::count('contact-relation', ["`cid` = ? AND NOT `follows` AND `last-interaction` > ?", $contact['id'], $last_interaction]); + $interacting = DBA::count('contact-relation', ["`relation-cid` = ? AND NOT `follows` AND `last-interaction` > ?", $contact['id'], $last_interaction]); + $posts = Post::countPosts(['author-id' => $contact['id'], 'gravity' => [GRAVITY_PARENT, GRAVITY_COMMENT]]); + } + $fields = ['name' => $arr["name"], 'photo' => $arr["photo"], 'request' => $arr["request"], 'nick' => $arr["nick"], 'addr' => strtolower($arr["addr"]), 'guid' => $arr["guid"], 'batch' => $arr["batch"], 'notify' => $arr["notify"], 'poll' => $arr["poll"], 'confirm' => $arr["confirm"], 'alias' => $arr["alias"], 'pubkey' => $arr["pubkey"], + 'uri-id' => $uriid, 'interacting_count' => $interacting ?? 0, + 'interacted_count' => $interacted ?? 0, 'post_count' => $posts ?? 0, 'updated' => DateTimeFormat::utcNow()]; $condition = ['url' => $arr["url"], 'network' => $arr["network"]]; @@ -121,81 +131,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' => Type::SUGGEST, - 'notify_flags' => $owner['notify-flags'], - 'language' => $owner['language'], - 'to_name' => $owner['name'], - 'to_email' => $owner['email'], - 'uid' => $owner['uid'], - 'item' => $suggest, - 'link' => DI::baseUrl().'/notifications/intros', - 'source_name' => $from_contact['name'], - 'source_link' => $from_contact['url'], - 'source_photo' => $from_contact['photo'], - 'verb' => Activity::REQ_FRIEND, - 'otype' => 'intro' - ]); - - return true; - } }