<?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 Friendica\Model\ItemURI;
use Friendica\Model\Mail;
use Friendica\Model\Notification;
+use Friendica\Model\Photo;
use Friendica\Model\Post;
use Friendica\Model\Profile;
use Friendica\Model\Tag;
* @return array importer
* @throws \Exception
*/
- public static function getImporter($cid, $uid = 0)
+ public static function getImporter(int $cid, int $uid = 0): array
{
$condition = ['id' => $cid, 'blocked' => false, 'pending' => false];
$contact = DBA::selectFirst('contact', [], $condition);
* @throws \ImagickException
* @todo Find proper type-hints
*/
- public static function entries($items, $owner)
+ public static function entries(array $items, array $owner): string
{
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function itemFeed(int $uri_id, int $uid, bool $conversation = false)
+ public static function itemFeed(int $uri_id, int $uid, bool $conversation = false): string
{
if ($conversation) {
$condition = ['parent-uri-id' => $uri_id];
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @todo Find proper type-hints
*/
- public static function mail(array $mail, array $owner)
+ public static function mail(array $mail, array $owner): string
{
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @todo Find proper type-hints
*/
- public static function fsuggest($item, $owner)
+ public static function fsuggest(array $item, array $owner): string
{
$doc = new DOMDocument('1.0', 'utf-8');
$doc->formatOutput = true;
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @todo Find proper type-hints
*/
- public static function relocate($owner, $uid)
+ public static function relocate(array $owner, int $uid): string
{
/* get site pubkey. this could be a new installation with no site keys*/
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 object XML root object
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @todo Find proper type-hints
+ * @todo Find proper type-hint for returned type
*/
- private static function addHeader(DOMDocument $doc, $owner, $authorelement, $alternatelink = "", $public = false)
+ private static function addHeader(DOMDocument $doc, array $owner, string $authorelement, string $alternatelink = '', bool $public = false)
{
if ($alternatelink == "") {
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.
+ *
+ * @param int $uid User id
+ * @param string $tz Time zone string, like UTC
+ * @return string Formatted birthday string
+ */
+ private static function determineNextBirthday(int $uid, string $tz): string
+ {
+ $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
*
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @todo Find proper type-hints
*/
- private static function addAuthor(DOMDocument $doc, array $owner, $authorelement, $public)
+ private static function addAuthor(DOMDocument $doc, array $owner, string $authorelement, bool $public)
{
// Should the profile be "unsearchable" in the net? Then add the "hide" element
$hide = DBA::exists('profile', ['uid' => $owner['uid'], 'net-publish' => false]);
$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");
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @todo Find proper type-hints
*/
- private static function addEntryAuthor(DOMDocument $doc, $element, $contact_url, $item)
+ private static function addEntryAuthor(DOMDocument $doc, string $element, string $contact_url, array $item)
{
$author = $doc->createElement($element);
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @todo Find proper type-hints
*/
- private static function createActivity(DOMDocument $doc, $element, $activity, $uriid)
+ private static function createActivity(DOMDocument $doc, string $element, string $activity, int $uriid)
{
if ($activity) {
$entry = $doc->createElement($element);
* @return void XML attachment object
* @todo Find proper type-hints
*/
- private static function getAttachment($doc, $root, $item)
+ private static function getAttachment($doc, $root, array $item)
{
foreach (Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]) as $attachment) {
$attributes = ['rel' => 'enclosure',
* @throws \ImagickException
* @todo Find proper type-hints
*/
- private static function entry(DOMDocument $doc, $type, array $item, array $owner, $comment = false, $cid = 0, $single = false)
+ private static function entry(DOMDocument $doc, string $type, array $item, array $owner, bool $comment = false, int $cid = 0, bool $single = false)
{
$mentioned = [];
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,
* @param array $owner Owner record
* @param array $contact Contact record of the receiver
* @param string $atom Content that will be transmitted
- *
* @param bool $public_batch
* @return int Deliver status. Negative values mean an error.
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function transmit($owner, $contact, $atom, $public_batch = false)
+ public static function transmit(array $owner, array $contact, string $atom, bool $public_batch = false)
{
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 (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);
* @throws \ImagickException
* @todo Find good type-hints for all parameter
*/
- private static function fetchauthor(\DOMXPath $xpath, \DOMNode $context, $importer, $element, $onlyfetch, $xml = "")
+ private static function fetchauthor(\DOMXPath $xpath, \DOMNode $context, array $importer, string $element, bool $onlyfetch, string $xml = ''): array
{
$author = [];
$author["name"] = XML::getFirstNodeValue($xpath, $element."/atom:name/text()", $context);
}
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']);
* @return string XML string
* @todo Find good type-hints for all parameter
*/
- private static function transformActivity($xpath, $activity, $element)
+ private static function transformActivity($xpath, $activity, string $element): string
{
if (!is_object($activity)) {
return "";
* @throws \Exception
* @todo Find good type-hints for all parameter
*/
- private static function processMail($xpath, $mail, $importer)
+ private static function processMail($xpath, $mail, array $importer)
{
- Logger::log("Processing mails");
+ Logger::notice("Processing mails");
$msg = [];
$msg["uid"] = $importer["importer_uid"];
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @todo Find good type-hints for all parameter
*/
- private static function processSuggestion($xpath, $suggestion, $importer)
+ private static function processSuggestion($xpath, $suggestion, array $importer)
{
Logger::notice('Processing suggestions');
$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 = ''): bool
+ {
+ $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;
}
/**
* @throws \ImagickException
* @todo Find good type-hints for all parameter
*/
- private static function processRelocation($xpath, $relocation, $importer)
+ private static function processRelocation($xpath, $relocation, array $importer): bool
{
- 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
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @todo set proper type-hints (array?)
*/
- private static function updateContent($current, $item, $importer, $entrytype)
+ private static function updateContent(array $current, array $item, array $importer, int $entrytype)
{
$changed = false;
* @throws \Exception
* @todo set proper type-hints (array?)
*/
- private static function getEntryType($importer, $item)
+ private static function getEntryType(array $importer, array $item): int
{
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,
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @todo set proper type-hints (array?)
*/
- private static function processVerbs($entrytype, $importer, &$item, &$is_like)
+ private static function processVerbs(int $entrytype, array $importer, array &$item, bool &$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;
}
* @return void
* @todo set proper type-hints
*/
- private static function parseLinks($links, &$item)
+ private static function parseLinks($links, array &$item)
{
$rel = "";
$href = "";
* 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): bool
{
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;
+ }
}
/**
* @param object $entry entry elements
* @param array $importer Record of the importer user mixed with contact of the content
* @param string $xml xml
+ * @param int $protocol Protocol
* @return void
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
* @todo Add type-hints
*/
- private static function processEntry($header, $xpath, $entry, $importer, $xml, $protocol)
+ private static function processEntry(array $header, $xpath, $entry, array $importer, string $xml, int $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"];
}
}
+ // Need to initialize variable, otherwise E_NOTICE will happen
+ $is_like = false;
+
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);
* @throws \Exception
* @todo set proper type-hints
*/
- private static function processDeletion($xpath, $deletion, $importer)
+ private static function processDeletion($xpath, $deletion, array $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']]);
}
* @return integer Import status
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
- * @todo set proper type-hints
*/
- public static function import($xml, $importer, $protocol, $direction)
+ public static function import(string $xml, array $importer, int $protocol, int $direction): int
{
if ($xml == "") {
return 400;
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']) && ($protocol == Conversation::PARCEL_DIASPORA_DFRN)) {
GServer::setProtocol($importer['gsid'], Post\DeliveryData::DFRN);
$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 string activity verb
*/
- private static function constructVerb(array $item)
+ private static function constructVerb(array $item): string
{
if ($item['verb']) {
return $item['verb'];
return Activity::POST;
}
- private static function tgroupCheck($uid, $item)
+ // @TODO Documentation missing
+ private static function tgroupCheck(int $uid, array $item): bool
{
$mention = false;
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);
}
/**
* item is assumed to be up-to-date. If the timestamps are equal it
* assumes the update has been seen before and should be ignored.
*
- * @param $existing
- * @param $update
+ * @param array $existing
+ * @param array $update
* @return bool
* @throws \Exception
*/
- private static function isEditedTimestampNewer($existing, $update)
+ private static function isEditedTimestampNewer(array $existing, array $update): bool
{
if (empty($existing['edited'])) {
return true;
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function isSupportedByContactUrl($url)
+ public static function isSupportedByContactUrl(string $url): bool
{
$probe = Probe::uri($url, Protocol::DFRN);
return $probe['network'] == Protocol::DFRN;
projects / friendica.git / blobdiff