sforkowany z mirror/friendica
New "fcontact" model class
Michael
rodzic
307af4a4fd
commit
d4f7bfa676
|
|
@ -0,0 +1,133 @@
|
|||
<?php
|
||||
/**
|
||||
* @copyright Copyright (C) 2020, Friendica
|
||||
*
|
||||
* @license GNU AGPL version 3 or any later version
|
||||
*
|
||||
* This program is free software: you can redistribute it and/or modify
|
||||
* it under the terms of the GNU Affero General Public License as
|
||||
* published by the Free Software Foundation, either version 3 of the
|
||||
* License, or (at your option) any later version.
|
||||
*
|
||||
* This program is distributed in the hope that it will be useful,
|
||||
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
||||
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
||||
* GNU Affero General Public License for more details.
|
||||
*
|
||||
* You should have received a copy of the GNU Affero General Public License
|
||||
* along with this program. If not, see <https://www.gnu.org/licenses/>.
|
||||
*
|
||||
*/
|
||||
|
||||
namespace Friendica\Model;
|
||||
|
||||
use Friendica\Core\Logger;
|
||||
use Friendica\Core\Protocol;
|
||||
use Friendica\Database\DBA;
|
||||
use Friendica\Network\Probe;
|
||||
use Friendica\Util\DateTimeFormat;
|
||||
use Friendica\Util\Strings;
|
||||
|
||||
class FContact
|
||||
{
|
||||
/**
|
||||
* Fetches data for a given handle
|
||||
*
|
||||
* @param string $handle The handle
|
||||
* @param boolean $update true = always update, false = never update, null = update when not found or outdated
|
||||
*
|
||||
* @return array the queried data
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
* @throws \ImagickException
|
||||
*/
|
||||
public static function getByUrl($handle, $update = null)
|
||||
{
|
||||
$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' => Protocol::DIASPORA, 'url' => $urls]);
|
||||
}
|
||||
|
||||
if (DBA::isResult($person)) {
|
||||
Logger::debug('In cache', ['person' => $person]);
|
||||
|
||||
if (is_null($update)) {
|
||||
// update record occasionally so it doesn't get stale
|
||||
$d = strtotime($person["updated"]." +00:00");
|
||||
if ($d < strtotime("now - 14 days")) {
|
||||
$update = true;
|
||||
}
|
||||
|
||||
if ($person["guid"] == "") {
|
||||
$update = true;
|
||||
}
|
||||
}
|
||||
} elseif (is_null($update)) {
|
||||
$update = !DBA::isResult($person);
|
||||
} else {
|
||||
$person = [];
|
||||
}
|
||||
|
||||
if ($update) {
|
||||
Logger::info('create or refresh', ['handle' => $handle]);
|
||||
$r = 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"] === Protocol::DIASPORA)) {
|
||||
self::updateFContact($r);
|
||||
|
||||
$person = self::getByUrl($handle, false);
|
||||
}
|
||||
}
|
||||
|
||||
return $person;
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the fcontact table
|
||||
*
|
||||
* @param array $arr The fcontact data
|
||||
* @throws \Exception
|
||||
*/
|
||||
private static function updateFContact($arr)
|
||||
{
|
||||
$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"],
|
||||
'updated' => DateTimeFormat::utcNow()];
|
||||
|
||||
$condition = ['url' => $arr["url"], 'network' => $arr["network"]];
|
||||
|
||||
DBA::update('fcontact', $fields, $condition, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* get a url (scheme://domain.tld/u/user) from a given Diaspora*
|
||||
* fcontact guid
|
||||
*
|
||||
* @param mixed $fcontact_guid Hexadecimal string guid
|
||||
*
|
||||
* @return string the contact url or null
|
||||
* @throws \Exception
|
||||
*/
|
||||
public static function getUrlByGuid($fcontact_guid)
|
||||
{
|
||||
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'];
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
|
@ -33,6 +33,7 @@ use Friendica\DI;
|
|||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Conversation;
|
||||
use Friendica\Model\Event;
|
||||
use Friendica\Model\FContact;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Model\ItemURI;
|
||||
use Friendica\Model\Mail;
|
||||
|
|
@ -1409,7 +1410,7 @@ class DFRN
|
|||
}
|
||||
}
|
||||
|
||||
$fcontact = Diaspora::personByHandle($contact['addr']);
|
||||
$fcontact = FContact::getByUrl($contact['addr']);
|
||||
if (empty($fcontact)) {
|
||||
Logger::log('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
|
||||
return -22;
|
||||
|
|
|
|||
|
|
@ -34,6 +34,7 @@ use Friendica\Database\DBA;
|
|||
use Friendica\DI;
|
||||
use Friendica\Model\Contact;
|
||||
use Friendica\Model\Conversation;
|
||||
use Friendica\Model\FContact;
|
||||
use Friendica\Model\Item;
|
||||
use Friendica\Model\ItemURI;
|
||||
use Friendica\Model\Mail;
|
||||
|
|
@ -936,7 +937,7 @@ class Diaspora
|
|||
|
||||
Logger::log("Fetching diaspora key for: ".$handle);
|
||||
|
||||
$r = self::personByHandle($handle);
|
||||
$r = FContact::getByUrl($handle);
|
||||
if ($r) {
|
||||
return $r["pubkey"];
|
||||
}
|
||||
|
|
@ -944,81 +945,6 @@ class Diaspora
|
|||
return "";
|
||||
}
|
||||
|
||||
/**
|
||||
* Fetches data for a given handle
|
||||
*
|
||||
* @param string $handle The handle
|
||||
* @param boolean $update true = always update, false = never update, null = update when not found or outdated
|
||||
*
|
||||
* @return array the queried data
|
||||
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
|
||||
* @throws \ImagickException
|
||||
*/
|
||||
public static function personByHandle($handle, $update = null)
|
||||
{
|
||||
$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' => Protocol::DIASPORA, 'url' => $urls]);
|
||||
}
|
||||
|
||||
if (DBA::isResult($person)) {
|
||||
Logger::debug('In cache', ['person' => $person]);
|
||||
|
||||
if (is_null($update)) {
|
||||
// update record occasionally so it doesn't get stale
|
||||
$d = strtotime($person["updated"]." +00:00");
|
||||
if ($d < strtotime("now - 14 days")) {
|
||||
$update = true;
|
||||
}
|
||||
|
||||
if ($person["guid"] == "") {
|
||||
$update = true;
|
||||
}
|
||||
}
|
||||
} elseif (is_null($update)) {
|
||||
$update = !DBA::isResult($person);
|
||||
} else {
|
||||
$person = [];
|
||||
}
|
||||
|
||||
if ($update) {
|
||||
Logger::log("create or refresh", Logger::DEBUG);
|
||||
$r = 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"] === Protocol::DIASPORA)) {
|
||||
self::updateFContact($r);
|
||||
|
||||
$person = self::personByHandle($handle, false);
|
||||
}
|
||||
}
|
||||
|
||||
return $person;
|
||||
}
|
||||
|
||||
/**
|
||||
* Updates the fcontact table
|
||||
*
|
||||
* @param array $arr The fcontact data
|
||||
* @throws \Exception
|
||||
*/
|
||||
private static function updateFContact($arr)
|
||||
{
|
||||
$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"],
|
||||
'updated' => DateTimeFormat::utcNow()];
|
||||
|
||||
$condition = ['url' => $arr["url"], 'network' => $arr["network"]];
|
||||
|
||||
DBA::update('fcontact', $fields, $condition, true);
|
||||
}
|
||||
|
||||
/**
|
||||
* get a handle (user@domain.tld) from a given contact id
|
||||
*
|
||||
|
|
@ -1066,32 +992,6 @@ class Diaspora
|
|||
return strtolower($handle);
|
||||
}
|
||||
|
||||
/**
|
||||
* get a url (scheme://domain.tld/u/user) from a given Diaspora*
|
||||
* fcontact guid
|
||||
*
|
||||
* @param mixed $fcontact_guid Hexadecimal string guid
|
||||
*
|
||||
* @return string the contact url or null
|
||||
* @throws \Exception
|
||||
*/
|
||||
public static function urlFromContactGuid($fcontact_guid)
|
||||
{
|
||||
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'];
|
||||
}
|
||||
|
||||
return null;
|
||||
}
|
||||
|
||||
/**
|
||||
* Get a contact id for a given handle
|
||||
*
|
||||
|
|
@ -1120,7 +1020,7 @@ class Diaspora
|
|||
*/
|
||||
public static function isSupportedByContactUrl($url, $update = null)
|
||||
{
|
||||
return !empty(self::personByHandle($url, $update));
|
||||
return !empty(FContact::getByUrl($url, $update));
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
@ -1272,7 +1172,7 @@ class Diaspora
|
|||
// 0 => '[url=/people/0123456789abcdef]Foo Bar[/url]'
|
||||
// 1 => '0123456789abcdef'
|
||||
// 2 => 'Foo Bar'
|
||||
$handle = self::urlFromContactGuid($match[1]);
|
||||
$handle = FContact::getUrlByGuid($match[1]);
|
||||
|
||||
if ($handle) {
|
||||
$return = '@[url='.$handle.']'.$match[2].'[/url]';
|
||||
|
|
@ -1479,7 +1379,7 @@ class Diaspora
|
|||
$item = Item::selectFirst($fields, $condition);
|
||||
|
||||
if (!DBA::isResult($item)) {
|
||||
$person = self::personByHandle($author);
|
||||
$person = FContact::getByUrl($author);
|
||||
$result = self::storeByGuid($guid, $person["url"], $uid);
|
||||
|
||||
// We don't have an url for items that arrived at the public dispatcher
|
||||
|
|
@ -1702,7 +1602,7 @@ class Diaspora
|
|||
if (DBA::isResult($item)) {
|
||||
return $item["uri"];
|
||||
} elseif (!$onlyfound) {
|
||||
$person = self::personByHandle($author);
|
||||
$person = FContact::getByUrl($author);
|
||||
|
||||
$parts = parse_url($person['url']);
|
||||
unset($parts['path']);
|
||||
|
|
@ -1733,27 +1633,6 @@ class Diaspora
|
|||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* Find the best importer for a comment, like, ...
|
||||
*
|
||||
* @param string $guid The guid of the item
|
||||
*
|
||||
* @return array|boolean the origin owner of that post - or false
|
||||
* @throws \Exception
|
||||
*/
|
||||
private static function importerForGuid($guid)
|
||||
{
|
||||
$item = Item::selectFirst(['uid'], ['origin' => true, 'guid' => $guid]);
|
||||
if (DBA::isResult($item)) {
|
||||
Logger::log("Found user ".$item['uid']." as owner of item ".$guid, Logger::DEBUG);
|
||||
$contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $item['uid']]);
|
||||
if (DBA::isResult($contact)) {
|
||||
return $contact;
|
||||
}
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Store the mentions in the tag table
|
||||
*
|
||||
|
|
@ -1779,7 +1658,7 @@ class Diaspora
|
|||
continue;
|
||||
}
|
||||
|
||||
$person = self::personByHandle($match[3]);
|
||||
$person = FContact::getByUrl($match[3]);
|
||||
if (empty($person)) {
|
||||
continue;
|
||||
}
|
||||
|
|
@ -1835,7 +1714,7 @@ class Diaspora
|
|||
return false;
|
||||
}
|
||||
|
||||
$person = self::personByHandle($author);
|
||||
$person = FContact::getByUrl($author);
|
||||
if (!is_array($person)) {
|
||||
Logger::log("unable to find author details");
|
||||
return false;
|
||||
|
|
@ -1950,7 +1829,7 @@ class Diaspora
|
|||
$body = Markdown::toBBCode($msg_text);
|
||||
$message_uri = $msg_author.":".$msg_guid;
|
||||
|
||||
$person = self::personByHandle($msg_author);
|
||||
$person = FContact::getByUrl($msg_author);
|
||||
|
||||
return Mail::insert([
|
||||
'uid' => $importer['uid'],
|
||||
|
|
@ -2067,7 +1946,7 @@ class Diaspora
|
|||
return false;
|
||||
}
|
||||
|
||||
$person = self::personByHandle($author);
|
||||
$person = FContact::getByUrl($author);
|
||||
if (!is_array($person)) {
|
||||
Logger::log("unable to find author details");
|
||||
return false;
|
||||
|
|
@ -2173,7 +2052,7 @@ class Diaspora
|
|||
|
||||
$message_uri = $author.":".$guid;
|
||||
|
||||
$person = self::personByHandle($author);
|
||||
$person = FContact::getByUrl($author);
|
||||
if (!$person) {
|
||||
Logger::log("unable to find author details");
|
||||
return false;
|
||||
|
|
@ -2239,7 +2118,7 @@ class Diaspora
|
|||
return false;
|
||||
}
|
||||
|
||||
$person = self::personByHandle($author);
|
||||
$person = FContact::getByUrl($author);
|
||||
if (!is_array($person)) {
|
||||
Logger::log("Person not found: ".$author);
|
||||
return false;
|
||||
|
|
@ -2513,7 +2392,7 @@ class Diaspora
|
|||
Logger::log("Author ".$author." wants to listen to us.", Logger::DEBUG);
|
||||
}
|
||||
|
||||
$ret = self::personByHandle($author);
|
||||
$ret = FContact::getByUrl($author);
|
||||
|
||||
if (!$ret || ($ret["network"] != Protocol::DIASPORA)) {
|
||||
Logger::log("Cannot resolve diaspora handle ".$author." for ".$recipient);
|
||||
|
|
@ -2801,7 +2680,7 @@ class Diaspora
|
|||
$target_guid = Strings::escapeTags(XML::unescape($data->target_guid));
|
||||
$target_type = Strings::escapeTags(XML::unescape($data->target_type));
|
||||
|
||||
$person = self::personByHandle($author);
|
||||
$person = FContact::getByUrl($author);
|
||||
if (!is_array($person)) {
|
||||
Logger::log("unable to find author detail for ".$author);
|
||||
return false;
|
||||
|
|
@ -3204,7 +3083,7 @@ class Diaspora
|
|||
// We always try to use the data from the fcontact table.
|
||||
// This is important for transmitting data to Friendica servers.
|
||||
if (!empty($contact['addr'])) {
|
||||
$fcontact = self::personByHandle($contact['addr']);
|
||||
$fcontact = FContact::getByUrl($contact['addr']);
|
||||
if (!empty($fcontact)) {
|
||||
$dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]);
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,6 +33,7 @@ use Friendica\Protocol\Activity;
|
|||
use Friendica\Util\Strings;
|
||||
use Friendica\Util\Network;
|
||||
use Friendica\Core\Worker;
|
||||
use Friendica\Model\FContact;
|
||||
|
||||
class Delivery
|
||||
{
|
||||
|
|
@ -267,7 +268,7 @@ class Delivery
|
|||
private static function deliverDFRN($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup)
|
||||
{
|
||||
// Transmit Diaspora reshares via Diaspora if the Friendica contact support Diaspora
|
||||
if (Diaspora::isReshare($target_item['body']) && !empty(Diaspora::personByHandle($contact['addr'], false))) {
|
||||
if (Diaspora::isReshare($target_item['body']) && !empty(FContact::getByUrl($contact['addr'], false))) {
|
||||
Logger::info('Reshare will be transmitted via Diaspora', ['url' => $contact['url'], 'guid' => ($target_item['guid'] ?? '') ?: $target_item['id']]);
|
||||
self::deliverDiaspora($cmd, $contact, $owner, $items, $target_item, $public_message, $top_level, $followup);
|
||||
return;
|
||||
|
|
|
|||
Ładowanie…
Reference in New Issue