use Friendica\Util\Strings;
use Friendica\Util\XML;
use Friendica\Worker\Delivery;
+use GuzzleHttp\Psr7\Uri;
use SimpleXMLElement;
/**
$basedom = XML::parseString($envelope, true);
if (!is_object($basedom)) {
- Logger::notice("Envelope is no XML file");
+ Logger::notice('Envelope is no XML file');
return false;
}
- $children = $basedom->children('http://salmon-protocol.org/ns/magic-env');
+ $children = $basedom->children(ActivityNamespace::SALMON_ME);
if (sizeof($children) == 0) {
- Logger::notice("XML has no children");
+ Logger::notice('XML has no children');
return false;
}
- $handle = "";
+ $handle = '';
$data = Strings::base64UrlDecode($children->data);
$type = $children->data->attributes()->type[0];
*/
public static function dispatchPublic(array $msg, int $direction)
{
- $enabled = intval(DI::config()->get("system", "diaspora_enabled"));
+ $enabled = intval(DI::config()->get('system', 'diaspora_enabled'));
if (!$enabled) {
- Logger::notice("diaspora is disabled");
+ Logger::notice('Diaspora is disabled');
return false;
}
if (!($fields = self::validPosting($msg))) {
- Logger::notice("Invalid posting");
+ Logger::warning('Invalid posting');
return false;
}
if (is_null($fields)) {
$private = true;
if (!($fields = self::validPosting($msg))) {
- Logger::notice("Invalid posting");
+ Logger::warning('Invalid posting');
return false;
}
} else {
return self::receiveStatusMessage($importer, $fields, $msg['message'], $direction);
default:
- Logger::notice("Unknown message type " . $type);
+ Logger::notice('Unknown message type ' . $type);
return false;
}
}
$type = $element->getName();
$orig_type = $type;
- Logger::debug("Got message type " . $type . ": " . $msg['message']);
+ Logger::debug('Got message', ['type' => $type, 'message' => $msg['message']]);
// All retractions are handled identically from now on.
// In the new version there will only be "retraction".
// This is something that shouldn't happen at all.
if (in_array($type, ['status_message', 'reshare', 'profile'])) {
if ($msg['author'] != $fields->author) {
- Logger::notice("Message handle is not the same as envelope sender. Quitting this message.");
+ Logger::notice('Message handle is not the same as envelope sender. Quitting this message.', ['author1' => $msg['author'], 'author2' => $fields->author]);
return false;
}
}
if (!in_array($type, ['comment', 'like'])) {
return $fields;
}
+
+ if (!isset($author_signature) && ($msg['author'] == $fields->author)) {
+ Logger::debug('No author signature, but the sender matches the author', ['type' => $type, 'msg-author' => $msg['author'], 'message' => $msg['message']]);
+ return $fields;
+ }
+
// No author_signature? This is a must, so we quit.
if (!isset($author_signature)) {
- Logger::info("No author signature for type " . $type . " - Message: " . $msg['message']);
+ Logger::info('No author signature', ['type' => $type, 'msg-author' => $msg['author'], 'fields-author' => $fields->author, 'message' => $msg['message']]);
return false;
}
}
if (!Crypto::rsaVerify($signed_data, $parent_author_signature, $key, 'sha256')) {
- Logger::info("No valid parent author signature for parent author " . $msg['author'] . " in type " . $type . " - signed data: " . $signed_data . " - Message: " . $msg['message'] . " - Signature " . $parent_author_signature);
+ Logger::info('No valid parent author signature', ['author' => $msg['author'], 'type' => $type, 'signed data' => $signed_data, 'message' => $msg['message'], 'signature' => $parent_author_signature]);
return false;
}
}
}
if (!Crypto::rsaVerify($signed_data, $author_signature, $key, 'sha256')) {
- Logger::info("No valid author signature for author " . $fields->author . " in type " . $type . " - signed data: " . $signed_data . " - Message: " . $msg['message'] . " - Signature " . $author_signature);
+ Logger::info('No valid author signature for author', ['author' => $fields->author, 'type' => $type, 'signed data' => $signed_data, 'message' => $msg['message'], 'signature' => $author_signature]);
return false;
} else {
return $fields;
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function key(string $handle): string
+ private static function key(string $handle = null): string
{
$handle = strval($handle);
- Logger::notice("Fetching diaspora key for: " . $handle);
+ Logger::notice('Fetching diaspora key', ['handle' => $handle, 'callstack' => System::callstack(20)]);
$fcontact = FContact::getByURL($handle);
- if ($fcontact) {
+ if (!empty($fcontact['pubkey'])) {
return $fcontact['pubkey'];
}
{
$contact = self::contactByHandle($importer['uid'], $handle);
if (!$contact) {
- Logger::notice("A Contact for handle " . $handle . " and user " . $importer['uid'] . " was not found");
+ Logger::notice('A Contact for handle ' . $handle . ' and user ' . $importer['uid'] . ' was not found');
// If a contact isn't found, we accept it anyway if it is a comment
if ($is_comment && ($importer['uid'] != 0)) {
return self::contactByHandle(0, $handle);
}
if (!self::postAllow($importer, $contact, $is_comment)) {
- Logger::notice("The handle: " . $handle . " is not allowed to post to user " . $importer['uid']);
+ Logger::notice('The handle: ' . $handle . ' is not allowed to post to user ' . $importer['uid']);
return false;
}
return $contact;
{
$item = Post::selectFirst(['id'], ['uid' => $uid, 'guid' => $guid]);
if (DBA::isResult($item)) {
- Logger::notice("message " . $guid . " already exists for user " . $uid);
+ Logger::notice('Message ' . $guid . ' already exists for user ' . $uid);
return $item['id'];
}
$server = $serverparts['scheme'] . '://' . $serverparts['host'];
- Logger::info("Trying to fetch item " . $guid . " from " . $server);
+ Logger::info('Trying to fetch item ' . $guid . ' from ' . $server);
$msg = self::message($guid, $server);
return false;
}
- Logger::info("Successfully fetched item " . $guid . " from " . $server);
+ Logger::info('Successfully fetched item ' . $guid . ' from ' . $server);
// Now call the dispatcher
return self::dispatchPublic($msg, $force ? self::FORCED_FETCH : self::FETCHED);
// This will work for new Diaspora servers and Friendica servers from 3.5
$source_url = $server . '/fetch/post/' . urlencode($guid);
- Logger::info("Fetch post from " . $source_url);
+ Logger::info('Fetch post from ' . $source_url);
$envelope = DI::httpClient()->fetch($source_url, HttpClientAccept::MAGIC);
if ($envelope) {
- Logger::info("Envelope was fetched.");
+ Logger::info('Envelope was fetched.');
$x = self::verifyMagicEnvelope($envelope);
if (!$x) {
- Logger::info("Envelope could not be verified.");
+ Logger::info('Envelope could not be verified.');
} else {
- Logger::info("Envelope was verified.");
+ Logger::info('Envelope was verified.');
}
} else {
$x = false;
if ($source_xml->post->reshare) {
// Reshare of a reshare - old Diaspora version
- Logger::info("Message is a reshare");
+ Logger::info('Message is a reshare');
return self::message($source_xml->post->reshare->root_guid, $server, ++$level);
- } elseif ($source_xml->getName() == "reshare") {
+ } elseif ($source_xml->getName() == 'reshare') {
// Reshare of a reshare - new Diaspora version
- Logger::info("Message is a new reshare");
+ Logger::info('Message is a new reshare');
return self::message($source_xml->root_guid, $server, ++$level);
}
- $author = "";
+ $author = '';
// Fetch the author - for the old and the new Diaspora version
if ($source_xml->post->status_message && $source_xml->post->status_message->diaspora_handle) {
$fields = ['id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin',
'author-name', 'author-link', 'author-avatar', 'gravity',
'owner-name', 'owner-link', 'owner-avatar'];
+
$condition = ['uid' => $uid, 'guid' => $guid];
$item = Post::selectFirst($fields, $condition);
}
if ($result) {
- Logger::info("Fetched missing item " . $guid . " - result: " . $result);
+ Logger::info('Fetched missing item ' . $guid . ' - result: ' . $result);
$item = Post::selectFirst($fields, $condition);
}
}
if (!DBA::isResult($item)) {
- Logger::notice("parent item not found: parent: " . $guid . " - user: " . $uid);
+ Logger::notice('Parent item not found: parent: ' . $guid . ' - user: ' . $uid);
return false;
} else {
- Logger::notice("parent item found: parent: " . $guid . " - user: " . $uid);
+ Logger::notice('Parent item found: parent: ' . $guid . ' - user: ' . $uid);
return $item;
}
}
$contact = self::contactByHandle($importer['uid'], $old_handle);
if (!$contact) {
- Logger::notice("cannot find contact for sender: " . $old_handle . " and user " . $importer['uid']);
+ Logger::notice('Cannot find contact for sender: ' . $old_handle . ' and user ' . $importer['uid']);
return false;
}
- Logger::notice("Got migration for " . $old_handle . ", to " . $new_handle . " with user " . $importer['uid']);
+ Logger::notice('Got migration for ' . $old_handle . ', to ' . $new_handle . ' with user ' . $importer['uid']);
// Check signature
$signed_text = 'AccountMigration:' . $old_handle . ':' . $new_handle;
}
$fields = [
- 'url' => $data['url'],
- 'nurl' => Strings::normaliseLink($data['url']),
- 'name' => $data['name'],
- 'nick' => $data['nick'],
- 'addr' => $data['addr'],
- 'batch' => $data['batch'],
- 'notify' => $data['notify'],
- 'poll' => $data['poll'],
- 'network' => $data['network']
+ 'url' => $data['url'],
+ 'nurl' => Strings::normaliseLink($data['url']),
+ 'name' => $data['name'],
+ 'nick' => $data['nick'],
+ 'addr' => $data['addr'],
+ 'batch' => $data['batch'],
+ 'notify' => $data['notify'],
+ 'poll' => $data['poll'],
+ 'network' => $data['network'],
];
Contact::update($fields, ['addr' => $old_handle]);
$parts = parse_url($person['url']);
unset($parts['path']);
- $host_url = Network::unparseURL($parts);
+ $host_url = (string)Uri::fromParts($parts);
return $host_url . '/objects/' . $guid;
}
$person = FContact::getByURL($author);
if (!is_array($person)) {
- Logger::notice("unable to find author details");
+ Logger::notice('Unable to find author details');
return false;
}
$datarray['owner-id'] = Contact::getIdForURL($contact['url'], 0);
// Will be overwritten for sharing accounts in Item::insert
- if (in_array($direction, [self::FETCHED, self::FORCED_FETCH])) {
- $datarray['post-reason'] = Item::PR_FETCHED;
- } elseif ($datarray['uid'] == 0) {
- $datarray['post-reason'] = Item::PR_GLOBAL;
- } else {
- $datarray['post-reason'] = Item::PR_COMMENT;
- }
+ $datarray = self::setDirection($datarray, $direction);
$datarray['guid'] = $guid;
$datarray['uri'] = self::getUriFromGuid($author, $guid);
$datarray['protocol'] = Conversation::PARCEL_DIASPORA;
$datarray['source'] = $xml;
- $datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
+
+ $datarray = self::setDirection($datarray, $direction);
$datarray['changed'] = $datarray['created'] = $datarray['edited'] = $created_at;
}
if ($message_id) {
- Logger::info("Stored comment " . $datarray['guid'] . " with message id " . $message_id);
+ Logger::info('Stored comment ' . $datarray['guid'] . ' with message id ' . $message_id);
if ($datarray['uid'] == 0) {
Item::distribute($message_id, json_encode($data));
}
$msg_created_at = DateTimeFormat::utc(XML::unescape($mesg->created_at));
if ($msg_conversation_guid != $guid) {
- Logger::notice("message conversation guid does not belong to the current conversation.");
+ Logger::notice('Message conversation guid does not belong to the current conversation.', ['guid' => $guid]);
return false;
}
$body = Markdown::toBBCode($msg_text);
- $message_uri = $msg_author.":".$msg_guid;
+ $message_uri = $msg_author . ':' . $msg_guid;
$person = FContact::getByURL($msg_author);
$messages = $data->message;
if (!count($messages)) {
- Logger::notice("empty conversation");
+ Logger::notice('Empty conversation');
return false;
}
'created' => $created_at,
'updated' => DateTimeFormat::utcNow(),
'subject' => $subject,
- 'recips' => $participants]);
+ 'recips' => $participants
+ ]);
+
if ($r) {
$conversation = DBA::selectFirst('conv', [], ['uid' => $importer['uid'], 'guid' => $guid]);
}
}
if (!$conversation) {
- Logger::notice("unable to create conversation.");
+ Logger::warning('Unable to create conversation.');
return false;
}
$person = FContact::getByURL($author);
if (!is_array($person)) {
- Logger::notice("unable to find author details");
+ Logger::notice('Unable to find author details');
return false;
}
$datarray = [];
$datarray['protocol'] = Conversation::PARCEL_DIASPORA;
- $datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
$datarray['uid'] = $importer['uid'];
$datarray['contact-id'] = $author_contact['cid'];
$datarray['network'] = $author_contact['network'];
+ $datarray = self::setDirection($datarray, $direction);
+
$datarray['owner-link'] = $datarray['author-link'] = $person['url'];
$datarray['owner-id'] = $datarray['author-id'] = Contact::getIdForURL($person['url'], 0);
}
if ($message_id) {
- Logger::info("Stored like " . $datarray['guid'] . " with message id " . $message_id);
+ Logger::info('Stored like ' . $datarray['guid'] . ' with message id ' . $message_id);
if ($datarray['uid'] == 0) {
Item::distribute($message_id, json_encode($data));
}
$conversation = DBA::selectFirst('conv', [], $condition);
if (!DBA::isResult($conversation)) {
- Logger::notice("conversation not available.");
+ Logger::notice('Conversation not available.');
return false;
}
$person = FContact::getByURL($author);
if (!$person) {
- Logger::notice("unable to find author details");
+ Logger::notice('Unable to find author details');
return false;
}
$body = Markdown::toBBCode($text);
- $body = self::replacePeopleGuid($body, $person["url"]);
+ $body = self::replacePeopleGuid($body, $person['url']);
return Mail::insert([
'uid' => $importer['uid'],
'body' => $body,
'reply' => 1,
'uri' => $message_uri,
- 'parent-uri' => $author.":".$conversation['guid'],
+ 'parent-uri' => $author . ':' . $conversation['guid'],
'created' => $created_at
]);
}
$person = FContact::getByURL($author);
if (!is_array($person)) {
- Logger::notice("Person not found: " . $author);
+ Logger::notice('Person not found: ' . $author);
return false;
}
$datarray = [];
$datarray['protocol'] = Conversation::PARCEL_DIASPORA;
- $datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
$datarray['uid'] = $importer['uid'];
$datarray['contact-id'] = $author_contact['cid'];
$datarray['network'] = $author_contact['network'];
+ $datarray = self::setDirection($datarray, $direction);
+
$datarray['owner-link'] = $datarray['author-link'] = $person['url'];
$datarray['owner-id'] = $datarray['author-id'] = Contact::getIdForURL($person['url'], 0);
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 = Post::select(['id', 'uri-id', 'parent-author-network', 'author-network', 'verb'],
+ $comments = Post::select(['id', 'uri-id', 'parent-author-network', 'author-network', 'verb', 'gravity'],
['parent' => $toplevel_parent_item['id'], 'gravity' => [GRAVITY_COMMENT, GRAVITY_ACTIVITY]]);
while ($comment = Post::fetch($comments)) {
- if (in_array($comment['verb'], [Activity::FOLLOW, Activity::TAG])) {
- Logger::info('participation messages are not relayed', ['item' => $comment['id']]);
+ if (($comment['gravity'] == GRAVITY_ACTIVITY) && !in_array($comment['verb'], [Activity::LIKE, Activity::DISLIKE])) {
+ Logger::info('Unsupported activities are not relayed', ['item' => $comment['id'], 'verb' => $comment['verb']]);
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'])) {
+ if (Worker::add(PRIORITY_HIGH, 'Delivery', Delivery::POST, $comment['uri-id'], $author_contact['cid'], $datarray['uid'])) {
Post\DeliveryData::incrementQueueCount($comment['uri-id'], 1);
}
}
Contact::update($fields, ['id' => $contact['id']]);
- Logger::info("Profile of contact " . $contact['id'] . " stored for user " . $importer['uid']);
+ Logger::info('Profile of contact ' . $contact['id'] . ' stored for user ' . $importer['uid']);
return true;
}
// That makes us friends.
if ($contact) {
if ($following) {
- Logger::info("Author " . $author . " (Contact " . $contact['id'] . ") wants to follow us.");
+ Logger::info('Author ' . $author . ' (Contact ' . $contact['id'] . ') wants to follow us.');
self::receiveRequestMakeFriend($importer, $contact);
// refetch the contact array
if (in_array($contact['rel'], [Contact::FRIEND])) {
$user = DBA::selectFirst('user', [], ['uid' => $importer['uid']]);
if (DBA::isResult($user)) {
- Logger::info("Sending share message to author " . $author . " - Contact: " . $contact['id'] . " - User: " . $importer['uid']);
+ Logger::info('Sending share message to author ' . $author . ' - Contact: ' . $contact['id'] . ' - User: ' . $importer['uid']);
self::sendShare($user, $contact);
}
}
}
$server = 'https://' . substr($orig_author, strpos($orig_author, '@') + 1);
- Logger::notice("1st try: reshared message " . $guid . " will be fetched via SSL from the server " . $server);
+ Logger::notice('1st try: reshared message ' . $guid . ' will be fetched via SSL from the server ' . $server);
$stored = self::storeByGuid($guid, $server, true);
if (!$stored) {
$server = 'http://' . substr($orig_author, strpos($orig_author, '@') + 1);
- Logger::notice("2nd try: reshared message " . $guid . " will be fetched without SSL from the server " . $server);
+ Logger::notice('2nd try: reshared message ' . $guid . ' will be fetched without SSL from the server ' . $server);
$stored = self::storeByGuid($guid, $server, true);
}
$datarray['protocol'] = $item['protocol'];
$datarray['source'] = $item['source'];
$datarray['direction'] = $item['direction'];
+ $datarray['post-reason'] = $item['post-reason'];
$datarray['plink'] = self::plink($author, $datarray['guid']);
$datarray['private'] = $item['private'];
$datarray['protocol'] = Conversation::PARCEL_DIASPORA;
$datarray['source'] = $xml;
- $datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
+
+ $datarray = self::setDirection($datarray, $direction);
/// @todo Copy tag data from original post
}
if ($message_id) {
- Logger::info("Stored reshare " . $datarray['guid'] . " with message id " . $message_id);
+ Logger::info('Stored reshare ' . $datarray['guid'] . ' with message id ' . $message_id);
if ($datarray['uid'] == 0) {
Item::distribute($message_id);
}
$person = FContact::getByURL($author);
if (!is_array($person)) {
- Logger::notice("unable to find author detail for " . $author);
+ Logger::notice('Unable to find author detail for ' . $author);
return false;
}
$r = Post::select($fields, $condition);
if (!DBA::isResult($r)) {
- Logger::notice("Target guid " . $target_guid . " was not found on this system for user " . $importer['uid'] . ".");
+ Logger::notice('Target guid ' . $target_guid . ' was not found on this system for user ' . $importer['uid'] . '.');
return false;
}
Item::markForDeletion(['id' => $item['id']]);
- Logger::info("Deleted target " . $target_guid . " (" . $item['id'] . ") from user " . $item['uid'] . " parent: " . $item['parent']);
+ Logger::info('Deleted target ' . $target_guid . ' (' . $item['id'] . ') from user ' . $item['uid'] . ' parent: ' . $item['parent']);
}
DBA::close($r);
$contact = self::contactByHandle($importer['uid'], $sender);
if (!$contact && (in_array($target_type, ['Contact', 'Person']))) {
- Logger::notice("cannot find contact for sender: " . $sender . " and user " . $importer['uid']);
+ Logger::notice('Cannot find contact for sender: ' . $sender . ' and user ' . $importer['uid']);
return false;
}
$contact = [];
}
- Logger::info("Got retraction for " . $target_type . ", sender " . $sender . " and user " . $importer['uid']);
+ Logger::info('Got retraction for ' . $target_type . ', sender ' . $sender . ' and user ' . $importer['uid']);
switch ($target_type) {
case 'Comment':
break;
default:
- Logger::notice("Unknown target type " . $target_type);
+ Logger::notice('Unknown target type ' . $target_type);
return false;
}
return true;
Post\Media::insert($data);
}
+ /**
+ * Set direction and post reason
+ *
+ * @param array $datarray
+ * @param integer $direction
+ *
+ * @return array
+ */
+ public static function setDirection(array $datarray, int $direction): array
+ {
+ $datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
+
+ if (in_array($direction, [self::FETCHED, self::FORCED_FETCH])) {
+ $datarray['post-reason'] = Item::PR_FETCHED;
+ } elseif ($datarray['uid'] == 0) {
+ $datarray['post-reason'] = Item::PR_GLOBAL;
+ } else {
+ $datarray['post-reason'] = Item::PR_PUSHED;
+ }
+
+ return $datarray;
+ }
+
/**
* Receives status messages
*
$datarray['protocol'] = Conversation::PARCEL_DIASPORA;
$datarray['source'] = $xml;
- $datarray['direction'] = in_array($direction, [self::FETCHED, self::FORCED_FETCH]) ? Conversation::PULL : Conversation::PUSH;
- if (in_array($direction, [self::FETCHED, self::FORCED_FETCH])) {
- $datarray['post-reason'] = Item::PR_FETCHED;
- } elseif ($datarray['uid'] == 0) {
- $datarray['post-reason'] = Item::PR_GLOBAL;
- }
+ $datarray = self::setDirection($datarray, $direction);
$datarray['body'] = self::replacePeopleGuid($body, $contact['url']);
$datarray['raw-body'] = self::replacePeopleGuid($raw_body, $contact['url']);
}
if (isset($address['lat']) && isset($address['lng'])) {
- $datarray['coord'] = $address['lat'] . " " . $address['lng'];
+ $datarray['coord'] = $address['lat'] . ' ' . $address['lng'];
}
self::fetchGuid($datarray);
self::sendParticipation($contact, $datarray);
if ($message_id) {
- Logger::info("Stored item " . $datarray['guid'] . " with message id " . $message_id);
+ Logger::info('Stored item ' . $datarray['guid'] . ' with message id ' . $message_id);
if ($datarray['uid'] == 0) {
Item::distribute($message_id);
}
*/
public static function encodePrivateData(string $msg, array $user, array $contact, string $prvkey, string $pubkey): string
{
- Logger::debug("Message: ".$msg);
+ Logger::debug('Message: ' . $msg);
// without a public key nothing will work
if (!$pubkey) {
- Logger::notice("pubkey missing: contact id: ".$contact["id"]);
+ Logger::notice('pubkey missing: contact id: ' . $contact['id']);
return false;
}
]
];
- $namespaces = ['me' => 'http://salmon-protocol.org/ns/magic-env'];
+ $namespaces = ['me' => ActivityNamespace::SALMON_ME];
return XML::fromArray($xmldata, $xml, false, $namespaces);
}
}
if (!$dest_url) {
- Logger::notice("no url for contact: " . $contact['id'] . " batch mode =" . $public_batch);
+ Logger::notice('No URL for contact: ' . $contact['id'] . ' batch mode =' . $public_batch);
return 0;
}
- Logger::notice("transmit: " . $logid . "-" . $guid . " " . $dest_url);
+ Logger::notice('transmit: ' . $logid . '-' . $guid . ' ' . $dest_url);
if (!intval(DI::config()->get('system', 'diaspora_test'))) {
$content_type = (($public_batch) ? 'application/magic-envelope+xml' : 'application/json');
return 200;
}
- Logger::notice("transmit: " . $logid . "-" . $guid . " to " . $dest_url . " returns: " . $return_code);
+ Logger::notice('transmit: ' . $logid . '-' . $guid . ' to ' . $dest_url . ' returns: ' . $return_code);
return $return_code ? $return_code : -1;
}
Logger::notice('Empty addr', ['contact' => $contact ?? [], 'callstack' => System::callstack(20)]);
}
- $envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $pubkey, $public_batch);
+ $envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $pubkey ?? '', $public_batch);
$return_code = self::transmit($owner, $contact, $envelope, $public_batch, $guid);
'parent_guid' => $item['guid']
];
- Logger::info("Send participation for " . $item['guid'] . " by " . $author);
+ Logger::info('Send participation for ' . $item['guid'] . ' by ' . $author);
// It doesn't matter what we store, we only want to avoid sending repeated notifications for the same item
DI::cache()->set($cachekey, $item['guid'], Duration::QUARTER_HOUR);
public static function sendUnshare(array $owner, array $contact): int
{
$message = [
- 'author' => self::myHandle($owner),
+ 'author' => self::myHandle($owner),
'recipient' => $contact['addr'],
'following' => 'false',
- 'sharing' => 'false'
+ 'sharing' => 'false'
];
Logger::info('Send unshare', ['msg' => $message]);
// Detect a share element and do a reshare
if (($item['private'] != Item::PRIVATE) && ($ret = self::isReshare($item['body']))) {
$message = [
- 'author' => $myaddr,
- 'guid' => $item['guid'],
- 'created_at' => $created,
- 'root_author' => $ret['root_handle'],
- 'root_guid' => $ret['root_guid'],
+ 'author' => $myaddr,
+ 'guid' => $item['guid'],
+ 'created_at' => $created,
+ 'root_author' => $ret['root_handle'],
+ 'root_guid' => $ret['root_guid'],
'provider_display_name' => $item['app'],
- 'public' => $public
+ 'public' => $public
];
$type = 'reshare';
}
$msg = [
- 'type' => $type,
+ 'type' => $type,
'message' => $message
];
}
return [
- 'author' => self::myHandle($owner),
- 'guid' => $item['guid'],
- 'parent_guid' => $parent['guid'],
- 'parent_type' => $target_type,
- 'positive' => $positive,
- 'author_signature' => ''
+ 'author' => self::myHandle($owner),
+ 'guid' => $item['guid'],
+ 'parent_guid' => $parent['guid'],
+ 'parent_type' => $target_type,
+ 'positive' => $positive,
+ 'author_signature' => '',
];
}
$attend_answer = 'tentative';
break;
default:
- Logger::notice('Unknown verb '.$item['verb'].' in item '.$item['guid']);
+ Logger::warning('Unknown verb ' . $item['verb'] . ' in item ' . $item['guid']);
return false;
}
'edited_at' => $edited,
'parent_guid' => $toplevel_item['guid'],
'text' => $text,
- 'author_signature' => ''
+ 'author_signature' => '',
];
// Send the thread parent guid only if it is a threaded comment
$type = 'comment';
}
- Logger::info("Got relayable data " . $type . " for item " . $item['guid'] . " (" . $item['id'] . ")");
+ Logger::info('Got relayable data ' . $type . ' for item ' . $item['guid'] . ' (' . $item['id'] . ')');
$msg = json_decode($item['signed_text'], true);
$message[$field] = $data;
}
} else {
- Logger::info("Signature text for item " . $item["guid"] . " (" . $item["id"] . ") couldn't be extracted: " . $item['signed_text']);
+ Logger::info('Signature text for item ' . $item['guid'] . ' (' . $item['id'] . ') could not be extracted: ' . $item['signed_text']);
}
$message['parent_author_signature'] = self::signature($owner, $message);
$cnv = DBA::selectFirst('conv', [], ['id' => $item['convid'], 'uid' => $item['uid']]);
if (!DBA::isResult($cnv)) {
- Logger::notice("conversation not found.");
+ Logger::notice('Conversation not found.');
return -1;
}
private static function createProfileData(int $uid): array
{
$profile = DBA::selectFirst('owner-view', ['uid', 'addr', 'name', 'location', 'net-publish', 'dob', 'about', 'pub_keywords'], ['uid' => $uid]);
+
if (!DBA::isResult($profile)) {
return [];
}
- $handle = $profile['addr'];
-
$split_name = self::splitName($profile['name']);
- $first = $split_name['first'];
- $last = $split_name['last'];
- $large = DI::baseUrl().'/photo/custom/300/'.$profile['uid'].'.jpg';
- $medium = DI::baseUrl().'/photo/custom/100/'.$profile['uid'].'.jpg';
- $small = DI::baseUrl().'/photo/custom/50/' .$profile['uid'].'.jpg';
- $searchable = ($profile['net-publish'] ? 'true' : 'false');
+ $data = [
+ 'author' => $profile['addr'],
+ 'first_name' => $split_name['first'],
+ 'last_name' => $split_name['last'],
+ 'image_url' => DI::baseUrl() . '/photo/custom/300/' . $profile['uid'] . '.jpg',
+ 'image_url_medium' => DI::baseUrl() . '/photo/custom/100/' . $profile['uid'] . '.jpg',
+ 'image_url_small' => DI::baseUrl() . '/photo/custom/50/' . $profile['uid'] . '.jpg',
+ 'searchable' => ($profile['net-publish'] ? 'true' : 'false'),
+ 'birthday' => null,
+ 'about' => null,
+ 'location' => null,
+ 'tag_string' => null,
+ 'nsfw' => 'false',
+ ];
- $dob = null;
- $about = null;
- $location = null;
- $tags = null;
- if ($searchable === 'true') {
- $dob = '';
+ if ($data['searchable'] === 'true') {
+ $data['birthday'] = '';
if ($profile['dob'] && ($profile['dob'] > '0000-00-00')) {
[$year, $month, $day] = sscanf($profile['dob'], '%4d-%2d-%2d');
if ($year < 1004) {
$year = 1004;
}
- $dob = DateTimeFormat::utc($year . '-' . $month . '-'. $day, 'Y-m-d');
+ $data['birthday'] = DateTimeFormat::utc($year . '-' . $month . '-' . $day, 'Y-m-d');
}
- $about = BBCode::toMarkdown($profile['about']);
+ $data['about'] = BBCode::toMarkdown($profile['about'] ?? '');
+
+ $data['location'] = $profile['location'];
+ $data['tag_string'] = '';
- $location = $profile['location'];
- $tags = '';
if ($profile['pub_keywords']) {
$kw = str_replace(',', ' ', $profile['pub_keywords']);
$kw = str_replace(' ', ' ', $kw);
if (count($arr)) {
for ($x = 0; $x < 5; $x ++) {
if (!empty($arr[$x])) {
- $tags .= '#'. trim($arr[$x]) .' ';
+ $data['tag_string'] .= '#'. trim($arr[$x]) .' ';
}
}
}
}
- $tags = trim($tags);
+ $data['tag_string'] = trim($data['tag_string']);
}
- return [
- 'author' => $handle,
- 'first_name' => $first,
- 'last_name' => $last,
- 'image_url' => $large,
- 'image_url_medium' => $medium,
- 'image_url_small' => $small,
- 'birthday' => $dob,
- 'bio' => $about,
- 'location' => $location,
- 'searchable' => $searchable,
- 'nsfw' => 'false',
- 'tag_string' => $tags
- ];
+ return $data;
}
/**
* Sends profile data
*
- * @param int $uid The user id
- * @param bool $recips optional, default false
+ * @param int $uid The user id
+ * @param array $recipients optional, default empty array
+ *
* @return void
* @throws \Exception
*/
- public static function sendProfile(int $uid, bool $recips = false)
+ public static function sendProfile(int $uid, array $recipients = [])
{
if (!$uid) {
+ Logger::warning('Parameter "uid" is empty');
return;
}
$owner = User::getOwnerDataById($uid);
- if (!$owner) {
+ if (empty($owner)) {
+ Logger::warning('Cannot fetch User record', ['uid' => $uid]);
return;
}
- if (!$recips) {
- $recips = DBA::selectToArray('contact', [], ['network' => Protocol::DIASPORA, 'uid' => $uid, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]);
+ if (empty($recipients)) {
+ Logger::debug('No recipients provided, fetching for user', ['uid' => $uid]);
+ $recipients = DBA::selectToArray('contact', [], ['network' => Protocol::DIASPORA, 'uid' => $uid, 'rel' => [Contact::FOLLOWER, Contact::FRIEND]]);
}
- if (!$recips) {
+ if (empty($recipients)) {
+ Logger::warning('Cannot fetch recipients', ['uid' => $uid]);
return;
}
$message = self::createProfileData($uid);
- // @ToDo Split this into single worker jobs
- foreach ($recips as $recip) {
- Logger::info("Send updated profile data for user " . $uid . " to contact " . $recip['id']);
- self::buildAndTransmit($owner, $recip, 'profile', $message);
+ // @todo Split this into single worker jobs
+ foreach ($recipients as $recipient) {
+ Logger::info('Send updated profile data for user ' . $uid . ' to contact ' . $recipient['id']);
+ self::buildAndTransmit($owner, $recipient, 'profile', $message);
}
}
{
$owner = User::getOwnerDataById($uid);
if (empty($owner)) {
- Logger::info('No owner post, so not storing signature');
+ Logger::info('No owner post, so not storing signature', ['uid' => $uid]);
return false;
}
if (!in_array($item['verb'], [Activity::LIKE, Activity::DISLIKE])) {
+ Logger::warning('Item is neither a like nor a dislike', ['uid' => $uid, 'item[verb]' => $item['verb']]);;
return false;
}
*/
public static function createCommentSignature(array $item)
{
+ $contact = [];
if (!empty($item['author-link'])) {
$url = $item['author-link'];
} else {
$uid = User::getIdForURL($url);
if (empty($uid)) {
- Logger::info('No owner post, so not storing signature', ['url' => $contact['url']]);
+ Logger::info('No owner post, so not storing signature', ['url' => $contact['url'] ?? 'No contact loaded']);
return false;
}
projects / friendica.git / blobdiff