use Friendica\Model\Post;
use Friendica\Model\Tag;
use Friendica\Model\User;
+use Friendica\Network\HTTPClient\Client\HttpClientAccept;
use Friendica\Network\Probe;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
use Friendica\Util\Strings;
use Friendica\Util\XML;
use Friendica\Worker\Delivery;
+use GuzzleHttp\Psr7\Uri;
use SimpleXMLElement;
/**
*/
class Diaspora
{
+ const PUSHED = 0;
+ const FETCHED = 1;
+ const FORCED_FETCH = 2;
+
/**
* Return a list of participating contacts for a thread
*
* @return array of relay servers
* @throws \Exception
*/
- public static function participantsForThread(array $item, array $contacts)
+ public static function participantsForThread(array $item, array $contacts): array
{
- if (!in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]) || in_array($item["verb"], [Activity::FOLLOW, Activity::TAG])) {
+ if (!in_array($item['private'], [Item::PUBLIC, Item::UNLISTED]) || in_array($item['verb'], [Activity::FOLLOW, Activity::TAG])) {
Logger::info('Item is private or a participation request. It will not be relayed', ['guid' => $item['guid'], 'private' => $item['private'], 'verb' => $item['verb']]);
return $contacts;
}
*
* @param string $envelope The magic envelope
*
- * @return string verified data
+ * @return string|bool verified data or false on error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function verifyMagicEnvelope($envelope)
+ private static function verifyMagicEnvelope(string $envelope)
{
$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];
$sig = Strings::base64UrlDecode($children->sig);
$key_id = $children->sig->attributes()->key_id[0];
- if ($key_id != "") {
+ if ($key_id != '') {
$handle = Strings::base64UrlDecode($key_id);
}
$b64url_data = Strings::base64UrlEncode($data);
- $msg = str_replace(["\n", "\r", " ", "\t"], ["", "", "", ""], $b64url_data);
+ $msg = str_replace(["\n", "\r", " ", "\t"], ['', '', '', ''], $b64url_data);
- $signable_data = $msg.".".Strings::base64UrlEncode($type).".".Strings::base64UrlEncode($encoding).".".Strings::base64UrlEncode($alg);
+ $signable_data = $msg . '.' . Strings::base64UrlEncode($type) . '.' . Strings::base64UrlEncode($encoding) . '.' . Strings::base64UrlEncode($alg);
if ($handle == '') {
Logger::notice('No author could be decoded. Discarding. Message: ' . $envelope);
*
* @return string encrypted data
*/
- private static function aesEncrypt($key, $iv, $data)
+ private static function aesEncrypt(string $key, string $iv, string $data): string
{
return openssl_encrypt($data, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
}
*
* @return string decrypted data
*/
- private static function aesDecrypt($key, $iv, $encrypted)
+ private static function aesDecrypt(string $key, string $iv, string $encrypted): string
{
return openssl_decrypt($encrypted, 'aes-256-cbc', str_pad($key, 32, "\0"), OPENSSL_RAW_DATA, str_pad($iv, 16, "\0"));
}
/**
- * Decodes incoming Diaspora message in the new format
+ * Decodes incoming Diaspora message in the new format. This method returns false on an error.
*
* @param string $raw raw post message
* @param string $privKey The private key of the importer
* @param boolean $no_exit Don't do an http exit on error
*
- * @return array
+ * @return bool|array
* 'message' -> decoded Diaspora XML message
* 'author' -> author diaspora handle
* 'key' -> author public key (converted to pkcs#8)
$base = $basedom->children(ActivityNamespace::SALMON_ME);
// Not sure if this cleaning is needed
- $data = str_replace([" ", "\t", "\r", "\n"], ["", "", "", ""], $base->data);
+ $data = str_replace([" ", "\t", "\r", "\n"], ['', '', '', ''], $base->data);
// Build the signed data
$type = $base->data[0]->attributes()->type[0];
$encoding = $base->encoding;
$alg = $base->alg;
- $signed_data = $data.'.'.Strings::base64UrlEncode($type).'.'.Strings::base64UrlEncode($encoding).'.'.Strings::base64UrlEncode($alg);
+ $signed_data = $data . '.' . Strings::base64UrlEncode($type) . '.' . Strings::base64UrlEncode($encoding) . '.' . Strings::base64UrlEncode($alg);
// This is the signature
$signature = Strings::base64UrlDecode($base->sig);
}
}
- return ['message' => (string)Strings::base64UrlDecode($base->data),
- 'author' => XML::unescape($author_addr),
- 'key' => (string)$key];
+ return [
+ 'message' => (string)Strings::base64UrlDecode($base->data),
+ 'author' => XML::unescape($author_addr),
+ 'key' => (string)$key
+ ];
}
/**
// unpack the data
// strip whitespace so our data element will return to one big base64 blob
- $data = str_replace([" ", "\t", "\r", "\n"], ["", "", "", ""], $base->data);
+ $data = str_replace([" ", "\t", "\r", "\n"], ['', '', '', ''], $base->data);
// stash away some other stuff for later
Logger::notice('Message verified.');
- return ['message' => (string)$inner_decrypted,
- 'author' => XML::unescape($author_link),
- 'key' => (string)$key];
+ return [
+ 'message' => (string)$inner_decrypted,
+ 'author' => XML::unescape($author_link),
+ 'key' => (string)$key
+ ];
}
/**
* Dispatches public messages and find the fitting receivers
*
- * @param array $msg The post that will be dispatched
- * @param bool $fetched The message had been fetched (default "false")
+ * @param array $msg The post that will be dispatched
+ * @param int $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
*
- * @return int The message id of the generated message, "true" or "false" if there was an error
+ * @return int|bool The message id of the generated message, "true" or "false" if there was an error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function dispatchPublic($msg, bool $fetched = false)
+ 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;
}
- $importer = ["uid" => 0, "page-flags" => User::PAGE_FLAGS_FREELOVE];
- $success = self::dispatch($importer, $msg, $fields, $fetched);
+ $importer = [
+ 'uid' => 0,
+ 'page-flags' => User::PAGE_FLAGS_FREELOVE
+ ];
+ $success = self::dispatch($importer, $msg, $fields, $direction);
return $success;
}
/**
* Dispatches the different message types to the different functions
*
- * @param array $importer Array of the importer user
- * @param array $msg The post that will be dispatched
- * @param SimpleXMLElement $fields SimpleXML object that contains the message
- * @param bool $fetched The message had been fetched (default "false")
+ * @param array $importer Array of the importer user
+ * @param array $msg The post that will be dispatched
+ * @param SimpleXMLElement $fields SimpleXML object that contains the message
+ * @param int $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
*
- * @return int The message id of the generated message, "true" or "false" if there was an error
+ * @return int|bool The message id of the generated message, "true" or "false" if there was an error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function dispatch(array $importer, $msg, SimpleXMLElement $fields = null, bool $fetched = false)
+ public static function dispatch(array $importer, array $msg, SimpleXMLElement $fields = null, int $direction = self::PUSHED)
{
// The sender is the handle of the contact that sent the message.
// This will often be different with relayed messages (for example "like" and "comment")
- $sender = $msg["author"];
+ $sender = $msg['author'];
// This is only needed for private postings since this is already done for public ones before
if (is_null($fields)) {
$private = true;
if (!($fields = self::validPosting($msg))) {
- Logger::notice("Invalid posting");
+ Logger::warning('Invalid posting');
return false;
}
} else {
$type = $fields->getName();
- Logger::info('Received message', ['type' => $type, 'sender' => $sender, 'user' => $importer["uid"]]);
+ Logger::info('Received message', ['type' => $type, 'sender' => $sender, 'user' => $importer['uid']]);
switch ($type) {
- case "account_migration":
+ case 'account_migration':
if (!$private) {
Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveAccountMigration($importer, $fields);
- case "account_deletion":
+ case 'account_deletion':
return self::receiveAccountDeletion($fields);
- case "comment":
- return self::receiveComment($importer, $sender, $fields, $msg["message"], $fetched);
+ case 'comment':
+ return self::receiveComment($importer, $sender, $fields, $msg['message'], $direction);
- case "contact":
+ case 'contact':
if (!$private) {
Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveContactRequest($importer, $fields);
- case "conversation":
+ case 'conversation':
if (!$private) {
Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveConversation($importer, $msg, $fields);
- case "like":
- return self::receiveLike($importer, $sender, $fields, $fetched);
+ case 'like':
+ return self::receiveLike($importer, $sender, $fields, $direction);
- case "message":
+ case 'message':
if (!$private) {
Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveMessage($importer, $fields);
- case "participation":
+ case 'participation':
if (!$private) {
Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
- return self::receiveParticipation($importer, $fields, $fetched);
+ return self::receiveParticipation($importer, $fields, $direction);
- case "photo": // Not implemented
+ case 'photo': // Not implemented
return self::receivePhoto($importer, $fields);
- case "poll_participation": // Not implemented
+ case 'poll_participation': // Not implemented
return self::receivePollParticipation($importer, $fields);
- case "profile":
+ case 'profile':
if (!$private) {
Logger::notice('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveProfile($importer, $fields);
- case "reshare":
- return self::receiveReshare($importer, $fields, $msg["message"], $fetched);
+ case 'reshare':
+ return self::receiveReshare($importer, $fields, $msg['message'], $direction);
- case "retraction":
+ case 'retraction':
return self::receiveRetraction($importer, $sender, $fields);
- case "status_message":
- return self::receiveStatusMessage($importer, $fields, $msg["message"], $fetched);
+ case 'status_message':
+ return self::receiveStatusMessage($importer, $fields, $msg['message'], $direction);
default:
- Logger::notice("Unknown message type ".$type);
+ Logger::notice('Unknown message type ' . $type);
return false;
}
}
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function validPosting($msg)
+ private static function validPosting(array $msg)
{
- $data = XML::parseString($msg["message"]);
+ $data = XML::parseString($msg['message']);
if (!is_object($data)) {
Logger::info('No valid XML', ['message' => $msg['message']]);
}
// Is this the new or the old version?
- if ($data->getName() == "XML") {
+ if ($data->getName() == 'XML') {
$oldXML = true;
foreach ($data->post->children() as $child) {
$element = $child;
$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".
- if (in_array($type, ["signed_retraction", "relayable_retraction"]))
- $type = "retraction";
+ if (in_array($type, ['signed_retraction', 'relayable_retraction']))
+ $type = 'retraction';
- if ($type == "request") {
- $type = "contact";
+ if ($type == 'request') {
+ $type = 'contact';
}
- $fields = new SimpleXMLElement("<".$type."/>");
+ $fields = new SimpleXMLElement('<' . $type . '/>');
- $signed_data = "";
+ $signed_data = '';
$author_signature = null;
$parent_author_signature = null;
foreach ($element->children() as $fieldname => $entry) {
if ($oldXML) {
// Translation for the old XML structure
- if ($fieldname == "diaspora_handle") {
- $fieldname = "author";
+ if ($fieldname == 'diaspora_handle') {
+ $fieldname = 'author';
}
- if ($fieldname == "participant_handles") {
- $fieldname = "participants";
+ if ($fieldname == 'participant_handles') {
+ $fieldname = 'participants';
}
- if (in_array($type, ["like", "participation"])) {
- if ($fieldname == "target_type") {
- $fieldname = "parent_type";
+ if (in_array($type, ['like', 'participation'])) {
+ if ($fieldname == 'target_type') {
+ $fieldname = 'parent_type';
}
}
- if ($fieldname == "sender_handle") {
- $fieldname = "author";
+ if ($fieldname == 'sender_handle') {
+ $fieldname = 'author';
}
- if ($fieldname == "recipient_handle") {
- $fieldname = "recipient";
+ if ($fieldname == 'recipient_handle') {
+ $fieldname = 'recipient';
}
- if ($fieldname == "root_diaspora_id") {
- $fieldname = "root_author";
+ if ($fieldname == 'root_diaspora_id') {
+ $fieldname = 'root_author';
}
- if ($type == "status_message") {
- if ($fieldname == "raw_message") {
- $fieldname = "text";
+ if ($type == 'status_message') {
+ if ($fieldname == 'raw_message') {
+ $fieldname = 'text';
}
}
- if ($type == "retraction") {
- if ($fieldname == "post_guid") {
- $fieldname = "target_guid";
+ if ($type == 'retraction') {
+ if ($fieldname == 'post_guid') {
+ $fieldname = 'target_guid';
}
- if ($fieldname == "type") {
- $fieldname = "target_type";
+ if ($fieldname == 'type') {
+ $fieldname = 'target_type';
}
}
}
- if (($fieldname == "author_signature") && ($entry != "")) {
+ if (($fieldname == 'author_signature') && ($entry != '')) {
$author_signature = base64_decode($entry);
- } elseif (($fieldname == "parent_author_signature") && ($entry != "")) {
+ } elseif (($fieldname == 'parent_author_signature') && ($entry != '')) {
$parent_author_signature = base64_decode($entry);
- } elseif (!in_array($fieldname, ["author_signature", "parent_author_signature", "target_author_signature"])) {
- if ($signed_data != "") {
- $signed_data .= ";";
+ } elseif (!in_array($fieldname, ['author_signature', 'parent_author_signature', 'target_author_signature'])) {
+ if ($signed_data != '') {
+ $signed_data .= ';';
}
$signed_data .= $entry;
}
- if (!in_array($fieldname, ["parent_author_signature", "target_author_signature"])
- || ($orig_type == "relayable_retraction")
+ if (!in_array($fieldname, ['parent_author_signature', 'target_author_signature'])
+ || ($orig_type == 'relayable_retraction')
) {
XML::copy($entry, $fields, $fieldname);
}
}
// 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.");
+ 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.', ['author1' => $msg['author'], 'author2' => $fields->author]);
return false;
}
}
// Only some message types have signatures. So we quit here for the other types.
- if (!in_array($type, ["comment", "like"])) {
+ 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 (isset($parent_author_signature)) {
- $key = self::key($msg["author"]);
+ $key = self::key($msg['author']);
if (empty($key)) {
- Logger::info('No key found for parent', ['author' => $msg["author"]]);
+ Logger::info('No key found for parent', ['author' => $msg['author']]);
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);
+ if (!Crypto::rsaVerify($signed_data, $parent_author_signature, $key, 'sha256')) {
+ 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;
}
}
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);
+ if (!Crypto::rsaVerify($signed_data, $author_signature, $key, 'sha256')) {
+ 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($handle)
+ 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)]);
- $r = FContact::getByURL($handle);
- if ($r) {
- return $r["pubkey"];
+ $fcontact = FContact::getByURL($handle);
+ if (!empty($fcontact['pubkey'])) {
+ return $fcontact['pubkey'];
}
- return "";
+ return '';
}
/**
* @return string the handle
* @throws \Exception
*/
- private static function handleFromContact($contact_id, $pcontact_id = 0)
+ private static function handleFromContact(int $contact_id, int $pcontact_id = 0): string
{
$handle = '';
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function contactByHandle($uid, $handle)
+ private static function contactByHandle(int $uid, string $handle): array
{
return Contact::getByURL($handle, null, [], $uid);
}
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function isSupportedByContactUrl($url, $update = null)
+ public static function isSupportedByContactUrl(string $url, $update = null)
{
return !empty(FContact::getByURL($url, $update));
}
*
* @return bool is the contact allowed to post?
*/
- private static function postAllow(array $importer, array $contact, $is_comment = false)
+ private static function postAllow(array $importer, array $contact, bool $is_comment = false): bool
{
/*
* Perhaps we were already sharing with this person. Now they're sharing with us.
// It is deactivated by now, due to side effects. See issue https://github.com/friendica/friendica/pull/4033
// It is not removed by now. Possibly the code is needed?
//if (!$is_comment && $contact["rel"] == Contact::FOLLOWER && in_array($importer["page-flags"], array(User::PAGE_FLAGS_FREELOVE))) {
- // DBA::update(
- // 'contact',
+ // Contact::update(
// array('rel' => Contact::FRIEND, 'writable' => true),
// array('id' => $contact["id"], 'uid' => $contact["uid"])
// );
if (Network::isUrlBlocked($contact['url'])) {
return false;
// We don't seem to like that person
- } elseif ($contact["blocked"]) {
+ } elseif ($contact['blocked']) {
// Maybe blocked, don't accept.
return false;
// We are following this person?
- } elseif (($contact["rel"] == Contact::SHARING) || ($contact["rel"] == Contact::FRIEND)) {
+ } elseif (($contact['rel'] == Contact::SHARING) || ($contact['rel'] == Contact::FRIEND)) {
// Yes, then it is fine.
return true;
- // Is it a post to a community?
- } elseif (($contact["rel"] == Contact::FOLLOWER) && in_array($importer["page-flags"], [User::PAGE_FLAGS_COMMUNITY, User::PAGE_FLAGS_PRVGROUP])) {
- // That's good
- return true;
// Is the message a global user or a comment?
- } elseif (($importer["uid"] == 0) || $is_comment) {
+ } elseif (($importer['uid'] == 0) || $is_comment) {
// Messages for the global users and comments are always accepted
return true;
}
* @param string $handle The checked handle in the format user@domain.tld
* @param bool $is_comment Is the check for a comment?
*
- * @return array The contact data
+ * @return array|bool The contact data or false on error
* @throws \Exception
*/
- private static function allowedContactByHandle(array $importer, $handle, $is_comment = false)
+ private static function allowedContactByHandle(array $importer, string $handle, bool $is_comment = false)
{
- $contact = self::contactByHandle($importer["uid"], $handle);
+ $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)) {
+ if ($is_comment && ($importer['uid'] != 0)) {
return self::contactByHandle(0, $handle);
} elseif ($is_comment) {
return $importer;
}
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;
* @return int|bool message id if the message already was stored into the system - or false.
* @throws \Exception
*/
- private static function messageExists($uid, $guid)
+ private static function messageExists(int $uid, string $guid)
{
$item = Post::selectFirst(['id'], ['uid' => $uid, 'guid' => $guid]);
if (DBA::isResult($item)) {
- Logger::notice("message ".$guid." already exists for user ".$uid);
- return $item["id"];
+ Logger::notice('Message ' . $guid . ' already exists for user ' . $uid);
+ return $item['id'];
}
return false;
*/
private static function fetchGuid(array $item)
{
- $expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
preg_replace_callback(
- $expression,
+ "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism",
function ($match) use ($item) {
self::fetchGuidSub($match, $item);
},
- $item["body"]
+ $item['body']
);
preg_replace_callback(
function ($match) use ($item) {
self::fetchGuidSub($match, $item);
},
- $item["body"]
+ $item['body']
);
}
*
* @return string the replaced string
*/
- public static function replacePeopleGuid($body, $author_link)
+ public static function replacePeopleGuid(string $body, string $author_link): string
{
$return = preg_replace_callback(
"&\[url=/people/([^\[\]]*)\](.*)\[\/url\]&Usi",
$handle = FContact::getUrlByGuid($match[1]);
if ($handle) {
- $return = '@[url='.$handle.']'.$match[2].'[/url]';
+ $return = '@[url=' . $handle . ']' . $match[2] . '[/url]';
} else {
// No local match, restoring absolute remote URL from author scheme and host
$author_url = parse_url($author_link);
- $return = '[url='.$author_url['scheme'].'://'.$author_url['host'].'/people/'.$match[1].']'.$match[2].'[/url]';
+ $return = '[url=' . $author_url['scheme'] . '://' . $author_url['host'] . '/people/' . $match[1] . ']' . $match[2] . '[/url]';
}
return $return;
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function fetchGuidSub($match, $item)
+ private static function fetchGuidSub(array $match, array $item)
{
- if (!self::storeByGuid($match[1], $item["author-link"])) {
- self::storeByGuid($match[1], $item["owner-link"]);
+ if (!self::storeByGuid($match[1], $item['author-link'], true)) {
+ self::storeByGuid($match[1], $item['owner-link'], true);
}
}
*
* @param string $guid the message guid
* @param string $server The server address
- * @param int $uid The user id of the user
+ * @param bool $force Forced fetch
*
- * @return int the message id of the stored message or false
+ * @return int|bool the message id of the stored message or false
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function storeByGuid($guid, $server, $uid = 0)
+ public static function storeByGuid(string $guid, string $server, bool $force)
{
$serverparts = parse_url($server);
- if (empty($serverparts["host"]) || empty($serverparts["scheme"])) {
+ if (empty($serverparts['host']) || empty($serverparts['scheme'])) {
return false;
}
- $server = $serverparts["scheme"]."://".$serverparts["host"];
+ $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, true);
+ return self::dispatchPublic($msg, $force ? self::FORCED_FETCH : self::FETCHED);
}
/**
* 'key' => The public key of the author
* @throws \Exception
*/
- public static function message($guid, $server, $level = 0)
+ public static function message(string $guid, string $server, int $level = 0)
{
if ($level > 5) {
return false;
}
// This will work for new Diaspora servers and Friendica servers from 3.5
- $source_url = $server."/fetch/post/".urlencode($guid);
+ $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);
+ $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) {
$author = (string)$source_xml->post->status_message->diaspora_handle;
- } elseif ($source_xml->author && ($source_xml->getName() == "status_message")) {
+ } elseif ($source_xml->author && ($source_xml->getName() == 'status_message')) {
$author = (string)$source_xml->author;
}
return false;
}
- $msg = ["message" => $x, "author" => $author];
-
- $msg["key"] = self::key($msg["author"]);
-
- return $msg;
+ return [
+ 'message' => $x,
+ 'author' => $author,
+ 'key' => self::key($author)
+ ];
}
/**
* Fetches an item with a given URL
*
* @param string $url the message url
+ * @param int $uid User id
*
- * @return int the message id of the stored message or false
+ * @return int|bool the message id of the stored message or false
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function fetchByURL($url, $uid = 0)
+ public static function fetchByURL(string $url, int $uid = 0)
{
// Check for Diaspora (and Friendica) typical paths
- if (!preg_match("=(https?://.+)/(?:posts|display|objects)/([a-zA-Z0-9-_@.:%]+[a-zA-Z0-9])=i", $url, $matches)) {
+ if (!preg_match('=(https?://.+)/(?:posts|display|objects)/([a-zA-Z0-9-_@.:%]+[a-zA-Z0-9])=i', $url, $matches)) {
Logger::info('Invalid url', ['url' => $url]);
return false;
}
}
Logger::info('Fetch GUID from origin', ['guid' => $guid, 'server' => $matches[1]]);
- $ret = self::storeByGuid($guid, $matches[1], $uid);
+ $ret = self::storeByGuid($guid, $matches[1], true);
Logger::info('Result', ['ret' => $ret]);
$item = Post::selectFirst(['id'], ['guid' => $guid, 'uid' => $uid]);
* @param string $author The handle of the item
* @param array $contact The contact of the item owner
*
- * @return array the item record
+ * @return array|bool the item record or false on failure
* @throws \Exception
*/
- private static function parentItem($uid, $guid, $author, array $contact)
+ private static function parentItem(int $uid, string $guid, string $author, array $contact)
{
$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 (!DBA::isResult($item)) {
$person = FContact::getByURL($author);
- $result = self::storeByGuid($guid, $person["url"], $uid);
+ $result = self::storeByGuid($guid, $person['url'], false);
// We don't have an url for items that arrived at the public dispatcher
- if (!$result && !empty($contact["url"])) {
- $result = self::storeByGuid($guid, $contact["url"], $uid);
+ if (!$result && !empty($contact['url'])) {
+ $result = self::storeByGuid($guid, $contact['url'], false);
}
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;
}
}
* 'network' => network type
* @throws \Exception
*/
- private static function authorContactByUrl($def_contact, $person, $uid)
+ private static function authorContactByUrl(array $def_contact, array $person, int $uid): array
{
- $condition = ['nurl' => Strings::normaliseLink($person["url"]), 'uid' => $uid];
+ $condition = ['nurl' => Strings::normaliseLink($person['url']), 'uid' => $uid];
$contact = DBA::selectFirst('contact', ['id', 'network'], $condition);
if (DBA::isResult($contact)) {
- $cid = $contact["id"];
- $network = $contact["network"];
+ $cid = $contact['id'];
+ $network = $contact['network'];
} else {
- $cid = $def_contact["id"];
+ $cid = $def_contact['id'];
$network = Protocol::DIASPORA;
}
- return ["cid" => $cid, "network" => $network];
+ return [
+ 'cid' => $cid,
+ 'network' => $network
+ ];
}
/**
*
* @return bool is it a hubzilla server?
*/
- private static function isHubzilla($url)
+ private static function isHubzilla(string $url): bool
{
- return(strstr($url, '/channel/'));
+ return strstr($url, '/channel/');
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function plink(string $addr, string $guid, string $parent_guid = '')
+ private static function plink(string $addr, string $guid, string $parent_guid = ''): string
{
$contact = Contact::getByURL($addr);
if (empty($contact)) {
* Receives account migration
*
* @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param SimpleXMLElement $data The message object
*
* @return bool Success
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveAccountMigration(array $importer, $data)
+ private static function receiveAccountMigration(array $importer, SimpleXMLElement $data): bool
{
$old_handle = XML::unescape($data->author);
$new_handle = XML::unescape($data->profile->author);
$signature = XML::unescape($data->signature);
- $contact = self::contactByHandle($importer["uid"], $old_handle);
+ $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;
+ $signed_text = 'AccountMigration:' . $old_handle . ':' . $new_handle;
$key = self::key($old_handle);
- if (!Crypto::rsaVerify($signed_text, $signature, $key, "sha256")) {
+ if (!Crypto::rsaVerify($signed_text, $signature, $key, 'sha256')) {
Logger::notice('No valid signature for migration.');
return false;
}
// change the technical stuff in contact
$data = Probe::uri($new_handle);
if ($data['network'] == Protocol::PHANTOM) {
- Logger::notice('Account for '.$new_handle." couldn't be probed.");
+ Logger::notice("Account for " . $new_handle . " couldn't be probed.");
return false;
}
- $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']];
+ $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'],
+ ];
Contact::update($fields, ['addr' => $old_handle]);
/**
* Processes an account deletion
*
- * @param object $data The message object
+ * @param SimpleXMLElement $data The message object
*
* @return bool Success
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function receiveAccountDeletion($data)
+ private static function receiveAccountDeletion(SimpleXMLElement $data): bool
{
$author = XML::unescape($data->author);
$contacts = DBA::select('contact', ['id'], ['addr' => $author]);
while ($contact = DBA::fetch($contacts)) {
- Contact::remove($contact["id"]);
+ Contact::remove($contact['id']);
}
DBA::close($contacts);
* @param string $guid Message guid
* @param boolean $onlyfound Only return uri when found in the database
*
- * @return string The constructed uri or the one from our database
+ * @return string The constructed uri or the one from our database or empty string on if $onlyfound is true
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function getUriFromGuid($author, $guid, $onlyfound = false)
+ private static function getUriFromGuid(string $author, string $guid, bool $onlyfound = false): string
{
$item = Post::selectFirst(['uri'], ['guid' => $guid]);
if (DBA::isResult($item)) {
- return $item["uri"];
+ return $item['uri'];
} elseif (!$onlyfound) {
$person = FContact::getByURL($author);
$parts = parse_url($person['url']);
unset($parts['path']);
- $host_url = Network::unparseURL($parts);
+ $host_url = (string)Uri::fromParts($parts);
return $host_url . '/objects/' . $guid;
}
- return "";
+ return '';
}
/**
/**
* Processes an incoming comment
*
- * @param array $importer Array of the importer user
- * @param string $sender The sender of the message
- * @param object $data The message object
- * @param string $xml The original XML of the message
- * @param bool $fetched The message had been fetched and not pushed
+ * @param array $importer Array of the importer user
+ * @param string $sender The sender of the message
+ * @param SimpleXMLElement $data The message object
+ * @param string $xml The original XML of the message
+ * @param int $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
*
* @return int The message id of the generated comment or "false" if there was an error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveComment(array $importer, $sender, $data, $xml, bool $fetched)
+ private static function receiveComment(array $importer, string $sender, SimpleXMLElement $data, string $xml, int $direction): bool
{
$author = XML::unescape($data->author);
$guid = XML::unescape($data->guid);
if (isset($data->thread_parent_guid)) {
$thread_parent_guid = XML::unescape($data->thread_parent_guid);
- $thr_parent = self::getUriFromGuid("", $thread_parent_guid, true);
+ $thr_parent = self::getUriFromGuid('', $thread_parent_guid, true);
} else {
- $thr_parent = "";
+ $thr_parent = '';
}
$contact = self::allowedContactByHandle($importer, $sender, true);
GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
}
- $message_id = self::messageExists($importer["uid"], $guid);
+ $message_id = self::messageExists($importer['uid'], $guid);
if ($message_id) {
return true;
}
- $toplevel_parent_item = self::parentItem($importer["uid"], $parent_guid, $author, $contact);
+ $toplevel_parent_item = self::parentItem($importer['uid'], $parent_guid, $author, $contact);
if (!$toplevel_parent_item) {
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;
}
// Fetch the contact id - if we know this contact
- $author_contact = self::authorContactByUrl($contact, $person, $importer["uid"]);
+ $author_contact = self::authorContactByUrl($contact, $person, $importer['uid']);
$datarray = [];
- $datarray["uid"] = $importer["uid"];
- $datarray["contact-id"] = $author_contact["cid"];
- $datarray["network"] = $author_contact["network"];
+ $datarray['uid'] = $importer['uid'];
+ $datarray['contact-id'] = $author_contact['cid'];
+ $datarray['network'] = $author_contact['network'];
- $datarray["author-link"] = $person["url"];
- $datarray["author-id"] = Contact::getIdForURL($person["url"], 0);
+ $datarray['author-link'] = $person['url'];
+ $datarray['author-id'] = Contact::getIdForURL($person['url'], 0);
- $datarray["owner-link"] = $contact["url"];
- $datarray["owner-id"] = Contact::getIdForURL($contact["url"], 0);
+ $datarray['owner-link'] = $contact['url'];
+ $datarray['owner-id'] = Contact::getIdForURL($contact['url'], 0);
// Will be overwritten for sharing accounts in Item::insert
- if ($fetched) {
- $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['guid'] = $guid;
+ $datarray['uri'] = self::getUriFromGuid($author, $guid);
$datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
- $datarray["verb"] = Activity::POST;
- $datarray["gravity"] = GRAVITY_COMMENT;
+ $datarray['verb'] = Activity::POST;
+ $datarray['gravity'] = GRAVITY_COMMENT;
$datarray['thr-parent'] = $thr_parent ?: $toplevel_parent_item['uri'];
- $datarray["object-type"] = Activity\ObjectType::COMMENT;
- $datarray["post-type"] = Item::PT_NOTE;
+ $datarray['object-type'] = Activity\ObjectType::COMMENT;
+ $datarray['post-type'] = Item::PT_NOTE;
+
+ $datarray['protocol'] = Conversation::PARCEL_DIASPORA;
+ $datarray['source'] = $xml;
- $datarray["protocol"] = Conversation::PARCEL_DIASPORA;
- $datarray["source"] = $xml;
- $datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
+ $datarray = self::setDirection($datarray, $direction);
- $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
+ $datarray['changed'] = $datarray['created'] = $datarray['edited'] = $created_at;
- $datarray["plink"] = self::plink($author, $guid, $toplevel_parent_item['guid']);
+ $datarray['plink'] = self::plink($author, $guid, $toplevel_parent_item['guid']);
$body = Markdown::toBBCode($text);
- $datarray["body"] = self::replacePeopleGuid($body, $person["url"]);
+ $datarray['body'] = self::replacePeopleGuid($body, $person['url']);
self::storeMentions($datarray['uri-id'], $text);
- Tag::storeRawTagsFromBody($datarray['uri-id'], $datarray["body"]);
+ Tag::storeRawTagsFromBody($datarray['uri-id'], $datarray['body']);
self::fetchGuid($datarray);
// If we are the origin of the parent we store the original data.
// We notify our followers during the item storage.
- if ($toplevel_parent_item["origin"]) {
+ if ($toplevel_parent_item['origin']) {
$datarray['diaspora_signed_text'] = json_encode($data);
}
}
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));
}
*
* @param array $importer Array of the importer user
* @param array $contact The contact of the message
- * @param object $data The message object
+ * @param SimpleXMLElement $data The message object
* @param array $msg Array of the processed message, author handle and key
* @param object $mesg The private message
* @param array $conversation The conversation record to which this message belongs
*
* @return bool "true" if it was successful
* @throws \Exception
+ * @todo Find type-hint for $mesg and update documentation
*/
- private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation)
+ private static function receiveConversationMessage(array $importer, array $contact, SimpleXMLElement $data, array $msg, $mesg, array $conversation): bool
{
$author = XML::unescape($data->author);
$guid = XML::unescape($data->guid);
$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);
*
* @param array $importer Array of the importer user
* @param array $msg Array of the processed message, author handle and key
- * @param object $data The message object
+ * @param SimpleXMLElement $data The message object
*
* @return bool Success
* @throws \Exception
*/
- private static function receiveConversation(array $importer, $msg, $data)
+ private static function receiveConversation(array $importer, array $msg, SimpleXMLElement $data)
{
$author = XML::unescape($data->author);
$guid = XML::unescape($data->guid);
$messages = $data->message;
if (!count($messages)) {
- Logger::notice("empty conversation");
+ Logger::notice('Empty conversation');
return false;
}
- $contact = self::allowedContactByHandle($importer, $msg["author"], true);
+ $contact = self::allowedContactByHandle($importer, $msg['author'], true);
if (!$contact) {
return false;
}
GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
}
- $conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
+ $conversation = DBA::selectFirst('conv', [], ['uid' => $importer['uid'], 'guid' => $guid]);
if (!DBA::isResult($conversation)) {
$r = DBA::insert('conv', [
'uid' => $importer['uid'],
'created' => $created_at,
'updated' => DateTimeFormat::utcNow(),
'subject' => $subject,
- 'recips' => $participants]);
+ 'recips' => $participants
+ ]);
+
if ($r) {
- $conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
+ $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;
}
/**
* Processes "like" messages
*
- * @param array $importer Array of the importer user
- * @param string $sender The sender of the message
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param string $sender The sender of the message
+ * @param SimpleXMLElement $data The message object
+ * @param int $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
*
- * @return int The message id of the generated like or "false" if there was an error
+ * @return bool Success or failure
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveLike(array $importer, $sender, $data, bool $fetched)
+ private static function receiveLike(array $importer, string $sender, SimpleXMLElement $data, int $direction): bool
{
$author = XML::unescape($data->author);
$guid = XML::unescape($data->guid);
// likes on comments aren't supported by Diaspora - only on posts
// But maybe this will be supported in the future, so we will accept it.
- if (!in_array($parent_type, ["Post", "Comment"])) {
+ if (!in_array($parent_type, ['Post', 'Comment'])) {
return false;
}
GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
}
- $message_id = self::messageExists($importer["uid"], $guid);
+ $message_id = self::messageExists($importer['uid'], $guid);
if ($message_id) {
return true;
}
- $toplevel_parent_item = self::parentItem($importer["uid"], $parent_guid, $author, $contact);
+ $toplevel_parent_item = self::parentItem($importer['uid'], $parent_guid, $author, $contact);
if (!$toplevel_parent_item) {
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;
}
// Fetch the contact id - if we know this contact
- $author_contact = self::authorContactByUrl($contact, $person, $importer["uid"]);
+ $author_contact = self::authorContactByUrl($contact, $person, $importer['uid']);
// "positive" = "false" would be a Dislike - wich isn't currently supported by Diaspora
// We would accept this anyhow.
- if ($positive == "true") {
+ if ($positive == 'true') {
$verb = Activity::LIKE;
} else {
$verb = Activity::DISLIKE;
$datarray = [];
- $datarray["protocol"] = Conversation::PARCEL_DIASPORA;
- $datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
+ $datarray['protocol'] = Conversation::PARCEL_DIASPORA;
- $datarray["uid"] = $importer["uid"];
- $datarray["contact-id"] = $author_contact["cid"];
- $datarray["network"] = $author_contact["network"];
+ $datarray['uid'] = $importer['uid'];
+ $datarray['contact-id'] = $author_contact['cid'];
+ $datarray['network'] = $author_contact['network'];
- $datarray["owner-link"] = $datarray["author-link"] = $person["url"];
- $datarray["owner-id"] = $datarray["author-id"] = Contact::getIdForURL($person["url"], 0);
+ $datarray = self::setDirection($datarray, $direction);
- $datarray["guid"] = $guid;
- $datarray["uri"] = self::getUriFromGuid($author, $guid);
+ $datarray['owner-link'] = $datarray['author-link'] = $person['url'];
+ $datarray['owner-id'] = $datarray['author-id'] = Contact::getIdForURL($person['url'], 0);
- $datarray["verb"] = $verb;
- $datarray["gravity"] = GRAVITY_ACTIVITY;
+ $datarray['guid'] = $guid;
+ $datarray['uri'] = self::getUriFromGuid($author, $guid);
+
+ $datarray['verb'] = $verb;
+ $datarray['gravity'] = GRAVITY_ACTIVITY;
$datarray['thr-parent'] = $toplevel_parent_item['uri'];
- $datarray["object-type"] = Activity\ObjectType::NOTE;
+ $datarray['object-type'] = Activity\ObjectType::NOTE;
- $datarray["body"] = $verb;
+ $datarray['body'] = $verb;
// Diaspora doesn't provide a date for likes
- $datarray["changed"] = $datarray["created"] = $datarray["edited"] = DateTimeFormat::utcNow();
+ $datarray['changed'] = $datarray['created'] = $datarray['edited'] = DateTimeFormat::utcNow();
// like on comments have the comment as parent. So we need to fetch the toplevel parent
if ($toplevel_parent_item['gravity'] != GRAVITY_PARENT) {
$toplevel = Post::selectFirst(['origin'], ['id' => $toplevel_parent_item['parent']]);
- $origin = $toplevel["origin"];
+ $origin = $toplevel['origin'];
} else {
- $origin = $toplevel_parent_item["origin"];
+ $origin = $toplevel_parent_item['origin'];
}
// If we are the origin of the parent we store the original data.
}
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));
}
* Processes private messages
*
* @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param SimpleXMLElement $data The message object
*
* @return bool Success?
* @throws \Exception
*/
- private static function receiveMessage(array $importer, $data)
+ private static function receiveMessage(array $importer, SimpleXMLElement $data): bool
{
$author = XML::unescape($data->author);
$guid = XML::unescape($data->guid);
$conversation = null;
- $condition = ['uid' => $importer["uid"], 'guid' => $conversation_guid];
+ $condition = ['uid' => $importer['uid'], 'guid' => $conversation_guid];
$conversation = DBA::selectFirst('conv', [], $condition);
if (!DBA::isResult($conversation)) {
- Logger::notice("conversation not available.");
+ Logger::notice('Conversation not available.');
return false;
}
- $message_uri = $author.":".$guid;
+ $message_uri = $author . ':' . $guid;
$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
]);
}
/**
* Processes participations - unsupported by now
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param array $importer Array of the importer user
+ * @param SimpleXMLElement $data The message object
+ * @param int $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
*
* @return bool success
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveParticipation(array $importer, $data, bool $fetched)
+ private static function receiveParticipation(array $importer, SimpleXMLElement $data, int $direction): bool
{
$author = strtolower(XML::unescape($data->author));
$guid = XML::unescape($data->guid);
GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
}
- if (self::messageExists($importer["uid"], $guid)) {
+ if (self::messageExists($importer['uid'], $guid)) {
return true;
}
- $toplevel_parent_item = self::parentItem($importer["uid"], $parent_guid, $author, $contact);
+ $toplevel_parent_item = self::parentItem($importer['uid'], $parent_guid, $author, $contact);
if (!$toplevel_parent_item) {
return false;
}
$person = FContact::getByURL($author);
if (!is_array($person)) {
- Logger::notice("Person not found: ".$author);
+ Logger::notice('Person not found: ' . $author);
return false;
}
- $author_contact = self::authorContactByUrl($contact, $person, $importer["uid"]);
+ $author_contact = self::authorContactByUrl($contact, $person, $importer['uid']);
// Store participation
$datarray = [];
- $datarray["protocol"] = Conversation::PARCEL_DIASPORA;
- $datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
+ $datarray['protocol'] = Conversation::PARCEL_DIASPORA;
+
+ $datarray['uid'] = $importer['uid'];
+ $datarray['contact-id'] = $author_contact['cid'];
+ $datarray['network'] = $author_contact['network'];
- $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);
+ $datarray['owner-link'] = $datarray['author-link'] = $person['url'];
+ $datarray['owner-id'] = $datarray['author-id'] = Contact::getIdForURL($person['url'], 0);
- $datarray["guid"] = $guid;
- $datarray["uri"] = self::getUriFromGuid($author, $guid);
+ $datarray['guid'] = $guid;
+ $datarray['uri'] = self::getUriFromGuid($author, $guid);
- $datarray["verb"] = Activity::FOLLOW;
- $datarray["gravity"] = GRAVITY_ACTIVITY;
+ $datarray['verb'] = Activity::FOLLOW;
+ $datarray['gravity'] = GRAVITY_ACTIVITY;
$datarray['thr-parent'] = $toplevel_parent_item['uri'];
- $datarray["object-type"] = Activity\ObjectType::NOTE;
+ $datarray['object-type'] = Activity\ObjectType::NOTE;
- $datarray["body"] = Activity::FOLLOW;
+ $datarray['body'] = Activity::FOLLOW;
// Diaspora doesn't provide a date for a participation
- $datarray["changed"] = $datarray["created"] = $datarray["edited"] = DateTimeFormat::utcNow();
+ $datarray['changed'] = $datarray['created'] = $datarray['edited'] = DateTimeFormat::utcNow();
if (Item::isTooOld($datarray)) {
Logger::info('Participation is too old', ['created' => $datarray['created'], 'uid' => $datarray['uid'], 'guid' => $datarray['guid']]);
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;
}
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"])) {
+ Logger::info('Deliver participation', ['item' => $comment['id'], 'contact' => $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);
}
}
* Processes photos - unneeded
*
* @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param SimpleXMLElement $data The message object
*
* @return bool always true
*/
* Processes incoming profile updates
*
* @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param SimpleXMLElement $data The message object
*
* @return bool Success
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveProfile(array $importer, $data)
+ private static function receiveProfile(array $importer, SimpleXMLElement $data): bool
{
$author = strtolower(XML::unescape($data->author));
- $contact = self::contactByHandle($importer["uid"], $author);
+ $contact = self::contactByHandle($importer['uid'], $author);
if (!$contact) {
return false;
}
- $name = XML::unescape($data->first_name).((strlen($data->last_name)) ? " ".XML::unescape($data->last_name) : "");
+ $name = XML::unescape($data->first_name).((strlen($data->last_name)) ? ' ' . XML::unescape($data->last_name) : '');
$image_url = XML::unescape($data->image_url);
$birthday = XML::unescape($data->birthday);
$about = Markdown::toBBCode(XML::unescape($data->bio));
$location = Markdown::toBBCode(XML::unescape($data->location));
- $searchable = (XML::unescape($data->searchable) == "true");
- $nsfw = (XML::unescape($data->nsfw) == "true");
+ $searchable = (XML::unescape($data->searchable) == 'true');
+ $nsfw = (XML::unescape($data->nsfw) == 'true');
$tags = XML::unescape($data->tag_string);
- $tags = explode("#", $tags);
+ $tags = explode('#', $tags);
$keywords = [];
foreach ($tags as $tag) {
$tag = trim(strtolower($tag));
- if ($tag != "") {
+ if ($tag != '') {
$keywords[] = $tag;
}
}
- $keywords = implode(", ", $keywords);
+ $keywords = implode(', ', $keywords);
- $handle_parts = explode("@", $author);
+ $handle_parts = explode('@', $author);
$nick = $handle_parts[0];
- if ($name === "") {
+ if ($name === '') {
$name = $handle_parts[0];
}
- if (preg_match("|^https?://|", $image_url) === 0) {
- $image_url = "http://".$handle_parts[1].$image_url;
+ if (preg_match('|^https?://|', $image_url) === 0) {
+ // @TODO No HTTPS here?
+ $image_url = 'http://' . $handle_parts[1] . $image_url;
}
- Contact::updateAvatar($contact["id"], $image_url);
+ Contact::updateAvatar($contact['id'], $image_url);
// Generic birthday. We don't know the timezone. The year is irrelevant.
- $birthday = str_replace("1000", "1901", $birthday);
+ $birthday = str_replace('1000', '1901', $birthday);
- if ($birthday != "") {
- $birthday = DateTimeFormat::utc($birthday, "Y-m-d");
+ if ($birthday != '') {
+ $birthday = DateTimeFormat::utc($birthday, 'Y-m-d');
}
// this is to prevent multiple birthday notifications in a single year
// if we already have a stored birthday and the 'm-d' part hasn't changed, preserve the entry, which will preserve the notify year
- if (substr($birthday, 5) === substr($contact["bd"], 5)) {
- $birthday = $contact["bd"];
+ if (substr($birthday, 5) === substr($contact['bd'], 5)) {
+ $birthday = $contact['bd'];
}
$fields = ['name' => $name, 'location' => $location,
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;
}
*/
private static function receiveRequestMakeFriend(array $importer, array $contact)
{
- if ($contact["rel"] == Contact::SHARING) {
- DBA::update(
- 'contact',
+ if ($contact['rel'] == Contact::SHARING) {
+ Contact::update(
['rel' => Contact::FRIEND, 'writable' => true],
- ['id' => $contact["id"], 'uid' => $importer["uid"]]
+ ['id' => $contact['id'], 'uid' => $importer['uid']]
);
}
}
* Processes incoming sharing notification
*
* @param array $importer Array of the importer user
- * @param object $data The message object
+ * @param SimpleXMLElement $data The message object
*
* @return bool Success
* @throws \Exception
*/
- private static function receiveContactRequest(array $importer, $data)
+ private static function receiveContactRequest(array $importer, SimpleXMLElement $data): bool
{
$author = XML::unescape($data->author);
$recipient = XML::unescape($data->recipient);
// the current protocol version doesn't know these fields
// That means that we will assume their existance
if (isset($data->following)) {
- $following = (XML::unescape($data->following) == "true");
+ $following = (XML::unescape($data->following) == 'true');
} else {
$following = true;
}
if (isset($data->sharing)) {
- $sharing = (XML::unescape($data->sharing) == "true");
+ $sharing = (XML::unescape($data->sharing) == 'true');
} else {
$sharing = true;
}
- $contact = self::contactByHandle($importer["uid"], $author);
+ $contact = self::contactByHandle($importer['uid'], $author);
// perhaps we were already sharing with this person. Now they're sharing with us.
// 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
- $contact = self::contactByHandle($importer["uid"], $author);
+ $contact = self::contactByHandle($importer['uid'], $author);
// If we are now friends, we are sending a share message.
// Normally we needn't to do so, but the first message could have been vanished.
- if (in_array($contact["rel"], [Contact::FRIEND])) {
- $user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]);
+ 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);
}
}
return true;
} else {
- Logger::info("Author ".$author." doesn't want to follow us anymore.");
+ Logger::info("Author " . $author . " doesn't want to follow us anymore.");
Contact::removeFollower($contact);
return true;
}
}
- if (!$following && $sharing && in_array($importer["page-flags"], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_NORMAL])) {
- Logger::info("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.");
+ if (!$following && $sharing && in_array($importer['page-flags'], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_NORMAL])) {
+ Logger::info("Author " . $author . " wants to share with us - but doesn't want to listen. Request is ignored.");
return false;
} elseif (!$following && !$sharing) {
- Logger::info("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.");
+ Logger::info("Author " . $author . " doesn't want anything - and we don't know the author. Request is ignored.");
return false;
} elseif (!$following && $sharing) {
- Logger::info("Author ".$author." wants to share with us.");
+ Logger::info("Author " . $author . " wants to share with us.");
} elseif ($following && $sharing) {
- Logger::info("Author ".$author." wants to have a bidirectional conection.");
+ Logger::info("Author " . $author . " wants to have a bidirectional conection.");
} elseif ($following && !$sharing) {
- Logger::info("Author ".$author." wants to listen to us.");
+ Logger::info("Author " . $author . " wants to listen to us.");
}
$ret = FContact::getByURL($author);
- if (!$ret || ($ret["network"] != Protocol::DIASPORA)) {
- Logger::notice("Cannot resolve diaspora handle ".$author." for ".$recipient);
+ if (!$ret || ($ret['network'] != Protocol::DIASPORA)) {
+ Logger::notice("Cannot resolve diaspora handle " . $author . " for ".$recipient);
return false;
}
$contact_record = self::contactByHandle($importer['uid'], $author);
if (!$contact_record) {
Logger::info('unable to locate newly created contact record.');
- return;
+ return false;
}
$user = DBA::selectFirst('user', [], ['uid' => $importer['uid']]);
return true;
}
- /**
- * Fetches a message with a given guid
- *
- * @param string $guid message guid
- * @param string $orig_author handle of the original post
- * @return array The fetched item
- * @throws \Friendica\Network\HTTPException\InternalServerErrorException
- * @throws \ImagickException
- */
- public static function originalItem($guid, $orig_author)
- {
- if (empty($guid)) {
- Logger::notice('Empty guid. Quitting.');
- return false;
- }
-
- // Do we already have this item?
- $fields = ['body', 'title', 'app', 'created', 'object-type', 'uri', 'guid',
- 'author-name', 'author-link', 'author-avatar', 'plink', 'uri-id'];
- $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
- $item = Post::selectFirst($fields, $condition);
-
- if (DBA::isResult($item)) {
- Logger::notice("reshared message ".$guid." already exists on system.");
-
- // Maybe it is already a reshared item?
- // Then refetch the content, if it is a reshare from a reshare.
- // If it is a reshared post from another network then reformat to avoid display problems with two share elements
- if (self::isReshare($item["body"], true)) {
- $item = [];
- } elseif (self::isReshare($item["body"], false) || strstr($item["body"], "[share")) {
- $item["body"] = Markdown::toBBCode(BBCode::toMarkdown($item["body"]));
-
- $item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
-
- return $item;
- } else {
- return $item;
- }
- }
-
- if (!DBA::isResult($item)) {
- if (empty($orig_author)) {
- Logger::notice('Empty author for guid ' . $guid . '. Quitting.');
- return false;
- }
-
- $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);
- $stored = self::storeByGuid($guid, $server);
-
- 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);
- $stored = self::storeByGuid($guid, $server);
- }
-
- if ($stored) {
- $fields = ['body', 'title', 'app', 'created', 'object-type', 'uri', 'guid',
- 'author-name', 'author-link', 'author-avatar', 'plink', 'uri-id'];
- $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => [Item::PUBLIC, Item::UNLISTED]];
- $item = Post::selectFirst($fields, $condition);
-
- if (DBA::isResult($item)) {
- // If it is a reshared post from another network then reformat to avoid display problems with two share elements
- if (self::isReshare($item["body"], false)) {
- $item["body"] = Markdown::toBBCode(BBCode::toMarkdown($item["body"]));
- $item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
- }
-
- return $item;
- }
- }
- }
- return false;
- }
-
/**
* Stores a reshare activity
*
* @param string $guid GUID string of reshare action
* @param string $author Author handle
*/
- private static function addReshareActivity($item, $parent_message_id, $guid, $author)
+ private static function addReshareActivity(array $item, int $parent_message_id, string $guid, string $author)
{
$parent = Post::selectFirst(['uri', 'guid'], ['id' => $parent_message_id]);
$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'];
/**
* Processes a reshare message
*
- * @param array $importer Array of the importer user
- * @param object $data The message object
- * @param string $xml The original XML of the message
+ * @param array $importer Array of the importer user
+ * @param SimpleXMLElement $data The message object
+ * @param string $xml The original XML of the message
+ * @param int $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
*
- * @return int the message id
+ * @return bool Success or failure
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveReshare(array $importer, $data, $xml, bool $fetched)
+ private static function receiveReshare(array $importer, SimpleXMLElement $data, string $xml, int $direction): bool
{
$author = XML::unescape($data->author);
$guid = XML::unescape($data->guid);
GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
}
- $message_id = self::messageExists($importer["uid"], $guid);
+ $message_id = self::messageExists($importer['uid'], $guid);
if ($message_id) {
return true;
}
- $original_item = self::originalItem($root_guid, $root_author);
- if (!$original_item) {
+ $original_person = FContact::getByURL($root_author);
+ if (!$original_person) {
return false;
}
- if (empty($original_item['plink'])) {
- $original_item['plink'] = self::plink($root_author, $root_guid);
- }
-
$datarray = [];
- $datarray["uid"] = $importer["uid"];
- $datarray["contact-id"] = $contact["id"];
- $datarray["network"] = Protocol::DIASPORA;
+ $datarray['uid'] = $importer['uid'];
+ $datarray['contact-id'] = $contact['id'];
+ $datarray['network'] = Protocol::DIASPORA;
- $datarray["author-link"] = $contact["url"];
- $datarray["author-id"] = Contact::getIdForURL($contact["url"], 0);
+ $datarray['author-link'] = $contact['url'];
+ $datarray['author-id'] = Contact::getIdForURL($contact['url'], 0);
- $datarray["owner-link"] = $datarray["author-link"];
- $datarray["owner-id"] = $datarray["author-id"];
+ $datarray['owner-link'] = $datarray['author-link'];
+ $datarray['owner-id'] = $datarray['author-id'];
- $datarray["guid"] = $guid;
- $datarray["uri"] = $datarray["thr-parent"] = self::getUriFromGuid($author, $guid);
+ $datarray['guid'] = $guid;
+ $datarray['uri'] = $datarray['thr-parent'] = self::getUriFromGuid($author, $guid);
$datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
- $datarray["verb"] = Activity::POST;
- $datarray["gravity"] = GRAVITY_PARENT;
+ $datarray['verb'] = Activity::POST;
+ $datarray['gravity'] = GRAVITY_PARENT;
- $datarray["protocol"] = Conversation::PARCEL_DIASPORA;
- $datarray["source"] = $xml;
- $datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
+ $datarray['protocol'] = Conversation::PARCEL_DIASPORA;
+ $datarray['source'] = $xml;
- /// @todo Copy tag data from original post
+ $datarray = self::setDirection($datarray, $direction);
- $prefix = BBCode::getShareOpeningTag(
- $original_item["author-name"],
- $original_item["author-link"],
- $original_item["author-avatar"],
- $original_item["plink"],
- $original_item["created"],
- $original_item["guid"]
- );
-
- if (!empty($original_item['title'])) {
- $prefix .= '[h3]' . $original_item['title'] . "[/h3]\n";
- }
-
- $datarray["body"] = $prefix.$original_item["body"]."[/share]";
-
- Tag::storeFromBody($datarray['uri-id'], $datarray["body"]);
-
- $datarray["app"] = $original_item["app"];
+ $datarray['body'] = DI::contentItem()->createSharedPostByGuid($root_guid, $importer['uid'], $original_person['url']);
- $datarray["plink"] = self::plink($author, $guid);
- $datarray["private"] = (($public == "false") ? Item::PRIVATE : Item::PUBLIC);
- $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
+ /// @todo Copy tag data from original post
+ Tag::storeFromBody($datarray['uri-id'], $datarray['body']);
- $datarray["object-type"] = $original_item["object-type"];
+ $datarray['plink'] = self::plink($author, $guid);
+ $datarray['private'] = (($public == 'false') ? Item::PRIVATE : Item::PUBLIC);
+ $datarray['changed'] = $datarray['created'] = $datarray['edited'] = $created_at;
self::fetchGuid($datarray);
self::sendParticipation($contact, $datarray);
- $root_message_id = self::messageExists($importer["uid"], $root_guid);
+ $root_message_id = self::messageExists($importer['uid'], $root_guid);
if ($root_message_id) {
self::addReshareActivity($datarray, $root_message_id, $guid, $author);
}
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);
}
*
* @param array $importer Array of the importer user
* @param array $contact The contact of the item owner
- * @param object $data The message object
+ * @param SimpleXMLElement $data The message object
*
* @return bool success
* @throws \Exception
*/
- private static function itemRetraction(array $importer, array $contact, $data)
+ private static function itemRetraction(array $importer, array $contact, SimpleXMLElement $data): bool
{
$author = XML::unescape($data->author);
$target_guid = XML::unescape($data->target_guid);
$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;
}
- if (empty($contact["url"])) {
- $contact["url"] = $person["url"];
+ if (empty($contact['url'])) {
+ $contact['url'] = $person['url'];
}
// Fetch items that are about to be deleted
$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;
}
$parent = Post::selectFirst(['author-link'], ['id' => $item['parent']]);
// Only delete it if the parent author really fits
- if (!Strings::compareLink($parent["author-link"], $contact["url"]) && !Strings::compareLink($item["author-link"], $contact["url"])) {
- Logger::info("Thread author ".$parent["author-link"]." and item author ".$item["author-link"]." don't fit to expected contact ".$contact["url"]);
+ if (!Strings::compareLink($parent['author-link'], $contact['url']) && !Strings::compareLink($item['author-link'], $contact['url'])) {
+ Logger::info("Thread author " . $parent['author-link'] . " and item author " . $item['author-link'] . " don't fit to expected contact " . $contact['url']);
continue;
}
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);
*
* @param array $importer Array of the importer user
* @param string $sender The sender of the message
- * @param object $data The message object
+ * @param SimpleXMLElement $data The message object
*
* @return bool Success
* @throws \Exception
*/
- private static function receiveRetraction(array $importer, $sender, $data)
+ private static function receiveRetraction(array $importer, string $sender, SimpleXMLElement $data)
{
$target_type = XML::unescape($data->target_type);
- $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"]);
+ $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']);
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":
- case "Like":
- case "Post":
- case "Reshare":
- case "StatusMessage":
+ case 'Comment':
+ case 'Like':
+ case 'Post':
+ case 'Reshare':
+ case 'StatusMessage':
return self::itemRetraction($importer, $contact, $data);
- case "PollParticipation":
- case "Photo":
+ case 'PollParticipation':
+ case 'Photo':
// Currently unsupported
break;
default:
- Logger::notice("Unknown target type ".$target_type);
+ Logger::notice('Unknown target type ' . $target_type);
return false;
}
return true;
/**
* Checks if an incoming message is wanted
*
- * @param string $url
- * @param integer $uriid
+ * @param array $item
* @param string $author
* @param string $body
+ * @param int $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
+ *
* @return boolean Is the message wanted?
*/
- private static function isSolicitedMessage(string $url, int $uriid, string $author, string $body)
+ private static function isSolicitedMessage(array $item, string $author, string $body, int $direction): bool
{
$contact = Contact::getByURL($author);
- if (DBA::exists('contact', ["`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)",
- $contact['nurl'], 0, Contact::FRIEND, Contact::SHARING])) {
- Logger::info('Author has got followers - accepted', ['url' => $url, 'author' => $author]);
+ if (DBA::exists('contact', ['`nurl` = ? AND `uid` != ? AND `rel` IN (?, ?)', $contact['nurl'], 0, Contact::FRIEND, Contact::SHARING])) {
+ Logger::debug('Author has got followers - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $author]);
+ return true;
+ }
+
+ if ($direction == self::FORCED_FETCH) {
+ Logger::debug('Post is a forced fetch - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $author]);
return true;
}
- $taglist = Tag::getByURIId($uriid, [Tag::HASHTAG]);
- $tags = array_column($taglist, 'name');
- return Relay::isSolicitedPost($tags, $body, $contact['id'], $url, Protocol::DIASPORA);
+ $tags = array_column(Tag::getByURIId($item['uri-id'], [Tag::HASHTAG]), 'name');
+ if (Relay::isSolicitedPost($tags, $body, $contact['id'], $item['uri'], Protocol::DIASPORA)) {
+ Logger::debug('Post is accepted because of the relay settings', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri'], 'author' => $author]);
+ return true;
+ } else {
+ return false;
+ }
}
/**
*/
private static function storePhotoAsMedia(int $uriid, $photo)
{
+ // @TODO Need to find object type, roland@f.haeder.net
+ Logger::debug('photo='.get_class($photo));
$data = [];
$data['uri-id'] = $uriid;
$data['type'] = Post\Media::IMAGE;
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
*
- * @param array $importer Array of the importer user
- * @param SimpleXMLElement $data The message object
- * @param string $xml The original XML of the message
- * @param bool $fetched The message had been fetched and not pushed
- * @return int The message id of the newly created item
+ * @param array $importer Array of the importer user
+ * @param SimpleXMLElement $data The message object
+ * @param string $xml The original XML of the message
+ * @param int $direction Indicates if the message had been fetched or pushed (self::PUSHED, self::FETCHED, self::FORCED_FETCH)
+ *
+ * @return int|bool The message id of the newly created item or false on error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml, bool $fetched)
+ private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, string $xml, int $direction)
{
$author = XML::unescape($data->author);
$guid = XML::unescape($data->guid);
GServer::setProtocol($contact['gsid'], Post\DeliveryData::DIASPORA);
}
- $message_id = self::messageExists($importer["uid"], $guid);
+ $message_id = self::messageExists($importer['uid'], $guid);
if ($message_id) {
return true;
}
$datarray = [];
- $datarray["guid"] = $guid;
- $datarray["uri"] = $datarray["thr-parent"] = self::getUriFromGuid($author, $guid);
+ $datarray['guid'] = $guid;
+ $datarray['uri'] = $datarray['thr-parent'] = self::getUriFromGuid($author, $guid);
$datarray['uri-id'] = ItemURI::insert(['uri' => $datarray['uri'], 'guid' => $datarray['guid']]);
// Attach embedded pictures to the body
self::storePhotoAsMedia($datarray['uri-id'], $photo);
}
- $datarray["object-type"] = Activity\ObjectType::IMAGE;
- $datarray["post-type"] = Item::PT_IMAGE;
+ $datarray['object-type'] = Activity\ObjectType::IMAGE;
+ $datarray['post-type'] = Item::PT_IMAGE;
} elseif ($data->poll) {
- $datarray["object-type"] = Activity\ObjectType::NOTE;
- $datarray["post-type"] = Item::PT_POLL;
+ $datarray['object-type'] = Activity\ObjectType::NOTE;
+ $datarray['post-type'] = Item::PT_POLL;
} else {
- $datarray["object-type"] = Activity\ObjectType::NOTE;
- $datarray["post-type"] = Item::PT_NOTE;
+ $datarray['object-type'] = Activity\ObjectType::NOTE;
+ $datarray['post-type'] = Item::PT_NOTE;
}
/// @todo enable support for polls
/// @todo enable support for events
- $datarray["uid"] = $importer["uid"];
- $datarray["contact-id"] = $contact["id"];
- $datarray["network"] = Protocol::DIASPORA;
+ $datarray['uid'] = $importer['uid'];
+ $datarray['contact-id'] = $contact['id'];
+ $datarray['network'] = Protocol::DIASPORA;
- $datarray["author-link"] = $contact["url"];
- $datarray["author-id"] = Contact::getIdForURL($contact["url"], 0);
+ $datarray['author-link'] = $contact['url'];
+ $datarray['author-id'] = Contact::getIdForURL($contact['url'], 0);
- $datarray["owner-link"] = $datarray["author-link"];
- $datarray["owner-id"] = $datarray["author-id"];
+ $datarray['owner-link'] = $datarray['author-link'];
+ $datarray['owner-id'] = $datarray['author-id'];
- $datarray["verb"] = Activity::POST;
- $datarray["gravity"] = GRAVITY_PARENT;
+ $datarray['verb'] = Activity::POST;
+ $datarray['gravity'] = GRAVITY_PARENT;
- $datarray["protocol"] = Conversation::PARCEL_DIASPORA;
- $datarray["source"] = $xml;
- $datarray["direction"] = $fetched ? Conversation::PULL : Conversation::PUSH;
+ $datarray['protocol'] = Conversation::PARCEL_DIASPORA;
+ $datarray['source'] = $xml;
- if ($fetched) {
- $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"]);
+ $datarray['body'] = self::replacePeopleGuid($body, $contact['url']);
+ $datarray['raw-body'] = self::replacePeopleGuid($raw_body, $contact['url']);
self::storeMentions($datarray['uri-id'], $text);
- Tag::storeRawTagsFromBody($datarray['uri-id'], $datarray["body"]);
+ Tag::storeRawTagsFromBody($datarray['uri-id'], $datarray['body']);
- if (!$fetched && !self::isSolicitedMessage($datarray["uri"], $datarray['uri-id'], $author, $body)) {
+ if (!self::isSolicitedMessage($datarray, $author, $body, $direction)) {
DBA::delete('item-uri', ['uri' => $datarray['uri']]);
return false;
}
- if ($provider_display_name != "") {
- $datarray["app"] = $provider_display_name;
+ if ($provider_display_name != '') {
+ $datarray['app'] = $provider_display_name;
}
- $datarray["plink"] = self::plink($author, $guid);
- $datarray["private"] = (($public == "false") ? Item::PRIVATE : Item::PUBLIC);
- $datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
+ $datarray['plink'] = self::plink($author, $guid);
+ $datarray['private'] = (($public == 'false') ? Item::PRIVATE : Item::PUBLIC);
+ $datarray['changed'] = $datarray['created'] = $datarray['edited'] = $created_at;
- if (isset($address["address"])) {
- $datarray["location"] = $address["address"];
+ if (isset($address['address'])) {
+ $datarray['location'] = $address['address'];
}
- if (isset($address["lat"]) && isset($address["lng"])) {
- $datarray["coord"] = $address["lat"]." ".$address["lng"];
+ if (isset($address['lat']) && isset($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);
}
* @return string the handle in the format user@domain.tld
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function myHandle(array $contact)
+ private static function myHandle(array $contact): string
{
- if (!empty($contact["addr"])) {
- return $contact["addr"];
+ if (!empty($contact['addr'])) {
+ return $contact['addr'];
}
// Normally we should have a filled "addr" field - but in the past this wasn't the case
// So - just in case - we build the the address here.
- if ($contact["nickname"] != "") {
- $nick = $contact["nickname"];
+ if ($contact['nickname'] != '') {
+ $nick = $contact['nickname'];
} else {
- $nick = $contact["nick"];
+ $nick = $contact['nick'];
}
- return $nick . "@" . substr(DI::baseUrl(), strpos(DI::baseUrl(), "://") + 3);
+ return $nick . '@' . substr(DI::baseUrl(), strpos(DI::baseUrl(), '://') + 3);
}
* @return string The encrypted data
* @throws \Exception
*/
- public static function encodePrivateData($msg, array $user, array $contact, $prvkey, $pubkey)
+ 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;
}
$ciphertext = self::aesEncrypt($aes_key, $iv, $msg);
- $json = json_encode(["iv" => $b_iv, "key" => $b_aes_key]);
+ $json = json_encode(['iv' => $b_iv, 'key' => $b_aes_key]);
- $encrypted_key_bundle = "";
+ $encrypted_key_bundle = '';
if (!@openssl_public_encrypt($json, $encrypted_key_bundle, $pubkey)) {
return false;
}
$json_object = json_encode(
- ["aes_key" => base64_encode($encrypted_key_bundle),
- "encrypted_magic_envelope" => base64_encode($ciphertext)]
+ [
+ 'aes_key' => base64_encode($encrypted_key_bundle),
+ 'encrypted_magic_envelope' => base64_encode($ciphertext)
+ ]
);
return $json_object;
* @return string The envelope
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- public static function buildMagicEnvelope($msg, array $user)
+ public static function buildMagicEnvelope(string $msg, array $user): string
{
$b64url_data = Strings::base64UrlEncode($msg);
- $data = str_replace(["\n", "\r", " ", "\t"], ["", "", "", ""], $b64url_data);
+ $data = str_replace(["\n", "\r", " ", "\t"], ['', '', '', ''], $b64url_data);
$key_id = Strings::base64UrlEncode(self::myHandle($user));
- $type = "application/xml";
- $encoding = "base64url";
- $alg = "RSA-SHA256";
- $signable_data = $data.".".Strings::base64UrlEncode($type).".".Strings::base64UrlEncode($encoding).".".Strings::base64UrlEncode($alg);
+ $type = 'application/xml';
+ $encoding = 'base64url';
+ $alg = 'RSA-SHA256';
+ $signable_data = $data . '.' . Strings::base64UrlEncode($type) . '.' . Strings::base64UrlEncode($encoding) . '.' . Strings::base64UrlEncode($alg);
// Fallback if the private key wasn't transmitted in the expected field
- if ($user['uprvkey'] == "") {
+ if ($user['uprvkey'] == '') {
$user['uprvkey'] = $user['prvkey'];
}
- $signature = Crypto::rsaSign($signable_data, $user["uprvkey"]);
+ $signature = Crypto::rsaSign($signable_data, $user['uprvkey']);
$sig = Strings::base64UrlEncode($signature);
- $xmldata = ["me:env" => ["me:data" => $data,
- "@attributes" => ["type" => $type],
- "me:encoding" => $encoding,
- "me:alg" => $alg,
- "me:sig" => $sig,
- "@attributes2" => ["key_id" => $key_id]]];
+ $xmldata = [
+ 'me:env' => [
+ 'me:data' => $data,
+ '@attributes' => ['type' => $type],
+ 'me:encoding' => $encoding,
+ 'me:alg' => $alg,
+ 'me:sig' => $sig,
+ '@attributes2' => ['key_id' => $key_id]
+ ]
+ ];
- $namespaces = ["me" => "http://salmon-protocol.org/ns/magic-env"];
+ $namespaces = ['me' => ActivityNamespace::SALMON_ME];
return XML::fromArray($xmldata, $xml, false, $namespaces);
}
* @return string The message that will be transmitted to other servers
* @throws \Exception
*/
- public static function buildMessage($msg, array $user, array $contact, $prvkey, $pubkey, $public = false)
+ public static function buildMessage(string $msg, array $user, array $contact, string $prvkey, string $pubkey, bool $public = false): string
{
// The message is put into an envelope with the sender's signature
$envelope = self::buildMagicEnvelope($msg, $user);
*
* @return string The signature
*/
- private static function signature($owner, $message)
+ private static function signature(array $owner, array $message): string
{
$sigmsg = $message;
- unset($sigmsg["author_signature"]);
- unset($sigmsg["parent_author_signature"]);
+ unset($sigmsg['author_signature']);
+ unset($sigmsg['parent_author_signature']);
- $signed_text = implode(";", $sigmsg);
+ $signed_text = implode(';', $sigmsg);
- return base64_encode(Crypto::rsaSign($signed_text, $owner["uprvkey"], "sha256"));
+ return base64_encode(Crypto::rsaSign($signed_text, $owner['uprvkey'], 'sha256'));
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function transmit(array $owner, array $contact, $envelope, $public_batch, $guid = "")
+ private static function transmit(array $owner, array $contact, string $envelope, bool $public_batch, string $guid = ''): int
{
- $enabled = intval(DI::config()->get("system", "diaspora_enabled"));
+ $enabled = intval(DI::config()->get('system', 'diaspora_enabled'));
if (!$enabled) {
return 200;
}
if (!empty($contact['addr'])) {
$fcontact = FContact::getByURL($contact['addr']);
if (!empty($fcontact)) {
- $dest_url = ($public_batch ? $fcontact["batch"] : $fcontact["notify"]);
+ $dest_url = ($public_batch ? $fcontact['batch'] : $fcontact['notify']);
}
}
if (empty($dest_url)) {
- $dest_url = ($public_batch ? $contact["batch"] : $contact["notify"]);
+ $dest_url = ($public_batch ? $contact['batch'] : $contact['notify']);
}
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");
+ if (!intval(DI::config()->get('system', 'diaspora_test'))) {
+ $content_type = (($public_batch) ? 'application/magic-envelope+xml' : 'application/json');
- $postResult = DI::httpClient()->post($dest_url . "/", $envelope, ['Content-Type' => $content_type]);
+ $postResult = DI::httpClient()->post($dest_url . '/', $envelope, ['Content-Type' => $content_type]);
$return_code = $postResult->getReturnCode();
} else {
- Logger::notice("test_mode");
+ Logger::notice('test_mode');
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;
}
*
* @return string The post XML
*/
- public static function buildPostXml($type, $message)
+ public static function buildPostXml(string $type, array $message): string
{
$data = [$type => $message];
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "")
+ private static function buildAndTransmit(array $owner, array $contact, string $type, array $message, bool $public_batch = false, string $guid = '')
{
$msg = self::buildPostXml($type, $message);
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);
* @return int The result of the transmission
* @throws \Exception
*/
- private static function sendParticipation(array $contact, array $item)
+ private static function sendParticipation(array $contact, array $item): int
{
// Don't send notifications for private postings
if ($item['private'] == Item::PRIVATE) {
- return;
+ return 0;
}
- $cachekey = "diaspora:sendParticipation:".$item['guid'];
+ $cachekey = 'diaspora:sendParticipation:' . $item['guid'];
$result = DI::cache()->get($cachekey);
if (!is_null($result)) {
- return;
+ return -1;
}
// Fetch some user id to have a valid handle to transmit the participation.
$author = self::myHandle($owner);
- $message = ["author" => $author,
- "guid" => System::createUUID(),
- "parent_type" => "Post",
- "parent_guid" => $item["guid"]];
+ $message = [
+ 'author' => $author,
+ 'guid' => System::createUUID(),
+ 'parent_type' => 'Post',
+ '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);
+ DI::cache()->set($cachekey, $item['guid'], Duration::QUARTER_HOUR);
- return self::buildAndTransmit($owner, $contact, "participation", $message);
+ return self::buildAndTransmit($owner, $contact, 'participation', $message);
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function sendAccountMigration(array $owner, array $contact, $uid)
+ public static function sendAccountMigration(array $owner, array $contact, int $uid): int
{
$old_handle = DI::pConfig()->get($uid, 'system', 'previous_addr');
$profile = self::createProfileData($uid);
$signed_text = 'AccountMigration:'.$old_handle.':'.$profile['author'];
- $signature = base64_encode(Crypto::rsaSign($signed_text, $owner["uprvkey"], "sha256"));
+ $signature = base64_encode(Crypto::rsaSign($signed_text, $owner['uprvkey'], 'sha256'));
- $message = ["author" => $old_handle,
- "profile" => $profile,
- "signature" => $signature];
+ $message = [
+ 'author' => $old_handle,
+ 'profile' => $profile,
+ 'signature' => $signature
+ ];
Logger::info('Send account migration', ['msg' => $message]);
- return self::buildAndTransmit($owner, $contact, "account_migration", $message);
+ return self::buildAndTransmit($owner, $contact, 'account_migration', $message);
}
/**
* @return int The result of the transmission
* @throws \Exception
*/
- public static function sendShare(array $owner, array $contact)
+ public static function sendShare(array $owner, array $contact): int
{
/**
* @todo support the different possible combinations of "following" and "sharing"
}
*/
- $message = ["author" => self::myHandle($owner),
- "recipient" => $contact["addr"],
- "following" => "true",
- "sharing" => "true"];
+ $message = [
+ 'author' => self::myHandle($owner),
+ 'recipient' => $contact['addr'],
+ 'following' => 'true',
+ 'sharing' => 'true'
+ ];
Logger::info('Send share', ['msg' => $message]);
- return self::buildAndTransmit($owner, $contact, "contact", $message);
+ return self::buildAndTransmit($owner, $contact, 'contact', $message);
}
/**
* @return int The result of the transmission
* @throws \Exception
*/
- public static function sendUnshare(array $owner, array $contact)
+ public static function sendUnshare(array $owner, array $contact): int
{
- $message = ["author" => self::myHandle($owner),
- "recipient" => $contact["addr"],
- "following" => "false",
- "sharing" => "false"];
+ $message = [
+ 'author' => self::myHandle($owner),
+ 'recipient' => $contact['addr'],
+ 'following' => 'false',
+ 'sharing' => 'false'
+ ];
Logger::info('Send unshare', ['msg' => $message]);
- return self::buildAndTransmit($owner, $contact, "contact", $message);
+ return self::buildAndTransmit($owner, $contact, 'contact', $message);
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function isReshare($body, $complete = true)
+ public static function isReshare(string $body, bool $complete = true)
{
$body = trim($body);
$item = Post::selectFirst(['contact-id'], $condition);
if (DBA::isResult($item)) {
$ret = [];
- $ret["root_handle"] = self::handleFromContact($item["contact-id"]);
- $ret["root_guid"] = $reshared['guid'];
+ $ret['root_handle'] = self::handleFromContact($item['contact-id']);
+ $ret['root_guid'] = $reshared['guid'];
return $ret;
} elseif ($complete) {
// We are resharing something that isn't a DFRN or Diaspora post.
* @return array with event data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function buildEvent($event_id)
+ private static function buildEvent(string $event_id): array
{
$event = DBA::selectFirst('event', [], ['id' => $event_id]);
if (!DBA::isResult($event)) {
$mask = DateTimeFormat::ATOM;
/// @todo - establish "all day" events in Friendica
- $eventdata["all_day"] = "false";
+ $eventdata['all_day'] = 'false';
$eventdata['timezone'] = 'UTC';
$coord = Map::getCoordinates($event['location']);
$location = [];
- $location["address"] = html_entity_decode(BBCode::toMarkdown($event['location']));
+ $location['address'] = html_entity_decode(BBCode::toMarkdown($event['location']));
if (!empty($coord['lat']) && !empty($coord['lon'])) {
- $location["lat"] = $coord['lat'];
- $location["lng"] = $coord['lon'];
+ $location['lat'] = $coord['lat'];
+ $location['lng'] = $coord['lon'];
} else {
- $location["lat"] = 0;
- $location["lng"] = 0;
+ $location['lat'] = 0;
+ $location['lng'] = 0;
}
$eventdata['location'] = $location;
}
*/
public static function buildStatus(array $item, array $owner)
{
- $cachekey = "diaspora:buildStatus:".$item['guid'];
+ $cachekey = 'diaspora:buildStatus:' . $item['guid'];
$result = DI::cache()->get($cachekey);
if (!is_null($result)) {
$myaddr = self::myHandle($owner);
- $public = ($item["private"] == Item::PRIVATE ? "false" : "true");
+ $public = ($item['private'] == Item::PRIVATE ? 'false' : 'true');
$created = DateTimeFormat::utc($item['received'], DateTimeFormat::ATOM);
- $edited = DateTimeFormat::utc($item["edited"] ?? $item["created"], DateTimeFormat::ATOM);
+ $edited = DateTimeFormat::utc($item['edited'] ?? $item['created'], DateTimeFormat::ATOM);
// 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"],
- "provider_display_name" => $item["app"],
- "public" => $public];
-
- $type = "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'],
+ 'provider_display_name' => $item['app'],
+ 'public' => $public
+ ];
+
+ $type = 'reshare';
} else {
- $title = $item["title"];
+ $title = $item['title'];
$body = Post\Media::addAttachmentsToBody($item['uri-id'], $item['body']);
// Fetch the title from an attached link - if there is one
- if (empty($item["title"]) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
+ if (empty($item['title']) && DI::pConfig()->get($owner['uid'], 'system', 'attach_link_title')) {
$page_data = BBCode::getAttachmentData($item['body']);
if (!empty($page_data['type']) && !empty($page_data['title']) && ($page_data['type'] == 'link')) {
$title = $page_data['title'];
}
}
+ // @todo Check if this is obsolete and if we are still using different owners. (Possibly a fragment from the forum functionality)
if ($item['author-link'] != $item['owner-link']) {
- $body = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'],
- $item['plink'], $item['created']) . $body . '[/share]';
+ $body = DI::contentItem()->createSharedBlockByArray($item);
}
// convert to markdown
// Adding the title
if (strlen($title)) {
- $body = "### ".html_entity_decode($title)."\n\n".$body;
+ $body = '### ' . html_entity_decode($title) . "\n\n" . $body;
}
$attachments = Post\Media::getByURIId($item['uri-id'], [Post\Media::DOCUMENT, Post\Media::TORRENT, Post\Media::UNKNOWN]);
$location = [];
- if ($item["location"] != "")
- $location["address"] = $item["location"];
+ if ($item['location'] != '')
+ $location['address'] = $item['location'];
- if ($item["coord"] != "") {
- $coord = explode(" ", $item["coord"]);
- $location["lat"] = $coord[0];
- $location["lng"] = $coord[1];
+ if ($item['coord'] != '') {
+ $coord = explode(' ', $item['coord']);
+ $location['lat'] = $coord[0];
+ $location['lng'] = $coord[1];
}
- $message = ["author" => $myaddr,
- "guid" => $item["guid"],
- "created_at" => $created,
- "edited_at" => $edited,
- "public" => $public,
- "text" => $body,
- "provider_display_name" => $item["app"],
- "location" => $location];
+ $message = [
+ 'author' => $myaddr,
+ 'guid' => $item['guid'],
+ 'created_at' => $created,
+ 'edited_at' => $edited,
+ 'public' => $public,
+ 'text' => $body,
+ 'provider_display_name' => $item['app'],
+ 'location' => $location
+ ];
// Diaspora rejects messages when they contain a location without "lat" or "lng"
- if (!isset($location["lat"]) || !isset($location["lng"])) {
- unset($message["location"]);
+ if (!isset($location['lat']) || !isset($location['lng'])) {
+ unset($message['location']);
}
if ($item['event-id'] > 0) {
}
}
- $type = "status_message";
+ $type = 'status_message';
}
- $msg = ["type" => $type, "message" => $message];
+ $msg = [
+ 'type' => $type,
+ 'message' => $message
+ ];
DI::cache()->set($cachekey, $msg, Duration::QUARTER_HOUR);
return $msg;
}
- private static function prependParentAuthorMention($body, $profile_url)
+ private static function prependParentAuthorMention(string $body, string $profile_url): string
{
- $profile = Contact::getByURL($profile_url, false, ['addr', 'name', 'contact-type']);
+ $profile = Contact::getByURL($profile_url, false, ['addr', 'name']);
if (!empty($profile['addr'])
- && $profile['contact-type'] != Contact::TYPE_COMMUNITY
&& !strstr($body, $profile['addr'])
&& !strstr($body, $profile_url)
) {
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function sendStatus(array $item, array $owner, array $contact, $public_batch = false)
+ public static function sendStatus(array $item, array $owner, array $contact, bool $public_batch = false): int
{
$status = self::buildStatus($item, $owner);
- return self::buildAndTransmit($owner, $contact, $status["type"], $status["message"], $public_batch, $item["guid"]);
+ return self::buildAndTransmit($owner, $contact, $status['type'], $status['message'], $public_batch, $item['guid']);
}
/**
* @param array $item The item that will be exported
* @param array $owner the array of the item owner
*
- * @return array The data for a "like"
+ * @return array|bool The data for a "like" or false on error
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function constructLike(array $item, array $owner)
{
- $parent = Post::selectFirst(['guid', 'uri', 'thr-parent'], ['uri' => $item["thr-parent"]]);
+ $parent = Post::selectFirst(['guid', 'uri', 'thr-parent'], ['uri' => $item['thr-parent']]);
if (!DBA::isResult($parent)) {
return false;
}
- $target_type = ($parent["uri"] === $parent["thr-parent"] ? "Post" : "Comment");
+ $target_type = ($parent['uri'] === $parent['thr-parent'] ? 'Post' : 'Comment');
$positive = null;
if ($item['verb'] === Activity::LIKE) {
- $positive = "true";
+ $positive = 'true';
} elseif ($item['verb'] === Activity::DISLIKE) {
- $positive = "false";
+ $positive = 'false';
}
- return(["author" => self::myHandle($owner),
- "guid" => $item["guid"],
- "parent_guid" => $parent["guid"],
- "parent_type" => $target_type,
- "positive" => $positive,
- "author_signature" => ""]);
+ return [
+ 'author' => self::myHandle($owner),
+ 'guid' => $item['guid'],
+ 'parent_guid' => $parent['guid'],
+ 'parent_type' => $target_type,
+ 'positive' => $positive,
+ 'author_signature' => '',
+ ];
}
/**
* @param array $item The item that will be exported
* @param array $owner the array of the item owner
*
- * @return array The data for an "EventParticipation"
+ * @return array|bool The data for an "EventParticipation" or false on error
* @throws \Exception
*/
private static function constructAttend(array $item, array $owner)
$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;
}
- return(["author" => self::myHandle($owner),
- "guid" => $item["guid"],
- "parent_guid" => $parent["guid"],
- "status" => $attend_answer,
- "author_signature" => ""]);
+ return [
+ 'author' => self::myHandle($owner),
+ 'guid' => $item['guid'],
+ 'parent_guid' => $parent['guid'],
+ 'status' => $attend_answer,
+ 'author_signature' => ''
+ ];
}
/**
*/
private static function constructComment(array $item, array $owner)
{
- $cachekey = "diaspora:constructComment:".$item['guid'];
+ $cachekey = 'diaspora:constructComment:' . $item['guid'];
$result = DI::cache()->get($cachekey);
if (!is_null($result)) {
}
$text = html_entity_decode(BBCode::toMarkdown($body));
- $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
- $edited = DateTimeFormat::utc($item["edited"], DateTimeFormat::ATOM);
+ $created = DateTimeFormat::utc($item['created'], DateTimeFormat::ATOM);
+ $edited = DateTimeFormat::utc($item['edited'], DateTimeFormat::ATOM);
$comment = [
- "author" => self::myHandle($owner),
- "guid" => $item["guid"],
- "created_at" => $created,
- "edited_at" => $edited,
- "parent_guid" => $toplevel_item["guid"],
- "text" => $text,
- "author_signature" => ""
+ 'author' => self::myHandle($owner),
+ 'guid' => $item['guid'],
+ 'created_at' => $created,
+ 'edited_at' => $edited,
+ 'parent_guid' => $toplevel_item['guid'],
+ 'text' => $text,
+ 'author_signature' => '',
];
// Send the thread parent guid only if it is a threaded comment
DI::cache()->set($cachekey, $comment, Duration::QUARTER_HOUR);
- return($comment);
+ return $comment;
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function sendFollowup(array $item, array $owner, array $contact, $public_batch = false)
+ public static function sendFollowup(array $item, array $owner, array $contact, bool $public_batch = false): int
{
if (in_array($item['verb'], [Activity::ATTEND, Activity::ATTENDNO, Activity::ATTENDMAYBE])) {
$message = self::constructAttend($item, $owner);
- $type = "event_participation";
- } elseif (in_array($item["verb"], [Activity::LIKE, Activity::DISLIKE])) {
+ $type = 'event_participation';
+ } elseif (in_array($item['verb'], [Activity::LIKE, Activity::DISLIKE])) {
$message = self::constructLike($item, $owner);
- $type = "like";
- } elseif (!in_array($item["verb"], [Activity::FOLLOW, Activity::TAG])) {
+ $type = 'like';
+ } elseif (!in_array($item['verb'], [Activity::FOLLOW, Activity::TAG])) {
$message = self::constructComment($item, $owner);
- $type = "comment";
+ $type = 'comment';
}
if (empty($message)) {
- return false;
+ return -1;
}
- $message["author_signature"] = self::signature($owner, $message);
+ $message['author_signature'] = self::signature($owner, $message);
- return self::buildAndTransmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
+ return self::buildAndTransmit($owner, $contact, $type, $message, $public_batch, $item['guid']);
}
/**
* @return int The result of the transmission
* @throws \Exception
*/
- public static function sendRelay(array $item, array $owner, array $contact, $public_batch = false)
+ public static function sendRelay(array $item, array $owner, array $contact, bool $public_batch = false): int
{
- if ($item["deleted"]) {
+ if ($item['deleted']) {
return self::sendRetraction($item, $owner, $contact, $public_batch, true);
- } elseif (in_array($item["verb"], [Activity::LIKE, Activity::DISLIKE])) {
- $type = "like";
+ } elseif (in_array($item['verb'], [Activity::LIKE, Activity::DISLIKE])) {
+ $type = 'like';
} else {
- $type = "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 = [];
if (is_array($msg)) {
foreach ($msg as $field => $data) {
- if (!$item["deleted"]) {
- if ($field == "diaspora_handle") {
- $field = "author";
+ if (!$item['deleted']) {
+ if ($field == 'diaspora_handle') {
+ $field = 'author';
}
- if ($field == "target_type") {
- $field = "parent_type";
+ if ($field == 'target_type') {
+ $field = 'parent_type';
}
}
$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);
+ $message['parent_author_signature'] = self::signature($owner, $message);
Logger::info('Relayed data', ['msg' => $message]);
- return self::buildAndTransmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
+ return self::buildAndTransmit($owner, $contact, $type, $message, $public_batch, $item['guid']);
}
/**
* @return int The result of the transmission
* @throws \Exception
*/
- public static function sendRetraction(array $item, array $owner, array $contact, $public_batch = false, $relay = false)
+ public static function sendRetraction(array $item, array $owner, array $contact, bool $public_batch = false, bool $relay = false): int
{
- $itemaddr = self::handleFromContact($item["contact-id"], $item["author-id"]);
+ $itemaddr = self::handleFromContact($item['contact-id'], $item['author-id']);
- $msg_type = "retraction";
+ $msg_type = 'retraction';
if ($item['gravity'] == GRAVITY_PARENT) {
- $target_type = "Post";
- } elseif (in_array($item["verb"], [Activity::LIKE, Activity::DISLIKE])) {
- $target_type = "Like";
+ $target_type = 'Post';
+ } elseif (in_array($item['verb'], [Activity::LIKE, Activity::DISLIKE])) {
+ $target_type = 'Like';
} else {
- $target_type = "Comment";
+ $target_type = 'Comment';
}
- $message = ["author" => $itemaddr,
- "target_guid" => $item['guid'],
- "target_type" => $target_type];
+ $message = [
+ 'author' => $itemaddr,
+ 'target_guid' => $item['guid'],
+ 'target_type' => $target_type
+ ];
Logger::info('Got message', ['msg' => $message]);
- return self::buildAndTransmit($owner, $contact, $msg_type, $message, $public_batch, $item["guid"]);
+ return self::buildAndTransmit($owner, $contact, $msg_type, $message, $public_batch, $item['guid']);
}
/**
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
* @throws \ImagickException
*/
- public static function sendMail(array $item, array $owner, array $contact)
+ public static function sendMail(array $item, array $owner, array $contact): int
{
$myaddr = self::myHandle($owner);
- $cnv = DBA::selectFirst('conv', [], ['id' => $item["convid"], 'uid' => $item["uid"]]);
+ $cnv = DBA::selectFirst('conv', [], ['id' => $item['convid'], 'uid' => $item['uid']]);
if (!DBA::isResult($cnv)) {
- Logger::notice("conversation not found.");
- return;
+ Logger::notice('Conversation not found.');
+ return -1;
}
- $body = BBCode::toMarkdown($item["body"]);
- $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
+ $body = BBCode::toMarkdown($item['body']);
+ $created = DateTimeFormat::utc($item['created'], DateTimeFormat::ATOM);
$msg = [
- "author" => $myaddr,
- "guid" => $item["guid"],
- "conversation_guid" => $cnv["guid"],
- "text" => $body,
- "created_at" => $created,
+ 'author' => $myaddr,
+ 'guid' => $item['guid'],
+ 'conversation_guid' => $cnv['guid'],
+ 'text' => $body,
+ 'created_at' => $created,
];
- if ($item["reply"]) {
+ if ($item['reply']) {
$message = $msg;
- $type = "message";
+ $type = 'message';
} else {
$message = [
- "author" => $cnv["creator"],
- "guid" => $cnv["guid"],
- "subject" => $cnv["subject"],
- "created_at" => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
- "participants" => $cnv["recips"],
- "message" => $msg
+ 'author' => $cnv['creator'],
+ 'guid' => $cnv['guid'],
+ 'subject' => $cnv['subject'],
+ 'created_at' => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
+ 'participants' => $cnv['recips'],
+ 'message' => $msg
];
- $type = "conversation";
+ $type = 'conversation';
}
- return self::buildAndTransmit($owner, $contact, $type, $message, false, $item["guid"]);
+ return self::buildAndTransmit($owner, $contact, $type, $message, false, $item['guid']);
}
/**
*
* @return array The array with "first" and "last"
*/
- public static function splitName($name) {
+ public static function splitName(string $name): array
+ {
$name = trim($name);
// Is the name longer than 64 characters? Then cut the rest of it.
* @return array The profile data
* @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
- private static function createProfileData($uid)
+ 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);
- }
-
- 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];
+ $data['tag_string'] = trim($data['tag_string']);
+ }
+
+ 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($uid, $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);
}
}
* @param integer $uid The user of that comment
* @param array $item Item array
*
- * @return array Signed content
+ * @return array|bool Signed content or false on error
* @throws \Exception
*/
- public static function createLikeSignature($uid, array $item)
+ public static function createLikeSignature(int $uid, array $item)
{
$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])) {
+ 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;
}
return false;
}
- $message["author_signature"] = self::signature($owner, $message);
+ $message['author_signature'] = self::signature($owner, $message);
return $message;
}
*
* @param array $item Item array
*
- * @return array Signed content
+ * @return array|bool Signed content or false on error
* @throws \Exception
*/
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;
}
return false;
}
+ if (!self::parentSupportDiaspora($item['thr-parent-id'])) {
+ Logger::info('One of the parents does not support Diaspora. A signature will not be created.', ['uri-id' => $item['uri-id'], 'guid' => $item['guid']]);
+ return false;
+ }
+
$message = self::constructComment($item, $owner);
if ($message === false) {
return false;
}
- $message["author_signature"] = self::signature($owner, $message);
+ $message['author_signature'] = self::signature($owner, $message);
return $message;
}
- public static function performReshare(int $UriId, int $uid)
+ /**
+ * Check if the parent and their parents support Diaspora
+ *
+ * @param integer $parent_id
+ * @return boolean
+ */
+ private static function parentSupportDiaspora(int $parent_id): bool
{
- $fields = ['uri-id', 'body', 'title', 'author-name', 'author-link', 'author-avatar', 'guid', 'created', 'plink'];
- $item = Post::selectFirst($fields, ['uri-id' => $UriId, 'uid' => [$uid, 0], 'private' => [Item::PUBLIC, Item::UNLISTED]]);
- if (!DBA::isResult($item)) {
- return 0;
+ $parent_post = Post::selectFirstPost(['gravity', 'signed_text', 'author-link', 'thr-parent-id'], ['uri-id' => $parent_id]);
+ if (empty($parent_post['thr-parent-id'])) {
+ Logger::warning('Parent post does not exist.', ['parent-id' => $parent_id]);
+ return false;
}
- if (strpos($item['body'], '[/share]') !== false) {
- $pos = strpos($item['body'], '[share');
- $post = substr($item['body'], $pos);
- } else {
- $post = BBCode::getShareOpeningTag($item['author-name'], $item['author-link'], $item['author-avatar'], $item['plink'], $item['created'], $item['guid']);
+ if (empty(FContact::getByURL($parent_post['author-link'], false))) {
+ Logger::info('Parent author is no Diaspora contact.', ['parent-id' => $parent_id]);
+ return false;
+ }
- if (!empty($item['title'])) {
- $post .= '[h3]' . $item['title'] . "[/h3]\n";
- }
+ if (($parent_post['gravity'] == GRAVITY_COMMENT) && empty($parent_post['signed_text'])) {
+ Logger::info('Parent comment has got no Diaspora signature.', ['parent-id' => $parent_id]);
+ return false;
+ }
+
+ if ($parent_post['gravity'] == GRAVITY_COMMENT) {
+ return self::parentSupportDiaspora($parent_post['thr-parent-id']);
+ }
- $post .= $item['body'];
- $post .= '[/share]';
+ return true;
+ }
+
+ public static function performReshare(int $UriId, int $uid): int
+ {
+ $post = DI::contentItem()->createSharedPostByUriId($UriId, $uid);
+ if (empty($post)) {
+ return 0;
}
$owner = User::getOwnerDataById($uid);
'author-id' => $author,
'owner-id' => $author,
'body' => $post,
- 'allow_cid' => $owner['allow_cid'],
- 'allow_gid' => $owner['allow_gid'],
- 'deny_cid' => $owner['deny_cid'],
- 'deny_gid' => $owner['deny_gid'],
+ 'allow_cid' => $owner['allow_cid'] ?? '',
+ 'allow_gid' => $owner['allow_gid']?? '',
+ 'deny_cid' => $owner['deny_cid'] ?? '',
+ 'deny_gid' => $owner['deny_gid'] ?? '',
];
if (!empty($item['allow_cid'] . $item['allow_gid'] . $item['deny_cid'] . $item['deny_gid'])) {
projects / friendica.git / blobdiff