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;
Logger::log("Fetching diaspora key for: ".$handle);
- $r = self::personByHandle($handle);
+ $r = FContact::getByURL($handle);
if ($r) {
return $r["pubkey"];
}
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
*
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
*
*/
public static function isSupportedByContactUrl($url, $update = null)
{
- return !empty(self::personByHandle($url, $update));
+ return !empty(FContact::getByURL($url, $update));
}
/**
// 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]';
$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
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']);
}
}
- /**
- * 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
*
continue;
}
- $person = self::personByHandle($match[3]);
+ $person = FContact::getByURL($match[3]);
if (empty($person)) {
continue;
}
return false;
}
- $person = self::personByHandle($author);
+ $person = FContact::getByURL($author);
if (!is_array($person)) {
Logger::log("unable to find author details");
return false;
$datarray["owner-link"] = $contact["url"];
$datarray["owner-id"] = Contact::getIdForURL($contact["url"], 0);
+ // Will be overwritten for sharing accounts in Item::insert
+ $datarray['post-type'] = ($datarray["uid"] == 0) ? Item::PT_GLOBAL : Item::PT_COMMENT;
+
$datarray["guid"] = $guid;
$datarray["uri"] = self::getUriFromGuid($author, $guid);
$datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
$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'],
return false;
}
- $person = self::personByHandle($author);
+ $person = FContact::getByURL($author);
if (!is_array($person)) {
Logger::log("unable to find author details");
return false;
$message_uri = $author.":".$guid;
- $person = self::personByHandle($author);
+ $person = FContact::getByURL($author);
if (!$person) {
Logger::log("unable to find author details");
return false;
return false;
}
- $person = self::personByHandle($author);
+ $person = FContact::getByURL($author);
if (!is_array($person)) {
Logger::log("Person not found: ".$author);
return false;
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);
$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;
$datarray["protocol"] = Conversation::PARCEL_DIASPORA;
$datarray["source"] = $xml;
+ if ($datarray["uid"] == 0) {
+ $datarray["post-type"] = Item::PT_GLOBAL;
+ }
+
$datarray["body"] = self::replacePeopleGuid($body, $contact["url"]);
self::storeMentions($datarray['uri-id'], $text);
// 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"]);
}
projects / friendica.git / blobdiff