namespace Friendica\Protocol;
use Friendica\Content\Feature;
+use Friendica\Content\PageInfo;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown;
use Friendica\Core\Cache\Duration;
use Friendica\DI;
use Friendica\Model\Contact;
use Friendica\Model\Conversation;
-use Friendica\Model\GContact;
+use Friendica\Model\FContact;
use Friendica\Model\Item;
use Friendica\Model\ItemURI;
use Friendica\Model\Mail;
return $contacts;
}
- /**
- * repairs a signature that was double encoded
- *
- * The function is unused at the moment. It was copied from the old implementation.
- *
- * @param string $signature The signature
- * @param string $handle The handle of the signature owner
- * @param integer $level This value is only set inside this function to avoid endless loops
- *
- * @return string the repaired signature
- * @throws \Exception
- */
- private static function repairSignature($signature, $handle = "", $level = 1)
- {
- if ($signature == "") {
- return ($signature);
- }
-
- if (base64_encode(base64_decode(base64_decode($signature))) == base64_decode($signature)) {
- $signature = base64_decode($signature);
- Logger::log("Repaired double encoded signature from Diaspora/Hubzilla handle ".$handle." - level ".$level, Logger::DEBUG);
-
- // Do a recursive call to be able to fix even multiple levels
- if ($level < 10) {
- $signature = self::repairSignature($signature, $handle, ++$level);
- }
- }
-
- return($signature);
- }
-
/**
* verify the envelope and return the verified data
*
$basedom = XML::parseString($xml);
if (!is_object($basedom)) {
- Logger::log("XML is not parseable.");
+ Logger::notice('XML is not parseable.');
return false;
}
$children = $basedom->children('https://joindiaspora.com/protocol');
} else {
// This happens with posts from a relais
if (empty($privKey)) {
- Logger::log("This is no private post in the old format", Logger::DEBUG);
+ Logger::info('This is no private post in the old format');
return false;
}
$decrypted = self::aesDecrypt($outer_key, $outer_iv, $ciphertext);
- Logger::log('decrypted: '.$decrypted, Logger::DEBUG);
+ Logger::info('decrypted', ['data' => $decrypted]);
$idom = XML::parseString($decrypted);
$inner_iv = base64_decode($idom->iv);
$type = $fields->getName();
- Logger::log("Received message type ".$type." from ".$sender." for user ".$importer["uid"], Logger::DEBUG);
+ Logger::info('Received message', ['type' => $type, 'sender' => $sender, 'user' => $importer["uid"]]);
switch ($type) {
case "account_migration":
$data = XML::parseString($msg["message"]);
if (!is_object($data)) {
- Logger::log("No valid XML ".$msg["message"], Logger::DEBUG);
+ Logger::info('No valid XML', ['message' => $msg['message']]);
return false;
}
if (isset($parent_author_signature)) {
$key = self::key($msg["author"]);
if (empty($key)) {
- Logger::log("No key found for parent author ".$msg["author"], Logger::DEBUG);
+ Logger::info('No key found for parent', ['author' => $msg["author"]]);
return false;
}
$key = self::key($fields->author);
if (empty($key)) {
- Logger::log("No key found for author ".$fields->author, Logger::DEBUG);
+ Logger::info('No key found', ['author' => $fields->author]);
return false;
}
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 " . print_r($person, true));
-
- 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::log("fcontact guid is ".$fcontact_guid, Logger::DEBUG);
-
- $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
*
*/
private static function contactByHandle($uid, $handle)
{
- $cid = Contact::getIdForURL($handle, $uid);
- if (!$cid) {
- Logger::log("Haven't found a contact for user " . $uid . " and handle " . $handle, Logger::DEBUG);
- return false;
- }
-
- $contact = DBA::selectFirst('contact', [], ['id' => $cid]);
- if (!DBA::isResult($contact)) {
- // This here shouldn't happen at all
- Logger::log("Haven't found a contact for user " . $uid . " and handle " . $handle, Logger::DEBUG);
- return false;
- }
-
- return $contact;
+ return Contact::getByURL($handle, null, [], $uid);
}
/**
*/
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]';
Logger::log("Fetch post from ".$source_url, Logger::DEBUG);
- $envelope = Network::fetchUrl($source_url);
+ $envelope = DI::httpRequest()->fetch($source_url);
if ($envelope) {
Logger::log("Envelope was fetched.", Logger::DEBUG);
$x = self::verifyMagicEnvelope($envelope);
private static function parentItem($uid, $guid, $author, array $contact)
{
$fields = ['id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin',
- 'author-name', 'author-link', 'author-avatar',
+ 'author-name', 'author-link', 'author-avatar', 'gravity',
'owner-name', 'owner-link', 'owner-avatar'];
$condition = ['uid' => $uid, 'guid' => $guid];
$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
*/
private static function plink($addr, $guid, $parent_guid = '')
{
- $contact = Contact::getDetailsByAddr($addr);
+ $contact = Contact::getByURL($addr);
if (empty($contact)) {
Logger::info('No contact data for address', ['addr' => $addr]);
return '';
// Update the profile
self::receiveProfile($importer, $data->profile);
- // change the technical stuff in contact and gcontact
+ // change the technical stuff in contact
$data = Probe::uri($new_handle);
if ($data['network'] == Protocol::PHANTOM) {
Logger::log('Account for '.$new_handle." couldn't be probed.");
DBA::update('contact', $fields, ['addr' => $old_handle]);
- $fields = ['url' => $data['url'], 'nurl' => Strings::normaliseLink($data['url']),
- 'name' => $data['name'], 'nick' => $data['nick'],
- 'addr' => $data['addr'], 'connect' => $data['addr'],
- 'notify' => $data['notify'], 'photo' => $data['photo'],
- 'server_url' => $data['baseurl'], 'network' => $data['network']];
-
- DBA::update('gcontact', $fields, ['addr' => $old_handle]);
-
Logger::log('Contacts are updated.');
return true;
}
DBA::close($contacts);
- DBA::delete('gcontact', ['addr' => $author]);
-
Logger::log('Removed contacts for ' . $author);
return true;
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;
$datarray["changed"] = $datarray["created"] = $datarray["edited"] = DateTimeFormat::utcNow();
// like on comments have the comment as parent. So we need to fetch the toplevel parent
- if ($parent_item["id"] != $parent_item["parent"]) {
- $toplevel = Item::selectFirst(['origin'], ['id' => $parent_item["parent"]]);
+ if ($parent_item['gravity'] != GRAVITY_PARENT) {
+ $toplevel = Item::selectFirst(['origin'], ['id' => $parent_item['parent']]);
$origin = $toplevel["origin"];
} else {
$origin = $parent_item["origin"];
$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::info('Participation stored', ['id' => $message_id, 'guid' => $guid, 'parent_guid' => $parent_guid, 'author' => $author]);
// Send all existing comments and likes to the requesting server
- $comments = Item::select(['id', 'uri-id', 'parent', 'verb'], ['parent' => $parent_item['id'], 'gravity' => [GRAVITY_COMMENT, GRAVITY_ACTIVITY]]);
+ $comments = Item::select(['id', 'uri-id', 'parent-author-network', 'author-network', 'verb'],
+ ['parent' => $parent_item['id'], 'gravity' => [GRAVITY_COMMENT, GRAVITY_ACTIVITY]]);
while ($comment = Item::fetch($comments)) {
- if (in_array($comment["verb"], [Activity::FOLLOW, Activity::TAG])) {
+ if (in_array($comment['verb'], [Activity::FOLLOW, Activity::TAG])) {
Logger::info('participation messages are not relayed', ['item' => $comment['id']]);
continue;
}
+ if ($comment['author-network'] == Protocol::ACTIVITYPUB) {
+ Logger::info('Comments from ActivityPub authors are not relayed', ['item' => $comment['id']]);
+ continue;
+ }
+
+ if ($comment['parent-author-network'] == Protocol::ACTIVITYPUB) {
+ Logger::info('Comments to comments from ActivityPub authors are not relayed', ['item' => $comment['id']]);
+ continue;
+ }
+
Logger::info('Deliver participation', ['item' => $comment['id'], 'contact' => $author_contact["cid"]]);
if (Worker::add(PRIORITY_HIGH, 'Delivery', Delivery::POST, $comment['id'], $author_contact["cid"])) {
Post\DeliveryData::incrementQueueCount($comment['uri-id'], 1);
$image_url = "http://".$handle_parts[1].$image_url;
}
- Contact::updateAvatar($image_url, $importer["uid"], $contact["id"]);
+ Contact::updateAvatar($contact["id"], $image_url);
// Generic birthday. We don't know the timezone. The year is irrelevant.
DBA::update('contact', $fields, ['id' => $contact['id']]);
- // @todo Update the public contact, then update the gcontact from that
-
- $gcontact = ["url" => $contact["url"], "network" => Protocol::DIASPORA, "generation" => 2,
- "photo" => $image_url, "name" => $name, "location" => $location,
- "about" => $about, "birthday" => $birthday,
- "addr" => $author, "nick" => $nick, "keywords" => $keywords,
- "hide" => !$searchable, "nsfw" => $nsfw];
-
- $gcid = GContact::update($gcontact);
-
- GContact::link($gcid, $importer["uid"], $contact["id"]);
-
Logger::log("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], Logger::DEBUG);
return true;
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);
// Do we already have this item?
$fields = ['body', 'title', 'attach', 'app', 'created', 'object-type', 'uri', 'guid',
- 'author-name', 'author-link', 'author-avatar'];
+ 'author-name', 'author-link', 'author-avatar', 'plink'];
$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
$item = Item::selectFirst($fields, $condition);
$item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
// Add OEmbed and other information to the body
- $item["body"] = add_page_info_to_body($item["body"], false, true);
+ $item["body"] = PageInfo::searchAndAppendToBody($item["body"], false, true);
return $item;
} else {
if ($stored) {
$fields = ['body', 'title', 'attach', 'app', 'created', 'object-type', 'uri', 'guid',
- 'author-name', 'author-link', 'author-avatar'];
+ 'author-name', 'author-link', 'author-avatar', 'plink'];
$condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
$item = Item::selectFirst($fields, $condition);
return false;
}
- $orig_url = DI::baseUrl()."/display/".$original_item["guid"];
-
$datarray = [];
$datarray["uid"] = $importer["uid"];
/// @todo Copy tag data from original post
- $prefix = share_header(
+ $prefix = BBCode::getShareOpeningTag(
$original_item["author-name"],
$original_item["author-link"],
$original_item["author-avatar"],
- $original_item["guid"],
+ $original_item["plink"],
$original_item["created"],
- $orig_url
+ $original_item["guid"]
);
if (!empty($original_item['title'])) {
$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;
}
// Fetch the parent item
- $parent = Item::selectFirst(['author-link'], ['id' => $item["parent"]]);
+ $parent = Item::selectFirst(['author-link'], ['id' => $item['parent']]);
// Only delete it if the parent author really fits
if (!Strings::compareLink($parent["author-link"], $contact["url"]) && !Strings::compareLink($item["author-link"], $contact["url"])) {
Item::markForDeletion(['id' => $item['id']]);
- Logger::log("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item["parent"], Logger::DEBUG);
+ Logger::log("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item['parent'], Logger::DEBUG);
}
return true;
// Add OEmbed and other information to the body
if (!self::isHubzilla($contact["url"])) {
- $body = add_page_info_to_body($body, false, true);
+ $body = PageInfo::searchAndAppendToBody($body, false, true);
}
}
$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);
$json = json_encode(["iv" => $b_iv, "key" => $b_aes_key]);
$encrypted_key_bundle = "";
- openssl_public_encrypt($json, $encrypted_key_bundle, $pubkey);
+ if (!@openssl_public_encrypt($json, $encrypted_key_bundle, $pubkey)) {
+ return false;
+ }
$json_object = json_encode(
["aes_key" => base64_encode($encrypted_key_bundle),
// 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"]);
}
if (!intval(DI::config()->get("system", "diaspora_test"))) {
$content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
- $postResult = Network::post($dest_url."/", $envelope, ["Content-Type: ".$content_type]);
+ $postResult = DI::httpRequest()->post($dest_url . "/", $envelope, ["Content-Type: " . $content_type]);
$return_code = $postResult->getReturnCode();
} else {
Logger::log("test_mode");
"profile" => $profile,
"signature" => $signature];
- Logger::log("Send account migration ".print_r($message, true), Logger::DEBUG);
+ Logger::info('Send account migration', ['msg' => $message]);
return self::buildAndTransmit($owner, $contact, "account_migration", $message);
}
"following" => "true",
"sharing" => "true"];
- Logger::log("Send share ".print_r($message, true), Logger::DEBUG);
+ Logger::info('Send share', ['msg' => $message]);
return self::buildAndTransmit($owner, $contact, "contact", $message);
}
"following" => "false",
"sharing" => "false"];
- Logger::log("Send unshare ".print_r($message, true), Logger::DEBUG);
+ Logger::info('Send unshare', ['msg' => $message]);
return self::buildAndTransmit($owner, $contact, "contact", $message);
}
if ($item['author-link'] != $item['owner-link']) {
require_once 'mod/share.php';
- $body = share_header($item['author-name'], $item['author-link'], $item['author-avatar'],
- "", $item['created'], $item['plink']) . $body . '[/share]';
+ $body = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
+ $item['plink'], $item['created']) . $body . '[/share]';
}
// convert to markdown
private static function prependParentAuthorMention($body, $profile_url)
{
- $profile = Contact::getDetailsByURL($profile_url);
+ $profile = Contact::getByURL($profile_url, false, ['addr', 'name', 'contact-type']);
if (!empty($profile['addr'])
&& $profile['contact-type'] != Contact::TYPE_COMMUNITY
&& !strstr($body, $profile['addr'])
return $result;
}
- $toplevel_item = Item::selectFirst(['guid', 'author-id', 'author-link'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
+ $toplevel_item = Item::selectFirst(['guid', 'author-id', 'author-link'], ['id' => $item['parent'], 'parent' => $item['parent']]);
if (!DBA::isResult($toplevel_item)) {
- Logger::error('Missing parent conversation item', ['parent' => $item["parent"]]);
+ Logger::error('Missing parent conversation item', ['parent' => $item['parent']]);
return false;
}
$message["parent_author_signature"] = self::signature($owner, $message);
- Logger::log("Relayed data ".print_r($message, true), Logger::DEBUG);
+ Logger::info('Relayed data', ['msg' => $message]);
return self::buildAndTransmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
}
$msg_type = "retraction";
- if ($item['id'] == $item['parent']) {
+ if ($item['gravity'] == GRAVITY_PARENT) {
$target_type = "Post";
} elseif (in_array($item["verb"], [Activity::LIKE, Activity::DISLIKE])) {
$target_type = "Like";
"target_guid" => $item['guid'],
"target_type" => $target_type];
- Logger::log("Got message ".print_r($message, true), Logger::DEBUG);
+ Logger::info('Got message', ['msg' => $message]);
return self::buildAndTransmit($owner, $contact, $msg_type, $message, $public_batch, $item["guid"]);
}
{
$owner = User::getOwnerDataById($uid);
if (empty($owner)) {
- Logger::log("No owner post, so not storing signature", Logger::DEBUG);
+ Logger::info('No owner post, so not storing signature');
return false;
}
{
$owner = User::getOwnerDataById($uid);
if (empty($owner)) {
- Logger::log("No owner post, so not storing signature", Logger::DEBUG);
+ Logger::info('No owner post, so not storing signature');
return false;
}
projects / friendica.git / blobdiff