<?php
/**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
*
* @license GNU AGPL version 3 or any later version
*
use DOMDocument;
use DOMXPath;
-use Friendica\App\BaseURL;
use Friendica\Content\Text\BBCode;
-use Friendica\Core\Hook;
use Friendica\Core\Logger;
use Friendica\Core\Protocol;
use Friendica\Database\DBA;
use Friendica\Model\ItemURI;
use Friendica\Model\Mail;
use Friendica\Model\Notification;
-use Friendica\Model\PermissionSet;
+use Friendica\Model\Photo;
use Friendica\Model\Post;
-use Friendica\Model\Post\Category;
use Friendica\Model\Profile;
use Friendica\Model\Tag;
use Friendica\Model\User;
-use Friendica\Model\Verb;
use Friendica\Network\Probe;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
return trim($doc->saveXML());
}
- /**
- * Generate an atom feed for the given user
- *
- * This function is called when another server is pulling data from the user feed.
- *
- * @param string $dfrn_id DFRN ID from the requesting party
- * @param string $owner_nick Owner nick name
- * @param string $last_update Date of the last update
- * @param int $direction Can be -1, 0 or 1.
- * @param boolean $onlyheader Output only the header without content? (Default is "no")
- *
- * @return string DFRN feed entries
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @throws \ImagickException
- */
- public static function feed($dfrn_id, $owner_nick, $last_update, $direction = 0, $onlyheader = false)
- {
- $a = DI::app();
-
- $sitefeed = ((strlen($owner_nick)) ? false : true); // not yet implemented, need to rewrite huge chunks of following logic
- $public_feed = (($dfrn_id) ? false : true);
- $starred = false; // not yet implemented, possible security issues
- $converse = false;
-
- if ($public_feed && $a->argc > 2) {
- for ($x = 2; $x < $a->argc; $x++) {
- if ($a->argv[$x] == 'converse') {
- $converse = true;
- }
- if ($a->argv[$x] == 'starred') {
- $starred = true;
- }
- if ($a->argv[$x] == 'category' && $a->argc > ($x + 1) && strlen($a->argv[$x+1])) {
- $category = $a->argv[$x+1];
- }
- }
- }
-
- // default permissions - anonymous user
-
- $sql_extra = sprintf(" AND `private` != %s ", Item::PRIVATE);
-
- $owner = DBA::selectFirst('owner-view', [], ['nickname' => $owner_nick]);
- if (!DBA::isResult($owner)) {
- Logger::log(sprintf('No contact found for nickname=%d', $owner_nick), Logger::WARNING);
- exit();
- }
-
- $owner_id = $owner['uid'];
-
- if (!$public_feed) {
- switch ($direction) {
- case (-1):
- $sql_extra = sprintf(" AND `issued-id` = '%s' ", DBA::escape($dfrn_id));
- break;
- case 0:
- $sql_extra = sprintf(" AND `issued-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
- break;
- case 1:
- $sql_extra = sprintf(" AND `dfrn-id` = '%s' AND `duplex` = 1 ", DBA::escape($dfrn_id));
- break;
- default:
- return false;
- break; // NOTREACHED
- }
-
- $contact = DBA::selectFirst('contact', [], ["NOT `blocked` AND `contact`.`uid` = ?" . $sql_extra, $owner_id]);
- if (!DBA::isResult($contact)) {
- Logger::notice('No contact found', ['uid' => $owner_id]);
- exit();
- }
-
- $set = PermissionSet::get($owner_id, $contact['id']);
-
- if (!empty($set)) {
- $sql_extra = " AND `psid` IN (" . implode(',', $set) .")";
- } else {
- $sql_extra = sprintf(" AND `private` != %s", Item::PRIVATE);
- }
- }
-
- if (!strlen($last_update)) {
- $last_update = 'now -30 days';
- }
-
- if (isset($category)) {
- $sql_extra .= sprintf(" AND `uri-id` IN (SELECT `uri-id` FROM `category-view` WHERE `name` = '%s' AND `type` = %d AND `uid` = %d)",
- DBA::escape(Strings::protectSprintf($category)), intval(Category::CATEGORY), intval($owner_id));
- }
-
- if ($public_feed && ! $converse) {
- $sql_extra .= " AND `self` ";
- }
-
- $check_date = DateTimeFormat::utc($last_update);
-
- $condition = ["`uid` = ? AND `wall` AND `changed` > ? AND `vid` != ? AND `visible`" . $sql_extra,
- $owner_id, $check_date, Verb::getID(Activity::ANNOUNCE)];
-
- $params = ['sort' => ['parent' => $public_feed, 'received']];
- $items = Post::selectToArray(Item::DELIVER_FIELDLIST, $condition, $params, ['limit' => 300]);
-
- /*
- * Will check further below if this actually returned results.
- * We will provide an empty feed if that is the case.
- */
-
- $doc = new DOMDocument('1.0', 'utf-8');
- $doc->formatOutput = true;
-
- $alternatelink = $owner['url'];
-
- if (isset($category)) {
- $alternatelink .= "/category/".$category;
- }
-
- if ($public_feed) {
- $author = "dfrn:owner";
- } else {
- $author = "author";
- }
-
- $root = self::addHeader($doc, $owner, $author, $alternatelink, true);
-
- /// @TODO This hook can't work anymore
- // \Friendica\Core\Hook::callAll('atom_feed', $atom);
-
- if (!DBA::isResult($items) || $onlyheader) {
- $atom = trim($doc->saveXML());
-
- Hook::callAll('atom_feed_end', $atom);
-
- return $atom;
- }
-
- foreach ($items as $item) {
- // prevent private email from leaking.
- if ($item['network'] == Protocol::MAIL) {
- continue;
- }
-
- // public feeds get html, our own nodes use bbcode
-
- if ($public_feed) {
- $type = 'html';
- // catch any email that's in a public conversation and make sure it doesn't leak
- if ($item['private'] == Item::PRIVATE) {
- continue;
- }
- } else {
- $type = 'text';
- }
-
- $entry = self::entry($doc, $type, $item, $owner, true);
- if (isset($entry)) {
- $root->appendChild($entry);
- }
- }
-
- $atom = trim($doc->saveXML());
-
- Hook::callAll('atom_feed_end', $atom);
-
- return $atom;
- }
-
/**
* Generate an atom entry for a given uri id and user
*
DI::config()->set('system', 'site_pubkey', $res['pubkey']);
}
- $rp = q(
- "SELECT `resource-id` , `scale`, type FROM `photo`
- WHERE `profile` = 1 AND `uid` = %d ORDER BY scale;",
- $uid
- );
+ $profilephotos = Photo::selectToArray(['resource-id' , 'scale'], ['profile' => true, 'uid' => $uid], ['order' => ['scale']]);
+
$photos = [];
$ext = Images::supportedTypes();
- foreach ($rp as $p) {
+ foreach ($profilephotos as $p) {
$photos[$p['scale']] = DI::baseUrl().'/photo/'.$p['resource-id'].'-'.$p['scale'].'.'.$ext[$p['type']];
}
return $root;
}
+ /**
+ * Determine the next birthday, but only if the birthday is published
+ * in the default profile. We _could_ also look for a private profile that the
+ * recipient can see, but somebody could get mad at us if they start getting
+ * public birthday greetings when they haven't made this info public.
+ *
+ * Assuming we are able to publish this info, we are then going to convert
+ * the start time from the owner's timezone to UTC.
+ *
+ * This will potentially solve the problem found with some social networks
+ * where birthdays are converted to the viewer's timezone and salutations from
+ * elsewhere in the world show up on the wrong day. We will convert it to the
+ * viewer's timezone also, but first we are going to convert it from the birthday
+ * person's timezone to GMT - so the viewer may find the birthday starting at
+ * 6:00PM the day before, but that will correspond to midnight to the birthday person.
+ */
+ private static function determineNextBirthday($uid, $tz)
+ {
+ $birthday = '';
+
+ if (!strlen($tz)) {
+ $tz = 'UTC';
+ }
+
+ $profile = DBA::selectFirst('profile', ['dob'], ['uid' => $uid]);
+ if (DBA::isResult($profile)) {
+ $tmp_dob = substr($profile['dob'], 5);
+ if (intval($tmp_dob)) {
+ $y = DateTimeFormat::timezoneNow($tz, 'Y');
+ $bd = $y . '-' . $tmp_dob . ' 00:00';
+ $t_dob = strtotime($bd);
+ $now = strtotime(DateTimeFormat::timezoneNow($tz));
+ if ($t_dob < $now) {
+ $bd = $y + 1 . '-' . $tmp_dob . ' 00:00';
+ }
+ $birthday = DateTimeFormat::convert($bd, 'UTC', $tz, DateTimeFormat::ATOM);
+ }
+ }
+
+ return $birthday;
+ }
+
/**
* Adds the author element in the header for the DFRN protocol
*
$attributes = ["rel" => "photo", "type" => "image/jpeg",
"media:width" => Proxy::PIXEL_SMALL, "media:height" => Proxy::PIXEL_SMALL,
- "href" => Contact::getAvatarUrlForId($owner['id'], Proxy::SIZE_SMALL, $owner['updated'])];
+ "href" => User::getAvatarUrl($owner, Proxy::SIZE_SMALL)];
if (!$public || !$hide) {
$attributes["dfrn:updated"] = $picdate;
return $author;
}
- $birthday = feed_birthday($owner['uid'], $owner['timezone']);
+ $birthday = self::determineNextBirthday($owner['uid'], $owner['timezone']);
if ($birthday) {
XML::addElement($doc, $author, "dfrn:birthday", $birthday);
XML::addElement($doc, $author, "poco:note", $profile["about"]);
XML::addElement($doc, $author, "poco:preferredUsername", $profile["nickname"]);
- $savetz = date_default_timezone_get();
- date_default_timezone_set($profile["timezone"]);
- XML::addElement($doc, $author, "poco:utcOffset", date("P"));
- date_default_timezone_set($savetz);
+ XML::addElement($doc, $author, "poco:utcOffset", DateTimeFormat::timezoneNow($profile["timezone"], "P"));
if (trim($profile["homepage"]) != "") {
$urls = $doc->createElement("poco:urls");
* @param DOMDocument $doc XML document
* @param string $element Element name for the activity
* @param string $activity activity value
+ * @param int $uriid Uri-Id of the post
*
* @return \DOMElement XML activity object
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @todo Find proper type-hints
*/
- private static function createActivity(DOMDocument $doc, $element, $activity)
+ private static function createActivity(DOMDocument $doc, $element, $activity, $uriid)
{
if ($activity) {
$entry = $doc->createElement($element);
}
}
if ($r->content) {
- XML::addElement($doc, $entry, "content", BBCode::convert($r->content), ["type" => "html"]);
+ XML::addElement($doc, $entry, "content", BBCode::convertForUriId($uriid, $r->content, BBCode::EXTERNAL), ["type" => "html"]);
}
return $entry;
$htmlbody = "[b]" . $item['title'] . "[/b]\n\n" . $htmlbody;
}
- $htmlbody = BBCode::convertForUriId($item['uri-id'], $htmlbody, BBCode::OSTATUS);
+ $htmlbody = BBCode::convertForUriId($item['uri-id'], $htmlbody, BBCode::ACTIVITYPUB);
}
$author = self::addEntryAuthor($doc, "author", $item["author-link"], $item);
XML::addElement($doc, $entry, "activity:object-type", Activity\ObjectType::COMMENT);
}
- $actobj = self::createActivity($doc, "activity:object", $item['object']);
+ $actobj = self::createActivity($doc, "activity:object", $item['object'], $item['uri-id']);
if ($actobj) {
$entry->appendChild($actobj);
}
- $actarg = self::createActivity($doc, "activity:target", $item['target']);
+ $actarg = self::createActivity($doc, "activity:target", $item['target'], $item['uri-id']);
if ($actarg) {
$entry->appendChild($actarg);
}
foreach ($mentioned as $mention) {
$condition = ['uid' => $owner["uid"], 'nurl' => Strings::normaliseLink($mention)];
- $contact = DBA::selectFirst('contact', ['forum', 'prv'], $condition);
+ $contact = DBA::selectFirst('contact', ['contact-type'], $condition);
- if (DBA::isResult($contact) && ($contact["forum"] || $contact["prv"])) {
+ if (DBA::isResult($contact) && ($contact['contact-type'] == Contact::TYPE_COMMUNITY)) {
XML::addElement(
$doc,
$entry,
return $entry;
}
- /**
- * encrypts data via AES
- *
- * @param string $data The data that is to be encrypted
- * @param string $key The AES key
- *
- * @return string encrypted data
- */
- private static function aesEncrypt($data, $key)
- {
- return openssl_encrypt($data, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
- }
-
- /**
- * decrypts data via AES
- *
- * @param string $encrypted The encrypted data
- * @param string $key The AES key
- *
- * @return string decrypted data
- */
- public static function aesDecrypt($encrypted, $key)
- {
- return openssl_decrypt($encrypted, 'aes-128-ecb', $key, OPENSSL_RAW_DATA);
- }
-
- /**
- * Delivers the atom content to the contacts
- *
- * @param array $owner Owner record
- * @param array $contact Contact record of the receiver
- * @param string $atom Content that will be transmitted
- * @param bool $dissolve (to be documented)
- *
- * @return int Deliver status. Negative values mean an error.
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @throws \ImagickException
- * @todo Add array type-hint for $owner, $contact
- */
- public static function deliver($owner, $contact, $atom, $dissolve = false)
- {
- $idtosend = $orig_id = (($contact['dfrn-id']) ? $contact['dfrn-id'] : $contact['issued-id']);
-
- if ($contact['duplex'] && $contact['dfrn-id']) {
- $idtosend = '0:' . $orig_id;
- }
- if ($contact['duplex'] && $contact['issued-id']) {
- $idtosend = '1:' . $orig_id;
- }
-
- $rino = DI::config()->get('system', 'rino_encrypt');
- $rino = intval($rino);
-
- Logger::log("Local rino version: ". $rino, Logger::DEBUG);
-
- $ssl_val = intval(DI::config()->get('system', 'ssl_policy'));
-
- switch ($ssl_val) {
- case BaseURL::SSL_POLICY_FULL:
- $ssl_policy = 'full';
- break;
- case BaseURL::SSL_POLICY_SELFSIGN:
- $ssl_policy = 'self';
- break;
- case BaseURL::SSL_POLICY_NONE:
- default:
- $ssl_policy = 'none';
- break;
- }
-
- $url = $contact['notify'] . '&dfrn_id=' . $idtosend . '&dfrn_version=' . DFRN_PROTOCOL_VERSION . (($rino) ? '&rino='.$rino : '');
-
- Logger::log('dfrn_deliver: ' . $url);
-
- $curlResult = DI::httpRequest()->get($url);
-
- if ($curlResult->isTimeout()) {
- return -2; // timed out
- }
-
- $xml = $curlResult->getBody();
-
- $curl_stat = $curlResult->getReturnCode();
- if (empty($curl_stat)) {
- return -3; // timed out
- }
-
- Logger::log('dfrn_deliver: ' . $xml, Logger::DATA);
-
- if (empty($xml)) {
- return 3;
- }
-
- if (strpos($xml, '<?xml') === false) {
- Logger::log('dfrn_deliver: no valid XML returned');
- Logger::log('dfrn_deliver: returned XML: ' . $xml, Logger::DATA);
- return 3;
- }
-
- $res = XML::parseString($xml);
-
- if (!is_object($res) || (intval($res->status) != 0) || !strlen($res->challenge) || !strlen($res->dfrn_id)) {
- if (empty($res->status)) {
- $status = 3;
- } else {
- $status = $res->status;
- }
-
- return $status;
- }
-
- $postvars = [];
- $sent_dfrn_id = hex2bin((string) $res->dfrn_id);
- $challenge = hex2bin((string) $res->challenge);
- $perm = (($res->perm) ? $res->perm : null);
- $dfrn_version = floatval($res->dfrn_version ?: 2.0);
- $rino_remote_version = intval($res->rino);
- $page = (($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY) ? 1 : 0);
-
- Logger::log("Remote rino version: ".$rino_remote_version." for ".$contact["url"], Logger::DEBUG);
-
- if ($owner['page-flags'] == User::PAGE_FLAGS_PRVGROUP) {
- $page = 2;
- }
-
- $final_dfrn_id = '';
-
- if ($perm) {
- if ((($perm == 'rw') && !intval($contact['writable']))
- || (($perm == 'r') && intval($contact['writable']))
- ) {
- DBA::update('contact', ['writable' => ($perm == 'rw')], ['id' => $contact['id']]);
-
- $contact['writable'] = (string) 1 - intval($contact['writable']);
- }
- }
-
- if (($contact['duplex'] && strlen($contact['pubkey']))
- || ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY && strlen($contact['pubkey']))
- || ($contact['rel'] == Contact::SHARING && strlen($contact['pubkey']))
- ) {
- openssl_public_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['pubkey']);
- openssl_public_decrypt($challenge, $postvars['challenge'], $contact['pubkey']);
- } else {
- openssl_private_decrypt($sent_dfrn_id, $final_dfrn_id, $contact['prvkey']);
- openssl_private_decrypt($challenge, $postvars['challenge'], $contact['prvkey']);
- }
-
- $final_dfrn_id = substr($final_dfrn_id, 0, strpos($final_dfrn_id, '.'));
-
- if (strpos($final_dfrn_id, ':') == 1) {
- $final_dfrn_id = substr($final_dfrn_id, 2);
- }
-
- if ($final_dfrn_id != $orig_id) {
- Logger::log('dfrn_deliver: wrong dfrn_id.');
- // did not decode properly - cannot trust this site
- return 3;
- }
-
- $postvars['dfrn_id'] = $idtosend;
- $postvars['dfrn_version'] = DFRN_PROTOCOL_VERSION;
- if ($dissolve) {
- $postvars['dissolve'] = '1';
- }
-
- if ((($contact['rel']) && ($contact['rel'] != Contact::SHARING) && (! $contact['blocked'])) || ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) {
- $postvars['data'] = $atom;
- $postvars['perm'] = 'rw';
- } else {
- $postvars['data'] = str_replace('<dfrn:comment-allow>1', '<dfrn:comment-allow>0', $atom);
- $postvars['perm'] = 'r';
- }
-
- $postvars['ssl_policy'] = $ssl_policy;
-
- if ($page) {
- $postvars['page'] = $page;
- }
-
-
- if ($rino > 0 && $rino_remote_version > 0 && (! $dissolve)) {
- Logger::log('rino version: '. $rino_remote_version);
-
- switch ($rino_remote_version) {
- case 1:
- $key = random_bytes(16);
- $data = self::aesEncrypt($postvars['data'], $key);
- break;
-
- default:
- Logger::log("rino: invalid requested version '$rino_remote_version'");
- return -8;
- }
-
- $postvars['rino'] = $rino_remote_version;
- $postvars['data'] = bin2hex($data);
-
- if ($dfrn_version >= 2.1) {
- if (($contact['duplex'] && strlen($contact['pubkey']))
- || ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY && strlen($contact['pubkey']))
- || ($contact['rel'] == Contact::SHARING && strlen($contact['pubkey']))
- ) {
- openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']);
- } else {
- openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
- }
- } else {
- if (($contact['duplex'] && strlen($contact['prvkey'])) || ($owner['page-flags'] == User::PAGE_FLAGS_COMMUNITY)) {
- openssl_private_encrypt($key, $postvars['key'], $contact['prvkey']);
- } else {
- openssl_public_encrypt($key, $postvars['key'], $contact['pubkey']);
- }
- }
-
- Logger::log('md5 rawkey ' . md5($postvars['key']));
-
- $postvars['key'] = bin2hex($postvars['key']);
- }
-
-
- Logger::debug('dfrn_deliver', ['post' => $postvars]);
-
- $postResult = DI::httpRequest()->post($contact['notify'], $postvars);
-
- $xml = $postResult->getBody();
-
- Logger::log('dfrn_deliver: ' . "RECEIVED: " . $xml, Logger::DATA);
-
- $curl_stat = $postResult->getReturnCode();
- if (empty($curl_stat) || empty($xml)) {
- return -9; // timed out
- }
-
- if (($curl_stat == 503) && stristr($postResult->getHeader(), 'retry-after')) {
- return -10;
- }
-
- if (strpos($xml, '<?xml') === false) {
- Logger::log('dfrn_deliver: phase 2: no valid XML returned');
- Logger::log('dfrn_deliver: phase 2: returned XML: ' . $xml, Logger::DATA);
- return 3;
- }
-
- $res = XML::parseString($xml);
-
- if (!isset($res->status)) {
- return -11;
- }
-
- // Possibly old servers had returned an empty value when everything was okay
- if (empty($res->status)) {
- $res->status = 200;
- }
-
- if (!empty($res->message)) {
- Logger::log('Delivery returned status '.$res->status.' - '.$res->message, Logger::DEBUG);
- }
-
- return intval($res->status);
- }
-
/**
* Transmits atom content to the contacts via the Diaspora transport layer
*
{
if (!$public_batch) {
if (empty($contact['addr'])) {
- Logger::log('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.');
+ Logger::notice('Empty contact handle for ' . $contact['id'] . ' - ' . $contact['url'] . ' - trying to update it.');
if (Contact::updateFromProbe($contact['id'])) {
$new_contact = DBA::selectFirst('contact', ['addr'], ['id' => $contact['id']]);
$contact['addr'] = $new_contact['addr'];
}
if (empty($contact['addr'])) {
- Logger::log('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']);
+ Logger::notice('Unable to find contact handle for ' . $contact['id'] . ' - ' . $contact['url']);
return -21;
}
}
$fcontact = FContact::getByURL($contact['addr']);
if (empty($fcontact)) {
- Logger::log('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
+ Logger::notice('Unable to find contact details for ' . $contact['id'] . ' - ' . $contact['addr']);
return -22;
}
$pubkey = $fcontact['pubkey'];
$content_type = ($public_batch ? "application/magic-envelope+xml" : "application/json");
- $postResult = DI::httpRequest()->post($dest_url, $envelope, ["Content-Type: " . $content_type]);
+ $postResult = DI::httpClient()->post($dest_url, $envelope, ['Content-Type' => $content_type]);
$xml = $postResult->getBody();
$curl_stat = $postResult->getReturnCode();
if (empty($curl_stat) || empty($xml)) {
- Logger::log('Empty answer from ' . $contact['id'] . ' - ' . $dest_url);
+ Logger::notice('Empty answer from ' . $contact['id'] . ' - ' . $dest_url);
return -9; // timed out
}
- if (($curl_stat == 503) && (stristr($postResult->getHeader(), 'retry-after'))) {
+ if (($curl_stat == 503) && $postResult->inHeader('retry-after')) {
return -10;
}
if (strpos($xml, '<?xml') === false) {
- Logger::log('No valid XML returned from ' . $contact['id'] . ' - ' . $dest_url);
- Logger::log('Returned XML: ' . $xml, Logger::DATA);
+ Logger::notice('No valid XML returned from ' . $contact['id'] . ' - ' . $dest_url);
+ Logger::debug('Returned XML: ' . $xml);
return 3;
}
}
if (!empty($res->message)) {
- Logger::log('Transmit to ' . $dest_url . ' returned status '.$res->status.' - '.$res->message, Logger::DEBUG);
+ Logger::info('Transmit to ' . $dest_url . ' returned status '.$res->status.' - '.$res->message);
}
return intval($res->status);
}
if (empty($author['avatar'])) {
- Logger::log('Empty author: ' . $xml);
+ Logger::notice('Empty author: ' . $xml);
$author['avatar'] = '';
}
if (DBA::isResult($contact_old) && !$onlyfetch) {
- Logger::log("Check if contact details for contact " . $contact_old["id"] . " (" . $contact_old["nick"] . ") have to be updated.", Logger::DEBUG);
+ Logger::info("Check if contact details for contact " . $contact_old["id"] . " (" . $contact_old["nick"] . ") have to be updated.");
$poco = ["url" => $contact_old["url"], "network" => $contact_old["network"]];
// If the "hide" element is present then the profile isn't searchable.
$hide = intval(XML::getFirstNodeValue($xpath, $element . "/dfrn:hide/text()", $context) == "true");
- Logger::log("Hidden status for contact " . $contact_old["url"] . ": " . $hide, Logger::DEBUG);
+ Logger::info("Hidden status for contact " . $contact_old["url"] . ": " . $hide);
// If the contact isn't searchable then set the contact to "hidden".
// Problem: This can be manually overridden by the user.
'xmpp' => $contact['xmpp'], 'name-date' => DateTimeFormat::utc($contact['name-date']),
'unsearchable' => $contact['hidden'], 'uri-date' => DateTimeFormat::utc($contact['uri-date'])];
- DBA::update('contact', $fields, ['id' => $contact['id'], 'network' => $contact['network']], $contact_old);
+ Contact::update($fields, ['id' => $contact['id'], 'network' => $contact['network']], $contact_old);
// Update the public contact. Don't set the "hidden" value, this is used differently for public contacts
unset($fields['hidden']);
$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($contact_old['url'])];
- DBA::update('contact', $fields, $condition, true);
+ Contact::update($fields, $condition, true);
Contact::updateAvatar($contact['id'], $author['avatar']);
*/
private static function processMail($xpath, $mail, $importer)
{
- Logger::log("Processing mails");
+ Logger::notice("Processing mails");
$msg = [];
$msg["uid"] = $importer["importer_uid"];
$cid = Contact::getIdForURL($url);
$note = $xpath->evaluate('string(dfrn:note[1]/text())', $suggestion);
- return FContact::addSuggestion($importer['importer_uid'], $cid, $importer['id'], $note);
+ return self::addSuggestion($importer['importer_uid'], $cid, $importer['id'], $note);
+ }
+
+ /**
+ * 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?
+ */
+ private 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;
+ }
+
+ // Quit if we already have an introduction for this person
+ if (DI::intro()->suggestionExistsForUser($cid, $uid)) {
+ 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;
+
+ DI::intro()->save(DI::introFactory()->createNew(
+ $suggest['uid'],
+ $suggest['cid'],
+ $suggest['body'],
+ null,
+ $cid
+ ));
+
+ DI::notify()->createFromArray([
+ '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;
}
/**
*/
private static function processRelocation($xpath, $relocation, $importer)
{
- Logger::log("Processing relocations");
+ Logger::notice("Processing relocations");
/// @TODO Rewrite this to one statement
$relocate = [];
}
// update contact
- $r = q(
- "SELECT `photo`, `url` FROM `contact` WHERE `id` = %d AND `uid` = %d",
- intval($importer["id"]),
- intval($importer["importer_uid"])
- );
+ $old = Contact::selectFirst(['photo', 'url'], ['id' => $importer["id"], 'uid' => $importer["importer_uid"]]);
- if (!DBA::isResult($r)) {
- Logger::log("Query failed to execute, no result returned in " . __FUNCTION__);
+ if (!DBA::isResult($old)) {
+ Logger::notice("Query failed to execute, no result returned in " . __FUNCTION__);
return false;
}
- $old = $r[0];
-
// Update the contact table. We try to find every entry.
$fields = ['name' => $relocate["name"], 'avatar' => $relocate["avatar"],
'url' => $relocate["url"], 'nurl' => Strings::normaliseLink($relocate["url"]),
'poll' => $relocate["poll"], 'site-pubkey' => $relocate["sitepubkey"]];
$condition = ["(`id` = ?) OR (`nurl` = ?)", $importer["id"], Strings::normaliseLink($old["url"])];
- DBA::update('contact', $fields, $condition);
+ Contact::update($fields, $condition);
Contact::updateAvatar($importer["id"], $relocate["avatar"], true);
- Logger::log('Contacts are updated.');
+ Logger::notice('Contacts are updated.');
/// @TODO
/// merge with current record, current contents have priority
if ($item["thr-parent"] != $item["uri"]) {
$community = false;
- if ($importer["page-flags"] == User::PAGE_FLAGS_COMMUNITY || $importer["page-flags"] == User::PAGE_FLAGS_PRVGROUP) {
+ if ($importer['account-type'] == User::ACCOUNT_TYPE_COMMUNITY) {
$sql_extra = "";
$community = true;
- Logger::log("possible community action");
+ Logger::notice("possible community action");
} else {
$sql_extra = " AND `self` AND `wall`";
}
// was the top-level post for this action written by somebody on this site?
// Specifically, the recipient?
- $parent = Post::selectFirst(['forum_mode', 'wall'],
+ $parent = Post::selectFirst(['wall'],
["`uri` = ? AND `uid` = ?" . $sql_extra, $item["thr-parent"], $importer["importer_uid"]]);
$is_a_remote_action = DBA::isResult($parent);
- /*
- * Does this have the characteristics of a community or private group action?
- * If it's an action to a wall post on a community/prvgroup page it's a
- * valid community action. Also forum_mode makes it valid for sure.
- * If neither, it's not.
- */
- if ($is_a_remote_action && $community && (!$parent["forum_mode"]) && (!$parent["wall"])) {
- $is_a_remote_action = false;
- Logger::log("not a community action");
- }
-
if ($is_a_remote_action) {
return DFRN::REPLY_RC;
} else {
$item['parent'] = $parent['id'];
// send a notification
- notification(
+ DI::notify()->createFromArray(
[
"type" => Notification\Type::POKE,
"otype" => Notification\ObjectType::PERSON,
*/
private static function processVerbs($entrytype, $importer, &$item, &$is_like)
{
- Logger::log("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype, Logger::DEBUG);
+ Logger::info("Process verb ".$item["verb"]." and object-type ".$item["object-type"]." for entrytype ".$entrytype);
if (($entrytype == DFRN::TOP_LEVEL) && !empty($importer['id'])) {
// The filling of the the "contact" variable is done for legcy reasons
// Big question: Do we need these functions? They were part of the "consume_feed" function.
// This function once was responsible for DFRN and OStatus.
if ($activity->match($item["verb"], Activity::FOLLOW)) {
- Logger::log("New follower");
+ Logger::notice("New follower");
Contact::addRelationship($importer, $contact, $item);
return false;
}
if ($activity->match($item["verb"], Activity::UNFOLLOW)) {
- Logger::log("Lost follower");
- Contact::removeFollower($importer, $contact, $item);
+ Logger::notice("Lost follower");
+ Contact::removeFollower($contact);
return false;
}
if ($activity->match($item["verb"], Activity::REQ_FRIEND)) {
- Logger::log("New friend request");
+ Logger::notice("New friend request");
Contact::addRelationship($importer, $contact, $item, true);
return false;
}
if ($activity->match($item["verb"], Activity::UNFRIEND)) {
- Logger::log("Lost sharer");
- Contact::removeSharer($importer, $contact, $item);
+ Logger::notice("Lost sharer");
+ Contact::removeSharer($contact);
return false;
}
} else {
$item_tag = Post::selectFirst(['id', 'uri-id'], ['uri' => $xt->id, 'uid' => $importer["importer_uid"]]);
if (!DBA::isResult($item_tag)) {
- Logger::log("Query failed to execute, no result returned in " . __FUNCTION__);
+ Logger::notice("Query failed to execute, no result returned in " . __FUNCTION__);
return false;
}
* Checks if an incoming message is wanted
*
* @param array $item
+ * @param array $imporer
* @return boolean Is the message wanted?
*/
- private static function isSolicitedMessage(array $item)
+ private static function isSolicitedMessage(array $item, array $importer)
{
if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)",
Strings::normaliseLink($item["author-link"]), 0, Contact::FRIEND, Contact::SHARING])) {
- Logger::info('Author has got followers - accepted', ['uri' => $item['uri'], 'author' => $item["author-link"]]);
+ Logger::debug('Author has got followers - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $item["author-link"]]);
+ return true;
+ }
+
+ if ($importer['importer_uid'] != 0) {
+ Logger::debug('Message is directed to a user - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'importer' => $importer['importer_uid']]);
return true;
}
- $taglist = Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]);
- $tags = array_column($taglist, 'name');
- return Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::DFRN);
+ if ($item['uri'] != $item['thr-parent']) {
+ Logger::debug('Message is no parent - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
+ return true;
+ }
+
+ $tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
+ if (Relay::isSolicitedPost($tags, $item['body'], $item['author-id'], $item['uri'], Protocol::DFRN)) {
+ Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $item["author-link"]]);
+ return true;
+ } else {
+ return false;
+ }
}
/**
*/
private static function processEntry($header, $xpath, $entry, $importer, $xml, $protocol)
{
- Logger::log("Processing entries");
+ Logger::notice("Processing entries");
$item = $header;
);
// Is there an existing item?
if (DBA::isResult($current) && !self::isEditedTimestampNewer($current, $item)) {
- Logger::log("Item ".$item["uri"]." (".$item['edited'].") already existed.", Logger::DEBUG);
+ Logger::info("Item ".$item["uri"]." (".$item['edited'].") already existed.");
return;
}
}
// Check if the message is wanted
- if (($importer['importer_uid'] == 0) && ($item['uri'] == $item['thr-parent'])) {
- if (!self::isSolicitedMessage($item)) {
- DBA::delete('item-uri', ['uri' => $item['uri']]);
- return 403;
- }
+ if (!self::isSolicitedMessage($item, $importer)) {
+ DBA::delete('item-uri', ['uri' => $item['uri']]);
+ return 403;
}
// Get the type of the item (Top level post, reply or remote reply)
// Is it an event?
if (($item["object-type"] == Activity\ObjectType::EVENT) && !$owner_unknown) {
- Logger::log("Item ".$item["uri"]." seems to contain an event.", Logger::DEBUG);
+ Logger::info("Item ".$item["uri"]." seems to contain an event.");
$ev = Event::fromBBCode($item["body"]);
if ((!empty($ev['desc']) || !empty($ev['summary'])) && !empty($ev['start'])) {
- Logger::log("Event in item ".$item["uri"]." was found.", Logger::DEBUG);
+ Logger::info("Event in item ".$item["uri"]." was found.");
$ev["cid"] = $importer["id"];
$ev["uid"] = $importer["importer_uid"];
$ev["uri"] = $item["uri"];
}
$event_id = Event::store($ev);
- Logger::log("Event ".$event_id." was stored", Logger::DEBUG);
- return;
+ Logger::info('Event was stored', ['id' => $event_id]);
+
+ $item = Event::getItemArrayForImportedId($event_id, $item);
}
}
}
if (!self::processVerbs($entrytype, $importer, $item, $is_like)) {
- Logger::log("Exiting because 'processVerbs' told us so", Logger::DEBUG);
+ Logger::info("Exiting because 'processVerbs' told us so");
return;
}
// This check is done here to be able to receive connection requests in "processVerbs"
if (($entrytype == DFRN::TOP_LEVEL) && $owner_unknown) {
- Logger::log("Item won't be stored because user " . $importer["importer_uid"] . " doesn't follow " . $item["owner-link"] . ".", Logger::DEBUG);
+ Logger::info("Item won't be stored because user " . $importer["importer_uid"] . " doesn't follow " . $item["owner-link"] . ".");
return;
}
// Update content if 'updated' changes
if (DBA::isResult($current)) {
if (self::updateContent($current, $item, $importer, $entrytype)) {
- Logger::log("Item ".$item["uri"]." was updated.", Logger::DEBUG);
+ Logger::info("Item ".$item["uri"]." was updated.");
} else {
- Logger::log("Item " . $item["uri"] . " already existed.", Logger::DEBUG);
+ Logger::info("Item " . $item["uri"] . " already existed.");
}
return;
}
$posted_id = Item::insert($item);
if ($posted_id) {
- Logger::log("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id, Logger::DEBUG);
+ Logger::info("Reply from contact ".$item["contact-id"]." was stored with id ".$posted_id);
if ($item['uid'] == 0) {
Item::distribute($posted_id);
}
} else { // $entrytype == DFRN::TOP_LEVEL
if (($importer["uid"] == 0) && ($importer["importer_uid"] != 0)) {
- Logger::log("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.", Logger::DEBUG);
+ Logger::info("Contact ".$importer["id"]." isn't known to user ".$importer["importer_uid"].". The post will be ignored.");
return;
}
if (!Strings::compareLink($item["owner-link"], $importer["url"])) {
* the tgroup delivery code called from Item::insert will correct it if it's a forum,
* but we're going to unconditionally correct it here so that the post will always be owned by our contact.
*/
- Logger::log('Correcting item owner.', Logger::DEBUG);
+ Logger::info('Correcting item owner.');
$item["owner-link"] = $importer["url"];
$item["owner-id"] = Contact::getIdForURL($importer["url"], 0);
}
if (($importer["rel"] == Contact::FOLLOWER) && (!self::tgroupCheck($importer["importer_uid"], $item))) {
- Logger::log("Contact ".$importer["id"]." is only follower and tgroup check was negative.", Logger::DEBUG);
+ Logger::info("Contact ".$importer["id"]." is only follower and tgroup check was negative.");
return;
}
$posted_id = $notify;
}
- Logger::log("Item was stored with id ".$posted_id, Logger::DEBUG);
+ Logger::info("Item was stored with id ".$posted_id);
if ($item['uid'] == 0) {
Item::distribute($posted_id);
*/
private static function processDeletion($xpath, $deletion, $importer)
{
- Logger::log("Processing deletions");
+ Logger::notice("Processing deletions");
$uri = null;
foreach ($deletion->attributes as $attributes) {
$condition = ['uri' => $uri, 'uid' => $importer["importer_uid"]];
$item = Post::selectFirst(['id', 'parent', 'contact-id', 'uri-id', 'deleted', 'gravity'], $condition);
if (!DBA::isResult($item)) {
- Logger::log("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.", Logger::DEBUG);
+ Logger::info("Item with uri " . $uri . " for user " . $importer["importer_uid"] . " wasn't found.");
return;
}
// When it is a starting post it has to belong to the person that wants to delete it
if (($item['gravity'] == GRAVITY_PARENT) && ($item['contact-id'] != $importer["id"])) {
- Logger::log("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion.", Logger::DEBUG);
+ Logger::info("Item with uri " . $uri . " don't belong to contact " . $importer["id"] . " - ignoring deletion.");
return;
}
if (($item['gravity'] != GRAVITY_PARENT) && ($item['contact-id'] != $importer["id"])) {
$condition = ['id' => $item['parent'], 'contact-id' => $importer["id"]];
if (!Post::exists($condition)) {
- Logger::log("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.", Logger::DEBUG);
+ Logger::info("Item with uri " . $uri . " wasn't found or mustn't be deleted by contact " . $importer["id"] . " - ignoring deletion.");
return;
}
}
return;
}
- Logger::log('deleting item '.$item['id'].' uri='.$uri, Logger::DEBUG);
+ Logger::info('deleting item '.$item['id'].' uri='.$uri);
Item::markForDeletion(['id' => $item['id']]);
}
self::fetchauthor($xpath, $doc->firstChild, $importer, "dfrn:owner", false, $xml);
}
- Logger::log("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], Logger::DEBUG);
+ Logger::info("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"]);
- if (!empty($importer['gsid'])) {
- if ($protocol == Conversation::PARCEL_DIASPORA_DFRN) {
- GServer::setProtocol($importer['gsid'], Post\DeliveryData::DFRN);
- } elseif ($protocol == Conversation::PARCEL_LEGACY_DFRN) {
- GServer::setProtocol($importer['gsid'], Post\DeliveryData::LEGACY_DFRN);
- }
+ if (!empty($importer['gsid']) && ($protocol == Conversation::PARCEL_DIASPORA_DFRN)) {
+ GServer::setProtocol($importer['gsid'], Post\DeliveryData::DFRN);
}
// is it a public forum? Private forums aren't exposed with this method
$accounttype = intval(XML::getFirstNodeValue($xpath, "/atom:feed/dfrn:account_type/text()"));
if ($accounttype != $importer["contact-type"]) {
- DBA::update('contact', ['contact-type' => $accounttype], ['id' => $importer['id']]);
+ Contact::update(['contact-type' => $accounttype], ['id' => $importer['id']]);
// Updating the public contact as well
- DBA::update('contact', ['contact-type' => $accounttype], ['uid' => 0, 'nurl' => $importer['nurl']]);
+ Contact::update(['contact-type' => $accounttype], ['uid' => 0, 'nurl' => $importer['nurl']]);
}
// A forum contact can either have set "forum" or "prv" - but not both
if ($accounttype == User::ACCOUNT_TYPE_COMMUNITY) {
// It's a forum, so either set the public or private forum flag
$condition = ['(`forum` != ? OR `prv` != ?) AND `id` = ?', $forum, !$forum, $importer['id']];
- DBA::update('contact', ['forum' => $forum, 'prv' => !$forum], $condition);
+ Contact::update(['forum' => $forum, 'prv' => !$forum], $condition);
// Updating the public contact as well
$condition = ['(`forum` != ? OR `prv` != ?) AND `uid` = 0 AND `nurl` = ?', $forum, !$forum, $importer['nurl']];
- DBA::update('contact', ['forum' => $forum, 'prv' => !$forum], $condition);
+ Contact::update(['forum' => $forum, 'prv' => !$forum], $condition);
} else {
// It's not a forum, so remove the flags
$condition = ['(`forum` OR `prv`) AND `id` = ?', $importer['id']];
- DBA::update('contact', ['forum' => false, 'prv' => false], $condition);
+ Contact::update(['forum' => false, 'prv' => false], $condition);
// Updating the public contact as well
$condition = ['(`forum` OR `prv`) AND `uid` = 0 AND `nurl` = ?', $importer['nurl']];
- DBA::update('contact', ['forum' => false, 'prv' => false], $condition);
+ Contact::update(['forum' => false, 'prv' => false], $condition);
}
} elseif ($forum != $importer["forum"]) { // Deprecated since 3.5.1
$condition = ['`forum` != ? AND `id` = ?', $forum, $importer["id"]];
- DBA::update('contact', ['forum' => $forum], $condition);
+ Contact::update(['forum' => $forum], $condition);
// Updating the public contact as well
$condition = ['`forum` != ? AND `uid` = 0 AND `nurl` = ?', $forum, $importer['nurl']];
- DBA::update('contact', ['forum' => $forum], $condition);
+ Contact::update(['forum' => $forum], $condition);
}
self::processEntry($header, $xpath, $entry, $importer, $xml, $protocol);
}
- Logger::log("Import done for user " . $importer["importer_uid"] . " from contact " . $importer["id"], Logger::DEBUG);
+ Logger::info("Import done for user " . $importer["importer_uid"] . " from contact " . $importer["id"]);
return 200;
}
return false;
}
- $user = DBA::selectFirst('user', ['page-flags', 'nickname'], ['uid' => $uid]);
+ $user = DBA::selectFirst('user', ['account-type', 'nickname'], ['uid' => $uid]);
if (!DBA::isResult($user)) {
return false;
}
- $community_page = ($user['page-flags'] == User::PAGE_FLAGS_COMMUNITY);
- $prvgroup = ($user['page-flags'] == User::PAGE_FLAGS_PRVGROUP);
-
$link = Strings::normaliseLink(DI::baseUrl() . '/profile/' . $user['nickname']);
/*
foreach ($matches as $mtch) {
if (Strings::compareLink($link, $mtch[1]) || Strings::compareLink($dlink, $mtch[1])) {
$mention = true;
- Logger::log('mention found: ' . $mtch[2]);
+ Logger::notice('mention found: ' . $mtch[2]);
}
}
}
return false;
}
- return $community_page || $prvgroup;
+ return ($user['account-type'] == User::ACCOUNT_TYPE_COMMUNITY);
}
/**
projects / friendica.git / blobdiff