namespace Friendica\Protocol;
+use Friendica\Content\Feature;
use Friendica\Content\Text\BBCode;
use Friendica\Content\Text\Markdown;
use Friendica\Core\Cache;
use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\Item;
+use Friendica\Model\Mail;
use Friendica\Model\Profile;
-use Friendica\Model\Queue;
use Friendica\Model\User;
use Friendica\Network\Probe;
use Friendica\Util\Crypto;
use Friendica\Util\Network;
use Friendica\Util\Strings;
use Friendica\Util\XML;
+use Friendica\Worker\Delivery;
use SimpleXMLElement;
/**
* @param array $contacts The previously fetched contacts
*
* @return array of relay servers
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function relayList($item_id, array $contacts = [])
{
*
* @param string $server_url The url of the server
* @return array with the contact
+ * @throws \Exception
*/
private static function getRelayContact($server_url)
{
- $fields = ['batch', 'id', 'name', 'network', 'archive', 'blocked'];
+ $fields = ['batch', 'id', 'name', 'network', 'protocol', 'archive', 'blocked'];
// Fetch the relay contact
$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($server_url),
- 'contact-type' => Contact::ACCOUNT_TYPE_RELAY];
+ 'contact-type' => Contact::TYPE_RELAY];
$contact = DBA::selectFirst('contact', $fields, $condition);
if (DBA::isResult($contact)) {
/**
* @brief Update or insert a relay contact
*
- * @param string $server_url The url of the server
- * @param array $network_fields Optional network specific fields
+ * @param string $server_url The url of the server
+ * @param array $network_fields Optional network specific fields
+ * @throws \Exception
*/
public static function setRelayContact($server_url, array $network_fields = [])
{
$fields = array_merge($fields, $network_fields);
$condition = ['uid' => 0, 'nurl' => Strings::normaliseLink($server_url),
- 'contact-type' => Contact::ACCOUNT_TYPE_RELAY];
+ 'contact-type' => Contact::TYPE_RELAY];
if (DBA::exists('contact', $condition)) {
unset($fields['created']);
* @param array $contacts The previously fetched contacts
*
* @return array of relay servers
+ * @throws \Exception
*/
public static function participantsForThread($thread, array $contacts)
{
- $r = DBA::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`name`, `contact`.`network`,
+ $r = DBA::p("SELECT `contact`.`batch`, `contact`.`id`, `contact`.`name`, `contact`.`network`, `contact`.`protocol`,
`fcontact`.`batch` AS `fbatch`, `fcontact`.`network` AS `fnetwork` FROM `participation`
INNER JOIN `contact` ON `contact`.`id` = `participation`.`cid`
INNER JOIN `fcontact` ON `fcontact`.`id` = `participation`.`fid`
}
unset($contact['fnetwork']);
+ if (empty($contact['protocol'])) {
+ $contact['protocol'] = $contact['network'];
+ }
+
if (empty($contact['batch']) && !empty($contact['fbatch'])) {
$contact['batch'] = $contact['fbatch'];
}
* @param integer $level This value is only set inside this function to avoid endless loops
*
* @return string the repaired signature
+ * @throws \Exception
*/
private static function repairSignature($signature, $handle = "", $level = 1)
{
* @param string $envelope The magic envelope
*
* @return string verified data
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function verifyMagicEnvelope($envelope)
{
* 'message' -> decoded Diaspora XML message
* 'author' -> author diaspora handle
* 'key' -> author public key (converted to pkcs#8)
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function decodeRaw(array $importer, $raw, $no_exit = false)
{
if ($no_exit) {
return false;
} else {
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
}
if ($no_exit) {
return false;
} else {
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
}
if ($no_exit) {
return false;
} else {
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
}
if ($no_exit) {
return false;
} else {
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
}
if ($no_exit) {
return false;
} else {
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
}
* 'message' -> decoded Diaspora XML message
* 'author' -> author diaspora handle
* 'key' -> author public key (converted to pkcs#8)
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function decode(array $importer, $xml)
{
if (!$base) {
Logger::log('unable to locate salmon data in xml');
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
if (!$author_link) {
Logger::log('Could not retrieve author URI.');
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
// Once we have the author URI, go to the web and try to find their public key
// (first this will look it up locally if it is in the fcontact cache)
if (!$key) {
Logger::log('Could not retrieve author key.');
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
$verify = Crypto::rsaVerify($signed_data, $signature, $key);
if (!$verify) {
Logger::log('Message did not verify. Discarding.');
- System::httpExit(400);
+ throw new \Friendica\Network\HTTPException\BadRequestException();
}
Logger::log('Message verified.');
* @param array $msg The post that will be dispatched
*
* @return int 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)
{
return false;
}
- $importer = ["uid" => 0, "page-flags" => Contact::PAGE_FREELOVE];
+ $importer = ["uid" => 0, "page-flags" => User::PAGE_FLAGS_FREELOVE];
$success = self::dispatch($importer, $msg, $fields);
return $success;
/**
* @brief 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 object $fields SimpleXML object that contains the message
+ * @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
*
* @return int 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, $fields = null)
+ public static function dispatch(array $importer, $msg, SimpleXMLElement $fields = null)
{
// 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")
Logger::log("Unknown message type ".$type);
return false;
}
-
- return true;
}
/**
*
* @param array $msg Array with the XML, the sender handle and the sender signature
*
- * @return bool|array If the posting is valid then an array with an SimpleXML object is returned
+ * @return bool|SimpleXMLElement If the posting is valid then an array with an SimpleXML object is returned
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function validPosting($msg)
{
* @param string $handle The handle
*
* @return string The public key
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function key($handle)
{
* @param string $handle The handle
*
* @return array the queried data
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function personByHandle($handle)
{
$person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
if (DBA::isResult($person)) {
- Logger::log("In cache " . print_r($person, true), Logger::DEBUG);
+ Logger::debug("In cache " . print_r($person, true));
// update record occasionally so it doesn't get stale
$d = strtotime($person["updated"]." +00:00");
* @brief Updates the fcontact table
*
* @param array $arr The fcontact data
+ * @throws \Exception
*/
private static function updateFContact($arr)
{
* @param int $pcontact_id The id in the contact table (Used for the public contact)
*
* @return string the handle
+ * @throws \Exception
*/
private static function handleFromContact($contact_id, $pcontact_id = 0)
{
* @param mixed $fcontact_guid Hexadecimal string guid
*
* @return string the contact url or null
+ * @throws \Exception
*/
public static function urlFromContactGuid($fcontact_guid)
{
/**
* @brief Get a contact id for a given handle
*
- * @todo Move to Friendica\Model\Contact
+ * @todo Move to Friendica\Model\Contact
*
* @param int $uid The user id
* @param string $handle The handle in the format user@domain.tld
*
- * @return int Contact id
+ * @return array Contact data
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function contactByHandle($uid, $handle)
{
*/
// 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(Contact::PAGE_FREELOVE))) {
+ //if (!$is_comment && $contact["rel"] == Contact::FOLLOWER && in_array($importer["page-flags"], array(User::PAGE_FLAGS_FREELOVE))) {
// DBA::update(
// 'contact',
// array('rel' => Contact::FRIEND, 'writable' => true),
// Logger::log("defining user ".$contact["nick"]." as friend");
//}
- // We don't seem to like that person
- if ($contact["blocked"]) {
+ // Contact server is blocked
+ if (Network::isUrlBlocked($contact['url'])) {
+ return false;
+ // We don't seem to like that person
+ } elseif ($contact["blocked"]) {
// Maybe blocked, don't accept.
return false;
// We are following this person?
// Yes, then it is fine.
return true;
// Is it a post to a community?
- } elseif (($contact["rel"] == Contact::FOLLOWER) && in_array($importer["page-flags"], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) {
+ } 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?
* @param bool $is_comment Is the check for a comment?
*
* @return array The contact data
+ * @throws \Exception
*/
private static function allowedContactByHandle(array $importer, $handle, $is_comment = false)
{
* @param string $guid The guid of the message
*
* @return int|bool message id if the message already was stored into the system - or false.
+ * @throws \Exception
*/
private static function messageExists($uid, $guid)
{
* @param array $match array containing a link that has to be checked for a message link
* @param array $item The item array
* @return void
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function fetchGuidSub($match, $item)
{
* @param int $uid The user id of the user
*
* @return int the message id of the stored message or false
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function storeByGuid($guid, $server, $uid = 0)
{
* 'message' => The message XML
* 'author' => The author handle
* 'key' => The public key of the author
+ * @throws \Exception
*/
private static function message($guid, $server, $level = 0)
{
* @param array $contact The contact of the item owner
*
* @return array the item record
+ * @throws \Exception
*/
private static function parentItem($uid, $guid, $author, array $contact)
{
* @return array
* 'cid' => contact id
* 'network' => network type
+ * @throws \Exception
*/
private static function authorContactByUrl($def_contact, $person, $uid)
{
* @param string $parent_guid optional parent guid
*
* @return string the post link
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function plink($addr, $guid, $parent_guid = '')
{
* @param object $data The message object
*
* @return bool Success
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function receiveAccountMigration(array $importer, $data)
{
/**
* @brief Processes an account deletion
*
- * @param object $data The message object
+ * @param object $data The message object
*
* @return bool Success
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function receiveAccountDeletion($data)
{
* @param boolean $onlyfound Only return uri when found in the database
*
* @return string The constructed uri or the one from our database
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function getUriFromGuid($author, $guid, $onlyfound = false)
{
* @param string $uid Author handle
*
* @return string The post guid
+ * @throws \Exception
*/
private static function getGuidFromUri($uri, $uid)
{
* @param string $guid The guid of the item
*
* @return array|boolean the origin owner of that post - or false
+ * @throws \Exception
*/
private static function importerForGuid($guid)
{
* @param string $xml The original XML of the message
*
* @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)
{
* @param array $conversation The conversation record to which this message belongs
*
* @return bool "true" if it was successful
+ * @throws \Exception
*/
private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation)
{
$person = self::personByHandle($msg_author);
- DBA::lock('mail');
-
- if (DBA::exists('mail', ['guid' => $msg_guid, 'uid' => $importer["uid"]])) {
- Logger::log("duplicate message already delivered.", Logger::DEBUG);
- return false;
- }
-
- DBA::insert('mail', [
+ return Mail::insert([
'uid' => $importer['uid'],
'guid' => $msg_guid,
'convid' => $conversation['id'],
'contact-id' => $contact['id'],
'title' => $subject,
'body' => $body,
- 'seen' => 0,
- 'reply' => 0,
'uri' => $message_uri,
'parent-uri' => $author . ':' . $guid,
'created' => $msg_created_at
]);
-
- $message_id = DBA::lastInsertId();
-
- DBA::unlock();
-
- DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
-
- notification([
- "type" => NOTIFY_MAIL,
- "notify_flags" => $importer["notify-flags"],
- "language" => $importer["language"],
- "to_name" => $importer["username"],
- "to_email" => $importer["email"],
- "uid" => $importer["uid"],
- "item" => ["id" => $message_id, "title" => $subject, "subject" => $subject, "body" => $body],
- "parent" => $conversation["id"],
- "source_name" => $person["name"],
- "source_link" => $person["url"],
- "source_photo" => $person["photo"],
- "verb" => ACTIVITY_POST,
- "otype" => "mail"
- ]);
-
- return true;
}
/**
* @param object $data The message object
*
* @return bool Success
+ * @throws \Exception
*/
private static function receiveConversation(array $importer, $msg, $data)
{
* @param object $data The message object
*
* @return int The message id of the generated like or "false" if there was an error
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function receiveLike(array $importer, $sender, $data)
{
* @param object $data The message object
*
* @return bool Success?
+ * @throws \Exception
*/
private static function receiveMessage(array $importer, $data)
{
$body = self::replacePeopleGuid($body, $person["url"]);
- DBA::lock('mail');
-
- if (DBA::exists('mail', ['guid' => $guid, 'uid' => $importer["uid"]])) {
- Logger::log("duplicate message already delivered.", Logger::DEBUG);
- return false;
- }
-
- DBA::insert('mail', [
+ return Mail::insert([
'uid' => $importer['uid'],
'guid' => $guid,
'convid' => $conversation['id'],
'contact-id' => $contact['id'],
'title' => $conversation['subject'],
'body' => $body,
- 'seen' => 0,
'reply' => 1,
'uri' => $message_uri,
'parent-uri' => $author.":".$conversation['guid'],
'created' => $created_at
]);
-
- $message_id = DBA::lastInsertId();
-
- DBA::unlock();
-
- DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
-
- notification([
- "type" => NOTIFY_MAIL,
- "notify_flags" => $importer["notify-flags"],
- "language" => $importer["language"],
- "to_name" => $importer["username"],
- "to_email" => $importer["email"],
- "uid" => $importer["uid"],
- "item" => ["id" => $message_id, "title" => $conversation["subject"], "subject" => $conversation["subject"], "body" => $body],
- "parent" => $conversation["id"],
- "source_name" => $person["name"],
- "source_link" => $person["url"],
- "source_photo" => $person["photo"],
- "verb" => ACTIVITY_POST,
- "otype" => "mail"
- ]);
-
- return true;
}
/**
* @param object $data The message object
*
* @return bool always true
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function receiveParticipation(array $importer, $data)
{
if ($comment['id'] == $comment['parent']) {
continue;
}
- if ($comment['verb'] == ACTIVITY_POST) {
- $cmd = $comment['self'] ? 'comment-new' : 'comment-import';
- } else {
- $cmd = $comment['self'] ? 'like' : 'comment-import';
- }
- Logger::log("Send ".$cmd." for item ".$comment['id']." to contact ".$contact_id, Logger::DEBUG);
- Worker::add(PRIORITY_HIGH, 'Delivery', $cmd, $comment['id'], $contact_id);
+
+ Logger::info('Deliver participation', ['item' => $comment['id'], 'contact' => $contact_id]);
+ Worker::add(PRIORITY_HIGH, 'Delivery', Delivery::POST, $comment['id'], $contact_id);
}
DBA::close($comments);
* @param object $data The message object
*
* @return bool Success
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function receiveProfile(array $importer, $data)
{
* @param array $importer Array of the importer user
* @param array $contact The contact that send the request
* @return void
+ * @throws \Exception
*/
private static function receiveRequestMakeFriend(array $importer, array $contact)
{
- $a = get_app();
-
if ($contact["rel"] == Contact::SHARING) {
DBA::update(
'contact',
* @param object $data The message object
*
* @return bool Success
+ * @throws \Exception
*/
private static function receiveContactRequest(array $importer, $data)
{
$user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]);
if (DBA::isResult($user)) {
Logger::log("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], Logger::DEBUG);
- $ret = self::sendShare($user, $contact);
+ self::sendShare($user, $contact);
}
}
return true;
}
}
- if (!$following && $sharing && in_array($importer["page-flags"], [Contact::PAGE_SOAPBOX, Contact::PAGE_NORMAL])) {
+ if (!$following && $sharing && in_array($importer["page-flags"], [User::PAGE_FLAGS_SOAPBOX, User::PAGE_FLAGS_NORMAL])) {
Logger::log("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", Logger::DEBUG);
return false;
} elseif (!$following && !$sharing) {
$batch = (($ret["batch"]) ? $ret["batch"] : implode("/", array_slice(explode("/", $ret["url"]), 0, 3))."/receive/public");
- $r = q(
+ q(
"INSERT INTO `contact` (`uid`, `network`,`addr`,`created`,`url`,`nurl`,`batch`,`name`,`nick`,`photo`,`pubkey`,`notify`,`poll`,`blocked`,`priority`)
VALUES (%d, '%s', '%s', '%s', '%s','%s','%s','%s','%s','%s','%s','%s','%s',%d,%d)",
intval($importer["uid"]),
Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
- if (in_array($importer["page-flags"], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP])) {
+ if (in_array($importer["page-flags"], [User::PAGE_FLAGS_NORMAL, User::PAGE_FLAGS_PRVGROUP])) {
Logger::log("Sending intra message for author ".$author.".", Logger::DEBUG);
$hash = Strings::getRandomHex().(string)time(); // Generate a confirm_key
- $ret = q(
+ q(
"INSERT INTO `intro` (`uid`, `contact-id`, `blocked`, `knowyou`, `note`, `hash`, `datetime`)
VALUES (%d, %d, %d, %d, '%s', '%s', '%s')",
intval($importer["uid"]),
* but if our page-type is Profile::PAGE_COMMUNITY or Profile::PAGE_SOAPBOX
* we are going to change the relationship and make them a follower.
*/
- if (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing && $following) {
+ if (($importer["page-flags"] == User::PAGE_FLAGS_FREELOVE) && $sharing && $following) {
$new_relation = Contact::FRIEND;
- } elseif (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing) {
+ } elseif (($importer["page-flags"] == User::PAGE_FLAGS_FREELOVE) && $sharing) {
$new_relation = Contact::SHARING;
} else {
$new_relation = Contact::FOLLOWER;
}
- $r = q(
+ q(
"UPDATE `contact` SET `rel` = %d,
`name-date` = '%s',
`uri-date` = '%s',
$user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]);
if (DBA::isResult($user)) {
Logger::log("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], Logger::DEBUG);
- $ret = self::sendShare($user, $contact_record);
+ self::sendShare($user, $contact_record);
// Send the profile data, maybe it weren't transmitted before
self::sendProfile($importer["uid"], [$contact_record]);
*
* @param string $guid message guid
* @param string $orig_author handle of the original post
- * @param string $author handle of the sharer
- *
* @return array The fetched item
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function originalItem($guid, $orig_author)
{
return false;
}
+ /**
+ * @brief Stores a reshare activity
+ *
+ * @param array $item Array of reshare post
+ * @param integer $parent_message_id Id of the parent post
+ * @param string $guid GUID string of reshare action
+ * @param string $author Author handle
+ */
+ private static function addReshareActivity($item, $parent_message_id, $guid, $author)
+ {
+ $parent = Item::selectFirst(['uri', 'guid'], ['id' => $parent_message_id]);
+
+ $datarray = [];
+
+ $datarray['uid'] = $item['uid'];
+ $datarray['contact-id'] = $item['contact-id'];
+ $datarray['network'] = $item['network'];
+
+ $datarray['author-link'] = $item['author-link'];
+ $datarray['author-id'] = $item['author-id'];
+
+ $datarray['owner-link'] = $datarray['author-link'];
+ $datarray['owner-id'] = $datarray['author-id'];
+
+ $datarray['guid'] = $parent['guid'] . '-' . $guid;
+ $datarray['uri'] = self::getUriFromGuid($author, $datarray['guid']);
+ $datarray['parent-uri'] = $parent['uri'];
+
+ $datarray['verb'] = $datarray['body'] = ACTIVITY2_ANNOUNCE;
+ $datarray['gravity'] = GRAVITY_ACTIVITY;
+ $datarray['object-type'] = ACTIVITY_OBJ_NOTE;
+
+ $datarray['protocol'] = $item['protocol'];
+
+ $datarray['plink'] = self::plink($author, $datarray['guid']);
+ $datarray['private'] = $item['private'];
+ $datarray['changed'] = $datarray['created'] = $datarray['edited'] = $item['created'];
+
+ $message_id = Item::insert($datarray);
+
+ if ($message_id) {
+ Logger::info('Stored reshare activity.', ['guid' => $guid, 'id' => $message_id]);
+ if ($datarray['uid'] == 0) {
+ Item::distribute($message_id);
+ }
+ }
+ }
+
/**
* @brief Processes a reshare message
*
* @param string $xml The original XML of the message
*
* @return int the message id
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function receiveReshare(array $importer, $data, $xml)
{
self::sendParticipation($contact, $datarray);
+ $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::log("Stored reshare ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
if ($datarray['uid'] == 0) {
* @param object $data The message object
*
* @return bool success
+ * @throws \Exception
*/
private static function itemRetraction(array $importer, array $contact, $data)
{
* @param object $data The message object
*
* @return bool Success
+ * @throws \Exception
*/
private static function receiveRetraction(array $importer, $sender, $data)
{
/**
* @brief Receives status messages
*
- * @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
*
* @return int The message id of the newly created item
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml)
{
* @param array $contact contact array
*
* @return string the handle in the format user@domain.tld
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function myHandle(array $contact)
{
* @param string $pubkey The public key of the receiver
*
* @return string The encrypted data
+ * @throws \Exception
*/
public static function encodePrivateData($msg, array $user, array $contact, $prvkey, $pubkey)
{
* @param array $user The record of the sender
*
* @return string The envelope
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
public static function buildMagicEnvelope($msg, array $user)
{
* @param bool $public Is the message public?
*
* @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)
{
* @param array $contact Target of the communication
* @param string $envelope The message that is to be transmitted
* @param bool $public_batch Is it a public post?
- * @param bool $queue_run Is the transmission called from the queue?
* @param string $guid message guid
*
* @return int Result of the transmission
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
- public static function transmit(array $owner, array $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false)
+ private static function transmit(array $owner, array $contact, $envelope, $public_batch, $guid = "")
{
- $a = get_app();
-
$enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled) {
return 200;
Logger::log("transmit: ".$logid."-".$guid." ".$dest_url);
- if (!$queue_run && Queue::wasDelayed($contact["id"])) {
- $return_code = 0;
- } else {
- if (!intval(Config::get("system", "diaspora_test"))) {
- $content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
+ if (!intval(Config::get("system", "diaspora_test"))) {
+ $content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
- $postResult = Network::post($dest_url."/", $envelope, ["Content-Type: ".$content_type]);
- $return_code = $postResult->getReturnCode();
- } else {
- Logger::log("test_mode");
- return 200;
- }
+ $postResult = Network::post($dest_url."/", $envelope, ["Content-Type: ".$content_type]);
+ $return_code = $postResult->getReturnCode();
+ } else {
+ Logger::log("test_mode");
+ return 200;
}
Logger::log("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
- if (!$return_code || (($return_code == 503) && (stristr($postResult->getHeader(), "retry-after")))) {
- if (!$no_queue && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::ACCOUNT_TYPE_RELAY)) {
- Logger::log("queue message");
- // queue message for redelivery
- Queue::add($contact["id"], Protocol::DIASPORA, $envelope, $public_batch, $guid);
- }
-
- // The message could not be delivered. We mark the contact as "dead"
- Contact::markForArchival($contact);
- } elseif (($return_code >= 200) && ($return_code <= 299)) {
- // We successfully delivered a message, the contact is alive
- Contact::unmarkForArchival($contact);
- }
-
return $return_code ? $return_code : -1;
}
* @param array $message The message data
* @param bool $public_batch Is it a public post?
* @param string $guid message guid
- * @param bool $spool Should the transmission be spooled or transmitted?
*
* @return int Result of the transmission
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
- private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
+ private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "")
{
$msg = self::buildPostXml($type, $message);
$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
- if ($spool) {
- Queue::add($contact['id'], Protocol::DIASPORA, $envelope, $public_batch, $guid);
- return true;
- } else {
- $return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
- }
+ $return_code = self::transmit($owner, $contact, $envelope, $public_batch, $guid);
Logger::log("guid: ".$guid." result ".$return_code, Logger::DEBUG);
* @brief sends a participation (Used to get all further updates)
*
* @param array $contact Target of the communication
- * @param array $item Item array
+ * @param array $item Item array
*
* @return int The result of the transmission
+ * @throws \Exception
*/
private static function sendParticipation(array $contact, array $item)
{
*
* @param array $owner the array of the item owner
* @param array $contact Target of the communication
- * @param int $uid User ID
+ * @param int $uid User ID
*
* @return int The result of the transmission
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function sendAccountMigration(array $owner, array $contact, $uid)
{
* @param array $contact Target of the communication
*
* @return int The result of the transmission
+ * @throws \Exception
*/
public static function sendShare(array $owner, array $contact)
{
* @param array $contact Target of the communication
*
* @return int The result of the transmission
+ * @throws \Exception
*/
public static function sendUnshare(array $owner, array $contact)
{
* @param bool $complete Should it be a complete check or a simple check?
*
* @return array|bool Reshare details or "false" if no reshare
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function isReshare($body, $complete = true)
{
* @param integer $event_id The id of the event
*
* @return array with event data
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function buildEvent($event_id)
{
* @return array
* 'type' -> Message type ("status_message" or "reshare")
* 'message' -> Array of XML elements of the status
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function buildStatus(array $item, array $owner)
{
$public = ($item["private"] ? "false" : "true");
$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
+ $edited = DateTimeFormat::utc($item["edited"] ?? $item["created"], DateTimeFormat::ATOM);
// Detect a share element and do a reshare
if (!$item['private'] && ($ret = self::isReshare($item["body"]))) {
$message = ["author" => $myaddr,
"guid" => $item["guid"],
"created_at" => $created,
+ "edited_at" => $edited,
"public" => $public,
"text" => $body,
"provider_display_name" => $item["app"],
return $msg;
}
+ private static function prependParentAuthorMention($body, $profile_url)
+ {
+ $profile = Contact::getDetailsByURL($profile_url);
+ if (!empty($profile['addr'])
+ && $profile['contact-type'] != Contact::TYPE_COMMUNITY
+ && !strstr($body, $profile['addr'])
+ && !strstr($body, $profile_url)
+ ) {
+ $body = '@[url=' . $profile_url . ']' . $profile['name'] . '[/url] ' . $body;
+ }
+
+ return $body;
+ }
+
/**
* @brief Sends a post
*
* @param bool $public_batch Is it a public post?
*
* @return int The result of the transmission
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function sendStatus(array $item, array $owner, array $contact, $public_batch = false)
{
* @param array $owner the array of the item owner
*
* @return array The data for a "like"
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function constructLike(array $item, array $owner)
{
* @param array $owner the array of the item owner
*
* @return array The data for an "EventParticipation"
+ * @throws \Exception
*/
private static function constructAttend(array $item, array $owner)
{
* @param array $item The item that will be exported
* @param array $owner the array of the item owner
*
- * @return array The data for a comment
+ * @return array|false The data for a comment
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function constructComment(array $item, array $owner)
{
return $result;
}
- $parent = Item::selectFirst(['guid'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
- if (!DBA::isResult($parent)) {
+ $toplevel_item = Item::selectFirst(['guid', 'author-link'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
+ if (!DBA::isResult($toplevel_item)) {
+ Logger::error('Missing parent conversation item', ['parent' => $item["parent"]]);
return false;
}
- $text = html_entity_decode(BBCode::toMarkdown($item["body"]));
- $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
+ $thread_parent_item = $toplevel_item;
+ if ($item['thr-parent'] != $item['parent-uri']) {
+ $thread_parent_item = Item::selectFirst(['guid', 'author-link'], ['uri' => $item['thr-parent'], 'uid' => $item['uid']]);
+ }
- $comment = ["author" => self::myHandle($owner),
- "guid" => $item["guid"],
- "created_at" => $created,
- "parent_guid" => $parent["guid"],
- "text" => $text,
- "author_signature" => ""];
+ $body = $item["body"];
+
+ if ((empty($item['uid']) || !Feature::isEnabled($item['uid'], 'explicit_mentions'))
+ && !Config::get('system', 'disable_implicit_mentions')
+ ) {
+ $body = self::prependParentAuthorMention($body, $thread_parent_item['author-link']);
+ }
+
+ $text = html_entity_decode(BBCode::toMarkdown($body));
+ $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" => ""
+ ];
// Send the thread parent guid only if it is a threaded comment
if ($item['thr-parent'] != $item['parent-uri']) {
- $comment['thread_parent_guid'] = self::getGuidFromUri($item['thr-parent'], $item['uid']);
+ $comment['thread_parent_guid'] = $thread_parent_item['guid'];
}
Cache::set($cachekey, $comment, Cache::QUARTER_HOUR);
* @param bool $public_batch Is it a public post?
*
* @return int The result of the transmission
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function sendFollowup(array $item, array $owner, array $contact, $public_batch = false)
{
} elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
$message = self::constructLike($item, $owner);
$type = "like";
- } elseif (!in_array($item["verb"], [ACTIVITY_FOLLOW])) {
+ } elseif (!in_array($item["verb"], [ACTIVITY_FOLLOW, ACTIVITY_TAG])) {
$message = self::constructComment($item, $owner);
$type = "comment";
}
/**
* @brief Creates a message from a signature record entry
*
- * @param array $item The item that will be exported
- * @param array $signature The entry of the "sign" record
- *
- * @return string The message
+ * @param array $item The item that will be exported
+ * @return array The message
*/
private static function messageFromSignature(array $item)
{
// Remove the handle
$handle = array_pop($signed_parts);
- // Glue the parts together
- $text = implode(";", $signed_parts);
-
- $message = ["author" => $handle,
- "guid" => $guid,
- "parent_guid" => $parent_guid,
- "text" => implode(";", $signed_parts),
- "author_signature" => $item['signature'],
- "parent_author_signature" => ""];
+ $message = [
+ "author" => $handle,
+ "guid" => $guid,
+ "parent_guid" => $parent_guid,
+ "text" => implode(";", $signed_parts),
+ "author_signature" => $item['signature'],
+ "parent_author_signature" => ""
+ ];
}
return $message;
}
* @param bool $public_batch Is it a public post?
*
* @return int The result of the transmission
+ * @throws \Exception
*/
public static function sendRelay(array $item, array $owner, array $contact, $public_batch = false)
{
* @param bool $relay Is the retraction transmitted from a relay?
*
* @return int The result of the transmission
+ * @throws \Exception
*/
public static function sendRetraction(array $item, array $owner, array $contact, $public_batch = false, $relay = false)
{
* @param array $contact Target of the communication
*
* @return int The result of the transmission
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
+ * @throws \ImagickException
*/
public static function sendMail(array $item, array $owner, array $contact)
{
return;
}
- $conv = [
- "author" => $cnv["creator"],
- "guid" => $cnv["guid"],
- "subject" => $cnv["subject"],
- "created_at" => DateTimeFormat::utc($cnv['created'], DateTimeFormat::ATOM),
- "participants" => $cnv["recips"]
- ];
-
$body = BBCode::toMarkdown($item["body"]);
$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
$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";
}
* @param int $uid The user id
*
* @return array The profile data
+ * @throws \Friendica\Network\HTTPException\InternalServerErrorException
*/
private static function createProfileData($uid)
{
if ($profile['pub_keywords']) {
$kw = str_replace(',', ' ', $profile['pub_keywords']);
$kw = str_replace(' ', ' ', $kw);
- $arr = explode(' ', $profile['pub_keywords']);
+ $arr = explode(' ', $kw);
if (count($arr)) {
for ($x = 0; $x < 5; $x ++) {
if (!empty($arr[$x])) {
* @param int $uid The user id
* @param bool $recips optional, default false
* @return void
+ * @throws \Exception
*/
public static function sendProfile($uid, $recips = false)
{
$message = self::createProfileData($uid);
+ // @ToDo Split this into single worker jobs
foreach ($recips as $recip) {
Logger::log("Send updated profile data for user ".$uid." to contact ".$recip["id"], Logger::DEBUG);
- self::buildAndTransmit($owner, $recip, "profile", $message, false, "", false);
+ self::buildAndTransmit($owner, $recip, "profile", $message);
}
}
* @param array $item Item array
*
* @return array Signed content
+ * @throws \Exception
*/
public static function createLikeSignature($uid, array $item)
{
* @param array $item Item array
*
* @return array Signed content
+ * @throws \Exception
*/
public static function createCommentSignature($uid, array $item)
{
projects / friendica.git / blobdiff