use Friendica\Core\Cache;
use Friendica\Core\Config;
use Friendica\Core\L10n;
+use Friendica\Core\Logger;
use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
use Friendica\Database\DBA;
use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\Item;
{
$fields = ['created' => DateTimeFormat::utcNow(),
'name' => 'relay', 'nick' => 'relay',
- 'url' => $server_url, 'network' => NETWORK_DIASPORA,
+ 'url' => $server_url, 'network' => Protocol::DIASPORA,
'batch' => $server_url . '/receive/public',
'rel' => Contact::FOLLOWER, 'blocked' => false,
'pending' => false, 'writable' => true];
if (base64_encode(base64_decode(base64_decode($signature))) == base64_decode($signature)) {
$signature = base64_decode($signature);
- logger("Repaired double encoded signature from Diaspora/Hubzilla handle ".$handle." - level ".$level, LOGGER_DEBUG);
+ Logger::log("Repaired double encoded signature from Diaspora/Hubzilla handle ".$handle." - level ".$level, Logger::DEBUG);
// Do a recursive call to be able to fix even multiple levels
if ($level < 10) {
$basedom = XML::parseString($envelope);
if (!is_object($basedom)) {
- logger("Envelope is no XML file");
+ Logger::log("Envelope is no XML file");
return false;
}
$children = $basedom->children('http://salmon-protocol.org/ns/magic-env');
if (sizeof($children) == 0) {
- logger("XML has no children");
+ Logger::log("XML has no children");
return false;
}
$signable_data = $msg.".".base64url_encode($type).".".base64url_encode($encoding).".".base64url_encode($alg);
if ($handle == '') {
- logger('No author could be decoded. Discarding. Message: ' . $envelope);
+ Logger::log('No author could be decoded. Discarding. Message: ' . $envelope);
return false;
}
$key = self::key($handle);
if ($key == '') {
- logger("Couldn't get a key for handle " . $handle . ". Discarding.");
+ Logger::log("Couldn't get a key for handle " . $handle . ". Discarding.");
return false;
}
$verify = Crypto::rsaVerify($signable_data, $sig, $key);
if (!$verify) {
- logger('Message from ' . $handle . ' did not verify. Discarding.');
+ Logger::log('Message from ' . $handle . ' did not verify. Discarding.');
return false;
}
/**
* @brief: Decodes incoming Diaspora message in the new format
*
- * @param array $importer Array of the importer user
- * @param string $raw raw post message
+ * @param array $importer Array of the importer user
+ * @param string $raw raw post message
+ * @param boolean $no_exit Don't do an http exit on error
*
* @return array
* 'message' -> decoded Diaspora XML message
* 'author' -> author diaspora handle
* 'key' -> author public key (converted to pkcs#8)
*/
- public static function decodeRaw(array $importer, $raw)
+ public static function decodeRaw(array $importer, $raw, $no_exit = false)
{
$data = json_decode($raw);
$j_outer_key_bundle = json_decode($outer_key_bundle);
if (!is_object($j_outer_key_bundle)) {
- logger('Outer Salmon did not verify. Discarding.');
- System::httpExit(400);
+ Logger::log('Outer Salmon did not verify. Discarding.');
+ if ($no_exit) {
+ return false;
+ } else {
+ System::httpExit(400);
+ }
}
$outer_iv = base64_decode($j_outer_key_bundle->iv);
$basedom = XML::parseString($xml);
if (!is_object($basedom)) {
- logger('Received data does not seem to be an XML. Discarding. '.$xml);
- System::httpExit(400);
+ Logger::log('Received data does not seem to be an XML. Discarding. '.$xml);
+ if ($no_exit) {
+ return false;
+ } else {
+ System::httpExit(400);
+ }
}
$base = $basedom->children(NAMESPACE_SALMON_ME);
$key_id = $base->sig[0]->attributes()->key_id[0];
$author_addr = base64_decode($key_id);
if ($author_addr == '') {
- logger('No author could be decoded. Discarding. Message: ' . $xml);
- System::httpExit(400);
+ Logger::log('No author could be decoded. Discarding. Message: ' . $xml);
+ if ($no_exit) {
+ return false;
+ } else {
+ System::httpExit(400);
+ }
}
$key = self::key($author_addr);
if ($key == '') {
- logger("Couldn't get a key for handle " . $author_addr . ". Discarding.");
- System::httpExit(400);
+ Logger::log("Couldn't get a key for handle " . $author_addr . ". Discarding.");
+ if ($no_exit) {
+ return false;
+ } else {
+ System::httpExit(400);
+ }
}
$verify = Crypto::rsaVerify($signed_data, $signature, $key);
if (!$verify) {
- logger('Message did not verify. Discarding.');
- System::httpExit(400);
+ Logger::log('Message did not verify. Discarding.');
+ if ($no_exit) {
+ return false;
+ } else {
+ System::httpExit(400);
+ }
}
return ['message' => (string)base64url_decode($base->data),
$basedom = XML::parseString($xml);
if (!is_object($basedom)) {
- logger("XML is not parseable.");
+ Logger::log("XML is not parseable.");
return false;
}
$children = $basedom->children('https://joindiaspora.com/protocol');
} else {
// This happens with posts from a relais
if (!$importer) {
- logger("This is no private post in the old format", LOGGER_DEBUG);
+ Logger::log("This is no private post in the old format", Logger::DEBUG);
return false;
}
$decrypted = self::aesDecrypt($outer_key, $outer_iv, $ciphertext);
- logger('decrypted: '.$decrypted, LOGGER_DEBUG);
+ Logger::log('decrypted: '.$decrypted, Logger::DEBUG);
$idom = XML::parseString($decrypted);
$inner_iv = base64_decode($idom->iv);
}
if (!$base) {
- logger('unable to locate salmon data in xml');
+ Logger::log('unable to locate salmon data in xml');
System::httpExit(400);
}
}
if (!$author_link) {
- logger('Could not retrieve author URI.');
+ Logger::log('Could not retrieve author URI.');
System::httpExit(400);
}
// 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)
// This will also convert diaspora public key from pkcs#1 to pkcs#8
- logger('Fetching key for '.$author_link);
+ Logger::log('Fetching key for '.$author_link);
$key = self::key($author_link);
if (!$key) {
- logger('Could not retrieve author key.');
+ Logger::log('Could not retrieve author key.');
System::httpExit(400);
}
$verify = Crypto::rsaVerify($signed_data, $signature, $key);
if (!$verify) {
- logger('Message did not verify. Discarding.');
+ Logger::log('Message did not verify. Discarding.');
System::httpExit(400);
}
- logger('Message verified.');
+ Logger::log('Message verified.');
return ['message' => (string)$inner_decrypted,
'author' => unxmlify($author_link),
{
$enabled = intval(Config::get("system", "diaspora_enabled"));
if (!$enabled) {
- logger("diaspora is disabled");
+ Logger::log("diaspora is disabled");
return false;
}
if (!($fields = self::validPosting($msg))) {
- logger("Invalid posting");
+ Logger::log("Invalid posting");
return false;
}
if (is_null($fields)) {
$private = true;
if (!($fields = self::validPosting($msg))) {
- logger("Invalid posting");
+ Logger::log("Invalid posting");
return false;
}
} else {
$type = $fields->getName();
- logger("Received message type ".$type." from ".$sender." for user ".$importer["uid"], LOGGER_DEBUG);
+ Logger::log("Received message type ".$type." from ".$sender." for user ".$importer["uid"], Logger::DEBUG);
switch ($type) {
case "account_migration":
if (!$private) {
- logger('Message with type ' . $type . ' is not private, quitting.');
+ Logger::log('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveAccountMigration($importer, $fields);
case "contact":
if (!$private) {
- logger('Message with type ' . $type . ' is not private, quitting.');
+ Logger::log('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveContactRequest($importer, $fields);
case "conversation":
if (!$private) {
- logger('Message with type ' . $type . ' is not private, quitting.');
+ Logger::log('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveConversation($importer, $msg, $fields);
case "message":
if (!$private) {
- logger('Message with type ' . $type . ' is not private, quitting.');
+ Logger::log('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveMessage($importer, $fields);
case "participation":
if (!$private) {
- logger('Message with type ' . $type . ' is not private, quitting.');
+ Logger::log('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveParticipation($importer, $fields);
case "profile":
if (!$private) {
- logger('Message with type ' . $type . ' is not private, quitting.');
+ Logger::log('Message with type ' . $type . ' is not private, quitting.');
return false;
}
return self::receiveProfile($importer, $fields);
return self::receiveStatusMessage($importer, $fields, $msg["message"]);
default:
- logger("Unknown message type ".$type);
+ Logger::log("Unknown message type ".$type);
return false;
}
$data = XML::parseString($msg["message"]);
if (!is_object($data)) {
- logger("No valid XML ".$msg["message"], LOGGER_DEBUG);
+ Logger::log("No valid XML ".$msg["message"], Logger::DEBUG);
return false;
}
$type = $element->getName();
$orig_type = $type;
- logger("Got message type ".$type.": ".$msg["message"], LOGGER_DATA);
+ Logger::log("Got message type ".$type.": ".$msg["message"], Logger::DATA);
// All retractions are handled identically from now on.
// In the new version there will only be "retraction".
// This is something that shouldn't happen at all.
if (in_array($type, ["status_message", "reshare", "profile"])) {
if ($msg["author"] != $fields->author) {
- logger("Message handle is not the same as envelope sender. Quitting this message.");
+ Logger::log("Message handle is not the same as envelope sender. Quitting this message.");
return false;
}
}
}
// No author_signature? This is a must, so we quit.
if (!isset($author_signature)) {
- logger("No author signature for type ".$type." - Message: ".$msg["message"], LOGGER_DEBUG);
+ Logger::log("No author signature for type ".$type." - Message: ".$msg["message"], Logger::DEBUG);
return false;
}
if (isset($parent_author_signature)) {
$key = self::key($msg["author"]);
if (empty($key)) {
- logger("No key found for parent author ".$msg["author"], LOGGER_DEBUG);
+ Logger::log("No key found for parent author ".$msg["author"], Logger::DEBUG);
return false;
}
if (!Crypto::rsaVerify($signed_data, $parent_author_signature, $key, "sha256")) {
- logger("No valid parent author signature for parent author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature, LOGGER_DEBUG);
+ Logger::log("No valid parent author signature for parent author ".$msg["author"]. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$parent_author_signature, Logger::DEBUG);
return false;
}
}
$key = self::key($fields->author);
if (empty($key)) {
- logger("No key found for author ".$fields->author, LOGGER_DEBUG);
+ Logger::log("No key found for author ".$fields->author, Logger::DEBUG);
return false;
}
if (!Crypto::rsaVerify($signed_data, $author_signature, $key, "sha256")) {
- logger("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, LOGGER_DEBUG);
+ Logger::log("No valid author signature for author ".$fields->author. " in type ".$type." - signed data: ".$signed_data." - Message: ".$msg["message"]." - Signature ".$author_signature, Logger::DEBUG);
return false;
} else {
return $fields;
{
$handle = strval($handle);
- logger("Fetching diaspora key for: ".$handle);
+ Logger::log("Fetching diaspora key for: ".$handle);
$r = self::personByHandle($handle);
if ($r) {
{
$update = false;
- $person = DBA::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]);
+ $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
if (DBA::isResult($person)) {
- logger("In cache " . print_r($person, true), LOGGER_DEBUG);
+ Logger::log("In cache " . print_r($person, true), Logger::DEBUG);
// update record occasionally so it doesn't get stale
$d = strtotime($person["updated"]." +00:00");
}
if (!DBA::isResult($person) || $update) {
- logger("create or refresh", LOGGER_DEBUG);
- $r = Probe::uri($handle, NETWORK_DIASPORA);
+ Logger::log("create or refresh", Logger::DEBUG);
+ $r = Probe::uri($handle, Protocol::DIASPORA);
// Note that Friendica contacts will return a "Diaspora person"
// if Diaspora connectivity is enabled on their server
- if ($r && ($r["network"] === NETWORK_DIASPORA)) {
+ if ($r && ($r["network"] === Protocol::DIASPORA)) {
self::updateFContact($r);
// Fetch the updated or added contact
- $person = DBA::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]);
+ $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
if (!DBA::isResult($person)) {
$person = $r;
+ $person['id'] = 0;
}
}
}
{
$handle = false;
- logger("contact id is ".$contact_id." - pcontact id is ".$pcontact_id, LOGGER_DEBUG);
+ Logger::log("contact id is ".$contact_id." - pcontact id is ".$pcontact_id, Logger::DEBUG);
if ($pcontact_id != 0) {
- $r = q(
- "SELECT `addr` FROM `contact` WHERE `id` = %d AND `addr` != ''",
- intval($pcontact_id)
- );
+ $contact = DBA::selectFirst('contact', ['addr'], ['id' => $pcontact_id]);
- if (DBA::isResult($r)) {
- return strtolower($r[0]["addr"]);
+ if (DBA::isResult($contact) && !empty($contact["addr"])) {
+ return strtolower($contact["addr"]);
}
}
if (DBA::isResult($r)) {
$contact = $r[0];
- logger("contact 'self' = ".$contact['self']." 'url' = ".$contact['url'], LOGGER_DEBUG);
+ Logger::log("contact 'self' = ".$contact['self']." 'url' = ".$contact['url'], Logger::DEBUG);
if ($contact['addr'] != "") {
$handle = $contact['addr'];
*/
public static function urlFromContactGuid($fcontact_guid)
{
- logger("fcontact guid is ".$fcontact_guid, LOGGER_DEBUG);
+ Logger::log("fcontact guid is ".$fcontact_guid, Logger::DEBUG);
$r = q(
"SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
- DBA::escape(NETWORK_DIASPORA),
+ DBA::escape(Protocol::DIASPORA),
DBA::escape($fcontact_guid)
);
}
if (!$cid) {
- logger("Haven't found a contact for user " . $uid . " and handle " . $handle, LOGGER_DEBUG);
+ Logger::log("Haven't found a contact for user " . $uid . " and handle " . $handle, Logger::DEBUG);
return false;
}
- $contact = dba::selectFirst('contact', [], ['id' => $cid]);
+ $contact = DBA::selectFirst('contact', [], ['id' => $cid]);
if (!DBA::isResult($contact)) {
// This here shouldn't happen at all
- logger("Haven't found a contact for user " . $uid . " and handle " . $handle, LOGGER_DEBUG);
+ Logger::log("Haven't found a contact for user " . $uid . " and handle " . $handle, Logger::DEBUG);
return false;
}
// 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))) {
- // dba::update(
+ // DBA::update(
// 'contact',
// array('rel' => Contact::FRIEND, 'writable' => true),
// array('id' => $contact["id"], 'uid' => $contact["uid"])
// );
//
// $contact["rel"] = Contact::FRIEND;
- // logger("defining user ".$contact["nick"]." as friend");
+ // Logger::log("defining user ".$contact["nick"]." as friend");
//}
// We don't seem to like that person
{
$contact = self::contactByHandle($importer["uid"], $handle);
if (!$contact) {
- logger("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
+ Logger::log("A Contact for handle ".$handle." and user ".$importer["uid"]." was not found");
// If a contact isn't found, we accept it anyway if it is a comment
if ($is_comment && ($importer["uid"] != 0)) {
return self::contactByHandle(0, $handle);
}
if (!self::postAllow($importer, $contact, $is_comment)) {
- logger("The handle: ".$handle." is not allowed to post to user ".$importer["uid"]);
+ Logger::log("The handle: ".$handle." is not allowed to post to user ".$importer["uid"]);
return false;
}
return $contact;
{
$item = Item::selectFirst(['id'], ['uid' => $uid, 'guid' => $guid]);
if (DBA::isResult($item)) {
- logger("message ".$guid." already exists for user ".$uid);
+ Logger::log("message ".$guid." already exists for user ".$uid);
return $item["id"];
}
);
preg_replace_callback(
- "&\[url=/posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
+ "&\[url=/?posts/([^\[\]]*)\](.*)\[\/url\]&Usi",
function ($match) use ($item) {
self::fetchGuidSub($match, $item);
},
$server = $serverparts["scheme"]."://".$serverparts["host"];
- logger("Trying to fetch item ".$guid." from ".$server, LOGGER_DEBUG);
+ Logger::log("Trying to fetch item ".$guid." from ".$server, Logger::DEBUG);
$msg = self::message($guid, $server);
return false;
}
- logger("Successfully fetched item ".$guid." from ".$server, LOGGER_DEBUG);
+ Logger::log("Successfully fetched item ".$guid." from ".$server, Logger::DEBUG);
// Now call the dispatcher
return self::dispatchPublic($msg);
// This will work for new Diaspora servers and Friendica servers from 3.5
$source_url = $server."/fetch/post/".urlencode($guid);
- logger("Fetch post from ".$source_url, LOGGER_DEBUG);
+ Logger::log("Fetch post from ".$source_url, Logger::DEBUG);
$envelope = Network::fetchUrl($source_url);
if ($envelope) {
- logger("Envelope was fetched.", LOGGER_DEBUG);
+ Logger::log("Envelope was fetched.", Logger::DEBUG);
$x = self::verifyMagicEnvelope($envelope);
if (!$x) {
- logger("Envelope could not be verified.", LOGGER_DEBUG);
+ Logger::log("Envelope could not be verified.", Logger::DEBUG);
} else {
- logger("Envelope was verified.", LOGGER_DEBUG);
+ Logger::log("Envelope was verified.", Logger::DEBUG);
}
} else {
$x = false;
// This will work for older Diaspora and Friendica servers
if (!$x) {
$source_url = $server."/p/".urlencode($guid).".xml";
- logger("Fetch post from ".$source_url, LOGGER_DEBUG);
+ Logger::log("Fetch post from ".$source_url, Logger::DEBUG);
$x = Network::fetchUrl($source_url);
if (!$x) {
if ($source_xml->post->reshare) {
// Reshare of a reshare - old Diaspora version
- logger("Message is a reshare", LOGGER_DEBUG);
+ Logger::log("Message is a reshare", Logger::DEBUG);
return self::message($source_xml->post->reshare->root_guid, $server, ++$level);
} elseif ($source_xml->getName() == "reshare") {
// Reshare of a reshare - new Diaspora version
- logger("Message is a new reshare", LOGGER_DEBUG);
+ Logger::log("Message is a new reshare", Logger::DEBUG);
return self::message($source_xml->root_guid, $server, ++$level);
}
// If this isn't a "status_message" then quit
if (!$author) {
- logger("Message doesn't seem to be a status message", LOGGER_DEBUG);
+ Logger::log("Message doesn't seem to be a status message", Logger::DEBUG);
return false;
}
$item = Item::selectFirst($fields, $condition);
if (!DBA::isResult($item)) {
- if (!isset($contact["url"])) {
- logger('Missing URL: ' . System::callstack() . ' - ' . json_encode($contact));
- }
-
- $result = self::storeByGuid($guid, $contact["url"], $uid);
+ $person = self::personByHandle($author);
+ $result = self::storeByGuid($guid, $person["url"], $uid);
- if (!$result) {
- $person = self::personByHandle($author);
- $result = self::storeByGuid($guid, $person["url"], $uid);
+ // 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) {
- logger("Fetched missing item ".$guid." - result: ".$result, LOGGER_DEBUG);
+ Logger::log("Fetched missing item ".$guid." - result: ".$result, Logger::DEBUG);
$item = Item::selectFirst($fields, $condition);
}
}
if (!DBA::isResult($item)) {
- logger("parent item not found: parent: ".$guid." - user: ".$uid);
+ Logger::log("parent item not found: parent: ".$guid." - user: ".$uid);
return false;
} else {
- logger("parent item found: parent: ".$guid." - user: ".$uid);
+ Logger::log("parent item found: parent: ".$guid." - user: ".$uid);
return $item;
}
}
$network = $contact["network"];
} else {
$cid = $def_contact["id"];
- $network = NETWORK_DIASPORA;
+ $network = Protocol::DIASPORA;
}
return ["cid" => $cid, "network" => $network];
}
}
- if ($contact["network"] == NETWORK_DFRN) {
+ if ($contact["network"] == Protocol::DFRN) {
return str_replace("/profile/" . $contact["nick"] . "/", "/display/" . $guid, $contact["url"] . "/");
}
$contact = self::contactByHandle($importer["uid"], $old_handle);
if (!$contact) {
- logger("cannot find contact for sender: ".$old_handle." and user ".$importer["uid"]);
+ Logger::log("cannot find contact for sender: ".$old_handle." and user ".$importer["uid"]);
return false;
}
- logger("Got migration for ".$old_handle.", to ".$new_handle." with user ".$importer["uid"]);
+ Logger::log("Got migration for ".$old_handle.", to ".$new_handle." with user ".$importer["uid"]);
// Check signature
$signed_text = 'AccountMigration:'.$old_handle.':'.$new_handle;
$key = self::key($old_handle);
if (!Crypto::rsaVerify($signed_text, $signature, $key, "sha256")) {
- logger('No valid signature for migration.');
+ Logger::log('No valid signature for migration.');
return false;
}
// change the technical stuff in contact and gcontact
$data = Probe::uri($new_handle);
- if ($data['network'] == NETWORK_PHANTOM) {
- logger('Account for '.$new_handle." couldn't be probed.");
+ if ($data['network'] == Protocol::PHANTOM) {
+ Logger::log('Account for '.$new_handle." couldn't be probed.");
return false;
}
DBA::update('gcontact', $fields, ['addr' => $old_handle]);
- logger('Contacts are updated.');
+ Logger::log('Contacts are updated.');
return true;
}
DBA::delete('gcontact', ['addr' => $author]);
- logger('Removed contacts for ' . $author);
+ Logger::log('Removed contacts for ' . $author);
return true;
}
if (DBA::isResult($item)) {
return $item["uri"];
} elseif (!$onlyfound) {
- $contact = Contact::getDetailsByAddr($author, 0);
- if (!empty($contact['network'])) {
- $prefix = 'urn:X-' . $contact['network'] . ':';
- } else {
- // This fallback should happen most unlikely
- $prefix = 'urn:X-dspr:';
- }
+ $person = self::personByHandle($author);
- $author_parts = explode('@', $author);
+ $parts = parse_url($person['url']);
+ unset($parts['path']);
+ $host_url = Network::unparseURL($parts);
- return $prefix . $author_parts[1] . ':' . $author_parts[0] . ':'. $guid;
+ return $host_url . '/objects/' . $guid;
}
return "";
{
$item = Item::selectFirst(['uid'], ['origin' => true, 'guid' => $guid]);
if (DBA::isResult($item)) {
- logger("Found user ".$item['uid']." as owner of item ".$guid, LOGGER_DEBUG);
+ Logger::log("Found user ".$item['uid']." as owner of item ".$guid, Logger::DEBUG);
$contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $item['uid']]);
if (DBA::isResult($contact)) {
return $contact;
$person = self::personByHandle($author);
if (!is_array($person)) {
- logger("unable to find author details");
+ Logger::log("unable to find author details");
return false;
}
$datarray["object-type"] = ACTIVITY_OBJ_COMMENT;
- $datarray["protocol"] = PROTOCOL_DIASPORA;
+ $datarray["protocol"] = Conversation::PARCEL_DIASPORA;
$datarray["source"] = $xml;
$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
}
if ($message_id) {
- logger("Stored comment ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+ Logger::log("Stored comment ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
if ($datarray['uid'] == 0) {
Item::distribute($message_id, json_encode($data));
}
$msg_created_at = DateTimeFormat::utc(notags(unxmlify($mesg->created_at)));
if ($msg_conversation_guid != $guid) {
- logger("message conversation guid does not belong to the current conversation.");
+ Logger::log("message conversation guid does not belong to the current conversation.");
return false;
}
DBA::lock('mail');
- $r = q(
- "SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
- DBA::escape($msg_guid),
- intval($importer["uid"])
- );
- if (DBA::isResult($r)) {
- logger("duplicate message already delivered.", LOGGER_DEBUG);
+ if (DBA::exists('mail', ['guid' => $msg_guid, 'uid' => $importer["uid"]])) {
+ Logger::log("duplicate message already delivered.", Logger::DEBUG);
return false;
}
"to_name" => $importer["username"],
"to_email" => $importer["email"],
"uid" =>$importer["uid"],
- "item" => ["subject" => $subject, "body" => $body],
+ "item" => ["id" => $conversation["id"], "title" => $subject, "subject" => $subject, "body" => $body],
"source_name" => $person["name"],
"source_link" => $person["url"],
- "source_photo" => $person["thumb"],
+ "source_photo" => $person["photo"],
"verb" => ACTIVITY_POST,
"otype" => "mail"]
);
$messages = $data->message;
if (!count($messages)) {
- logger("empty conversation");
+ Logger::log("empty conversation");
return false;
}
return false;
}
- $conversation = null;
-
- $c = q(
- "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
- intval($importer["uid"]),
- DBA::escape($guid)
- );
- if ($c)
- $conversation = $c[0];
- else {
+ $conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
+ if (!DBA::isResult($conversation)) {
$r = q(
"INSERT INTO `conv` (`uid`, `guid`, `creator`, `created`, `updated`, `subject`, `recips`)
VALUES (%d, '%s', '%s', '%s', '%s', '%s', '%s')",
DBA::escape($participants)
);
if ($r) {
- $c = q(
- "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
- intval($importer["uid"]),
- DBA::escape($guid)
- );
- }
-
- if ($c) {
- $conversation = $c[0];
+ $conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
}
}
if (!$conversation) {
- logger("unable to create conversation.");
+ Logger::log("unable to create conversation.");
return false;
}
$person = self::personByHandle($author);
if (!is_array($person)) {
- logger("unable to find author details");
+ Logger::log("unable to find author details");
return false;
}
$datarray = [];
- $datarray["protocol"] = PROTOCOL_DIASPORA;
+ $datarray["protocol"] = Conversation::PARCEL_DIASPORA;
$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["owner-link"] = $contact["url"];
- $datarray["owner-id"] = Contact::getIdForURL($contact["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);
}
if ($message_id) {
- logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+ Logger::log("Stored like ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
if ($datarray['uid'] == 0) {
Item::distribute($message_id, json_encode($data));
}
$conversation = null;
- $c = q(
- "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
- intval($importer["uid"]),
- DBA::escape($conversation_guid)
- );
- if ($c) {
- $conversation = $c[0];
- } else {
- logger("conversation not available.");
+ $condition = ['uid' => $importer["uid"], 'guid' => $conversation_guid];
+ $conversation = DBA::selectFirst('conv', [], $condition);
+
+ if (!DBA::isResult($conversation)) {
+ Logger::log("conversation not available.");
return false;
}
$person = self::personByHandle($author);
if (!$person) {
- logger("unable to find author details");
+ Logger::log("unable to find author details");
return false;
}
DBA::lock('mail');
- $r = q(
- "SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
- DBA::escape($guid),
- intval($importer["uid"])
- );
- if (DBA::isResult($r)) {
- logger("duplicate message already delivered.", LOGGER_DEBUG);
+ if (DBA::exists('mail', ['guid' => $guid, 'uid' => $importer["uid"]])) {
+ Logger::log("duplicate message already delivered.", Logger::DEBUG);
return false;
}
$contact_id = Contact::getIdForURL($author);
if (!$contact_id) {
- logger('Contact not found: '.$author);
+ Logger::log('Contact not found: '.$author);
return false;
}
$person = self::personByHandle($author);
if (!is_array($person)) {
- logger("Person not found: ".$author);
+ Logger::log("Person not found: ".$author);
return false;
}
$item = Item::selectFirst(['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => false]);
if (!DBA::isResult($item)) {
- logger('Item not found, no origin or private: '.$parent_guid);
+ Logger::log('Item not found, no origin or private: '.$parent_guid);
return false;
}
$server = $author;
}
- logger('Received participation for ID: '.$item['id'].' - Contact: '.$contact_id.' - Server: '.$server, LOGGER_DEBUG);
+ Logger::log('Received participation for ID: '.$item['id'].' - Contact: '.$contact_id.' - Server: '.$server, Logger::DEBUG);
if (!DBA::exists('participation', ['iid' => $item['id'], 'server' => $server])) {
DBA::insert('participation', ['iid' => $item['id'], 'cid' => $contact_id, 'fid' => $person['id'], 'server' => $server]);
} else {
$cmd = $comment['self'] ? 'like' : 'comment-import';
}
- logger("Send ".$cmd." for item ".$comment['id']." to contact ".$contact_id, LOGGER_DEBUG);
+ Logger::log("Send ".$cmd." for item ".$comment['id']." to contact ".$contact_id, Logger::DEBUG);
Worker::add(PRIORITY_HIGH, 'Delivery', $cmd, $comment['id'], $contact_id);
}
DBA::close($comments);
DBA::update('contact', $fields, ['id' => $contact['id']]);
- $gcontact = ["url" => $contact["url"], "network" => NETWORK_DIASPORA, "generation" => 2,
+ $gcontact = ["url" => $contact["url"], "network" => Protocol::DIASPORA, "generation" => 2,
"photo" => $image_url, "name" => $name, "location" => $location,
"about" => $about, "birthday" => $birthday, "gender" => $gender,
"addr" => $author, "nick" => $nick, "keywords" => $keywords,
GContact::link($gcid, $importer["uid"], $contact["id"]);
- logger("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], LOGGER_DEBUG);
+ Logger::log("Profile of contact ".$contact["id"]." stored for user ".$importer["uid"], Logger::DEBUG);
return true;
}
// That makes us friends.
if ($contact) {
if ($following) {
- logger("Author ".$author." (Contact ".$contact["id"].") wants to follow us.", LOGGER_DEBUG);
+ Logger::log("Author ".$author." (Contact ".$contact["id"].") wants to follow us.", Logger::DEBUG);
self::receiveRequestMakeFriend($importer, $contact);
// refetch the contact array
// 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])) {
- $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
- if ($u) {
- logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
- $ret = self::sendShare($u[0], $contact);
+ $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);
}
}
return true;
} else {
- logger("Author ".$author." doesn't want to follow us anymore.", LOGGER_DEBUG);
+ Logger::log("Author ".$author." doesn't want to follow us anymore.", Logger::DEBUG);
Contact::removeFollower($importer, $contact);
return true;
}
}
if (!$following && $sharing && in_array($importer["page-flags"], [Contact::PAGE_SOAPBOX, Contact::PAGE_NORMAL])) {
- logger("Author ".$author." wants to share with us - but doesn't want to listen. Request is ignored.", LOGGER_DEBUG);
+ 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) {
- logger("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.", LOGGER_DEBUG);
+ Logger::log("Author ".$author." doesn't want anything - and we don't know the author. Request is ignored.", Logger::DEBUG);
return false;
} elseif (!$following && $sharing) {
- logger("Author ".$author." wants to share with us.", LOGGER_DEBUG);
+ Logger::log("Author ".$author." wants to share with us.", Logger::DEBUG);
} elseif ($following && $sharing) {
- logger("Author ".$author." wants to have a bidirectional conection.", LOGGER_DEBUG);
+ Logger::log("Author ".$author." wants to have a bidirectional conection.", Logger::DEBUG);
} elseif ($following && !$sharing) {
- logger("Author ".$author." wants to listen to us.", LOGGER_DEBUG);
+ Logger::log("Author ".$author." wants to listen to us.", Logger::DEBUG);
}
$ret = self::personByHandle($author);
- if (!$ret || ($ret["network"] != NETWORK_DIASPORA)) {
- logger("Cannot resolve diaspora handle ".$author." for ".$recipient);
+ if (!$ret || ($ret["network"] != Protocol::DIASPORA)) {
+ Logger::log("Cannot resolve diaspora handle ".$author." for ".$recipient);
return false;
}
$contact_record = self::contactByHandle($importer["uid"], $author);
if (!$contact_record) {
- logger("unable to locate newly created contact record.");
+ Logger::log("unable to locate newly created contact record.");
return;
}
- logger("Author ".$author." was added as contact number ".$contact_record["id"].".", LOGGER_DEBUG);
+ Logger::log("Author ".$author." was added as contact number ".$contact_record["id"].".", Logger::DEBUG);
Group::addMember(User::getDefaultGroup($importer['uid'], $ret["network"]), $contact_record['id']);
Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
if (in_array($importer["page-flags"], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP])) {
- logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
+ Logger::log("Sending intra message for author ".$author.".", Logger::DEBUG);
$hash = random_string().(string)time(); // Generate a confirm_key
} else {
// automatic friend approval
- logger("Does an automatic friend approval for author ".$author.".", LOGGER_DEBUG);
+ Logger::log("Does an automatic friend approval for author ".$author.".", Logger::DEBUG);
Contact::updateAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
- // technically they are sharing with us (Contact::SHARING),
- // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
- // we are going to change the relationship and make them a follower.
-
+ /*
+ * technically they are sharing with us (Contact::SHARING),
+ * 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) {
$new_relation = Contact::FRIEND;
} elseif (($importer["page-flags"] == Contact::PAGE_FREELOVE) && $sharing) {
intval($contact_record["id"])
);
- $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
- if ($u) {
- logger("Sending share message (Relation: ".$new_relation.") to author ".$author." - Contact: ".$contact_record["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
- $ret = self::sendShare($u[0], $contact_record);
+ $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);
// Send the profile data, maybe it weren't transmitted before
self::sendProfile($importer["uid"], [$contact_record]);
public static function originalItem($guid, $orig_author)
{
if (empty($guid)) {
- logger('Empty guid. Quitting.');
+ Logger::log('Empty guid. Quitting.');
return false;
}
$item = Item::selectFirst($fields, $condition);
if (DBA::isResult($item)) {
- logger("reshared message ".$guid." already exists on system.");
+ Logger::log("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 (!DBA::isResult($item)) {
if (empty($orig_author)) {
- logger('Empty author for guid ' . $guid . '. Quitting.');
+ Logger::log('Empty author for guid ' . $guid . '. Quitting.');
return false;
}
$server = "https://".substr($orig_author, strpos($orig_author, "@") + 1);
- logger("1st try: reshared message ".$guid." will be fetched via SSL from the server ".$server);
+ Logger::log("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("2nd try: reshared message ".$guid." will be fetched without SSL from the server ".$server);
+ Logger::log("2nd try: reshared message ".$guid." will be fetched without SSL from the server ".$server);
$stored = self::storeByGuid($guid, $server);
}
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $contact["id"];
- $datarray["network"] = NETWORK_DIASPORA;
+ $datarray["network"] = Protocol::DIASPORA;
$datarray["author-link"] = $contact["url"];
$datarray["author-id"] = Contact::getIdForURL($contact["url"], 0);
$datarray["verb"] = ACTIVITY_POST;
$datarray["gravity"] = GRAVITY_PARENT;
- $datarray["protocol"] = PROTOCOL_DIASPORA;
+ $datarray["protocol"] = Conversation::PARCEL_DIASPORA;
$datarray["source"] = $xml;
$prefix = share_header(
self::sendParticipation($contact, $datarray);
if ($message_id) {
- logger("Stored reshare ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+ Logger::log("Stored reshare ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
if ($datarray['uid'] == 0) {
Item::distribute($message_id);
}
$person = self::personByHandle($author);
if (!is_array($person)) {
- logger("unable to find author detail for ".$author);
+ Logger::log("unable to find author detail for ".$author);
return false;
}
$r = Item::select($fields, $condition);
if (!DBA::isResult($r)) {
- logger("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");
+ Logger::log("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");
return false;
}
while ($item = Item::fetch($r)) {
if (strstr($item['file'], '[')) {
- logger("Target guid " . $target_guid . " for user " . $item['uid'] . " is filed. So it won't be deleted.", LOGGER_DEBUG);
+ Logger::log("Target guid " . $target_guid . " for user " . $item['uid'] . " is filed. So it won't be deleted.", Logger::DEBUG);
continue;
}
// Only delete it if the parent author really fits
if (!link_compare($parent["author-link"], $contact["url"]) && !link_compare($item["author-link"], $contact["url"])) {
- logger("Thread author ".$parent["author-link"]." and item author ".$item["author-link"]." don't fit to expected contact ".$contact["url"], LOGGER_DEBUG);
+ Logger::log("Thread author ".$parent["author-link"]." and item author ".$item["author-link"]." don't fit to expected contact ".$contact["url"], Logger::DEBUG);
continue;
}
Item::delete(['id' => $item['id']]);
- logger("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item["parent"], LOGGER_DEBUG);
+ Logger::log("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item["parent"], Logger::DEBUG);
}
return true;
$contact = self::contactByHandle($importer["uid"], $sender);
if (!$contact && (in_array($target_type, ["Contact", "Person"]))) {
- logger("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
+ Logger::log("cannot find contact for sender: ".$sender." and user ".$importer["uid"]);
return false;
}
$contact = [];
}
- logger("Got retraction for ".$target_type.", sender ".$sender." and user ".$importer["uid"], LOGGER_DEBUG);
+ Logger::log("Got retraction for ".$target_type.", sender ".$sender." and user ".$importer["uid"], Logger::DEBUG);
switch ($target_type) {
case "Comment":
break;
default:
- logger("Unknown target type ".$target_type);
+ Logger::log("Unknown target type ".$target_type);
return false;
}
return true;
*
* @return int The message id of the newly created item
*/
- private static function receiveStatusMessage(array $importer, $data, $xml)
+ private static function receiveStatusMessage(array $importer, SimpleXMLElement $data, $xml)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $contact["id"];
- $datarray["network"] = NETWORK_DIASPORA;
+ $datarray["network"] = Protocol::DIASPORA;
$datarray["author-link"] = $contact["url"];
$datarray["author-id"] = Contact::getIdForURL($contact["url"], 0);
$datarray["verb"] = ACTIVITY_POST;
$datarray["gravity"] = GRAVITY_PARENT;
- $datarray["protocol"] = PROTOCOL_DIASPORA;
+ $datarray["protocol"] = Conversation::PARCEL_DIASPORA;
$datarray["source"] = $xml;
$datarray["body"] = self::replacePeopleGuid($body, $contact["url"]);
self::sendParticipation($contact, $datarray);
if ($message_id) {
- logger("Stored item ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+ Logger::log("Stored item ".$datarray["guid"]." with message id ".$message_id, Logger::DEBUG);
if ($datarray['uid'] == 0) {
Item::distribute($message_id);
}
*/
public static function encodePrivateData($msg, array $user, array $contact, $prvkey, $pubkey)
{
- logger("Message: ".$msg, LOGGER_DATA);
+ Logger::log("Message: ".$msg, Logger::DATA);
// without a public key nothing will work
if (!$pubkey) {
- logger("pubkey missing: contact id: ".$contact["id"]);
+ Logger::log("pubkey missing: contact id: ".$contact["id"]);
return false;
}
}
if (!$dest_url) {
- logger("no url for contact: ".$contact["id"]." batch mode =".$public_batch);
+ Logger::log("no url for contact: ".$contact["id"]." batch mode =".$public_batch);
return 0;
}
- logger("transmit: ".$logid."-".$guid." ".$dest_url);
+ Logger::log("transmit: ".$logid."-".$guid." ".$dest_url);
if (!$queue_run && Queue::wasDelayed($contact["id"])) {
$return_code = 0;
if (!intval(Config::get("system", "diaspora_test"))) {
$content_type = (($public_batch) ? "application/magic-envelope+xml" : "application/json");
- Network::post($dest_url."/", $envelope, ["Content-Type: ".$content_type]);
- $return_code = $a->get_curl_code();
+ $postResult = Network::post($dest_url."/", $envelope, ["Content-Type: ".$content_type]);
+ $return_code = $postResult->getReturnCode();
} else {
- logger("test_mode");
+ Logger::log("test_mode");
return 200;
}
}
- logger("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
+ Logger::log("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
- if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
- if (!$no_queue && ($contact['contact-type'] != Contact::ACCOUNT_TYPE_RELAY)) {
- logger("queue message");
+ 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"], NETWORK_DIASPORA, $envelope, $public_batch, $guid);
+ Queue::add($contact["id"], Protocol::DIASPORA, $envelope, $public_batch, $guid);
}
// The message could not be delivered. We mark the contact as "dead"
{
$msg = self::buildPostXml($type, $message);
- logger('message: '.$msg, LOGGER_DATA);
- logger('send guid '.$guid, LOGGER_DEBUG);
+ Logger::log('message: '.$msg, Logger::DATA);
+ Logger::log('send guid '.$guid, Logger::DEBUG);
// Fallback if the private key wasn't transmitted in the expected field
if (empty($owner['uprvkey'])) {
$envelope = self::buildMessage($msg, $owner, $contact, $owner['uprvkey'], $contact['pubkey'], $public_batch);
if ($spool) {
- Queue::add($contact['id'], NETWORK_DIASPORA, $envelope, $public_batch, $guid);
+ Queue::add($contact['id'], Protocol::DIASPORA, $envelope, $public_batch, $guid);
return true;
} else {
$return_code = self::transmit($owner, $contact, $envelope, $public_batch, false, $guid);
}
- logger("guid: ".$guid." result ".$return_code, LOGGER_DEBUG);
+ Logger::log("guid: ".$guid." result ".$return_code, Logger::DEBUG);
return $return_code;
}
$author = self::myHandle($owner);
$message = ["author" => $author,
- "guid" => System::createGUID(32),
+ "guid" => System::createUUID(),
"parent_type" => "Post",
"parent_guid" => $item["guid"]];
- logger("Send participation for ".$item["guid"]." by ".$author, LOGGER_DEBUG);
+ Logger::log("Send participation for ".$item["guid"]." by ".$author, Logger::DEBUG);
// It doesn't matter what we store, we only want to avoid sending repeated notifications for the same item
- Cache::set($cachekey, $item["guid"], CACHE_QUARTER_HOUR);
+ Cache::set($cachekey, $item["guid"], Cache::QUARTER_HOUR);
return self::buildAndTransmit($owner, $contact, "participation", $message);
}
"profile" => $profile,
"signature" => $signature];
- logger("Send account migration ".print_r($message, true), LOGGER_DEBUG);
+ Logger::log("Send account migration ".print_r($message, true), Logger::DEBUG);
return self::buildAndTransmit($owner, $contact, "account_migration", $message);
}
"following" => "true",
"sharing" => "true"];
- logger("Send share ".print_r($message, true), LOGGER_DEBUG);
+ Logger::log("Send share ".print_r($message, true), Logger::DEBUG);
return self::buildAndTransmit($owner, $contact, "contact", $message);
}
"following" => "false",
"sharing" => "false"];
- logger("Send unshare ".print_r($message, true), LOGGER_DEBUG);
+ Logger::log("Send unshare ".print_r($message, true), Logger::DEBUG);
return self::buildAndTransmit($owner, $contact, "contact", $message);
}
}
if (($guid != "") && $complete) {
- $condition = ['guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]];
+ $condition = ['guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
$item = Item::selectFirst(['contact-id'], $condition);
if (DBA::isResult($item)) {
$ret= [];
/// @todo - establish "all day" events in Friendica
$eventdata["all_day"] = "false";
- if (!$event['adjust']) {
+ $eventdata['timezone'] = 'UTC';
+ if (!$event['adjust'] && $user['timezone']) {
$eventdata['timezone'] = $user['timezone'];
-
- if ($eventdata['timezone'] == "") {
- $eventdata['timezone'] = 'UTC';
- }
}
if ($event['start']) {
$myaddr = self::myHandle($owner);
- $public = (($item["private"]) ? "false" : "true");
+ $public = ($item["private"] ? "false" : "true");
$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
$msg = ["type" => $type, "message" => $message];
- Cache::set($cachekey, $msg, CACHE_QUARTER_HOUR);
+ Cache::set($cachekey, $msg, Cache::QUARTER_HOUR);
return $msg;
}
$attend_answer = 'tentative';
break;
default:
- logger('Unknown verb '.$item['verb'].' in item '.$item['guid']);
+ Logger::log('Unknown verb '.$item['verb'].' in item '.$item['guid']);
return false;
}
$comment['thread_parent_guid'] = self::getGuidFromUri($item['thr-parent'], $item['uid']);
}
- Cache::set($cachekey, $comment, CACHE_QUARTER_HOUR);
+ Cache::set($cachekey, $comment, Cache::QUARTER_HOUR);
return($comment);
}
*
* @return string The message
*/
- private static function messageFromSignature(array $item, array $signature)
+ private static function messageFromSignature(array $item)
{
// Split the signed text
- $signed_parts = explode(";", $signature['signed_text']);
+ $signed_parts = explode(";", $item['signed_text']);
if ($item["deleted"]) {
- $message = ["author" => $signature['signer'],
+ $message = ["author" => $item['signer'],
"target_guid" => $signed_parts[0],
"target_type" => $signed_parts[1]];
} elseif (in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
"parent_guid" => $signed_parts[3],
"parent_type" => $signed_parts[2],
"positive" => $signed_parts[0],
- "author_signature" => $signature['signature'],
+ "author_signature" => $item['signature'],
"parent_author_signature" => ""];
} else {
// Remove the comment guid
"guid" => $guid,
"parent_guid" => $parent_guid,
"text" => implode(";", $signed_parts),
- "author_signature" => $signature['signature'],
+ "author_signature" => $item['signature'],
"parent_author_signature" => ""];
}
return $message;
$type = "comment";
}
- logger("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG);
-
- // fetch the original signature
-
- $r = q(
- "SELECT `signed_text`, `signature`, `signer` FROM `sign` WHERE `iid` = %d LIMIT 1",
- intval($item["id"])
- );
-
- if (!$r) {
- logger("Couldn't fetch signatur for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG);
- return false;
- }
-
- $signature = $r[0];
+ Logger::log("Got relayable data ".$type." for item ".$item["guid"]." (".$item["id"].")", Logger::DEBUG);
// Old way - is used by the internal Friendica functions
/// @todo Change all signatur storing functions to the new format
- if ($signature['signed_text'] && $signature['signature'] && $signature['signer']) {
- $message = self::messageFromSignature($item, $signature);
+ if ($item['signed_text'] && $item['signature'] && $item['signer']) {
+ $message = self::messageFromSignature($item);
} else {// New way
- $msg = json_decode($signature['signed_text'], true);
+ $msg = json_decode($item['signed_text'], true);
$message = [];
if (is_array($msg)) {
$message[$field] = $data;
}
} else {
- logger("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$signature['signed_text'], LOGGER_DEBUG);
+ Logger::log("Signature text for item ".$item["guid"]." (".$item["id"].") couldn't be extracted: ".$item['signed_text'], Logger::DEBUG);
}
}
$message["parent_author_signature"] = self::signature($owner, $message);
- logger("Relayed data ".print_r($message, true), LOGGER_DEBUG);
+ Logger::log("Relayed data ".print_r($message, true), Logger::DEBUG);
return self::buildAndTransmit($owner, $contact, $type, $message, $public_batch, $item["guid"]);
}
"target_guid" => $item['guid'],
"target_type" => $target_type];
- logger("Got message ".print_r($message, true), LOGGER_DEBUG);
+ Logger::log("Got message ".print_r($message, true), Logger::DEBUG);
return self::buildAndTransmit($owner, $contact, $msg_type, $message, $public_batch, $item["guid"]);
}
{
$myaddr = self::myHandle($owner);
- $r = q(
- "SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($item["convid"]),
- intval($item["uid"])
- );
-
- if (!DBA::isResult($r)) {
- logger("conversation not found.");
+ $cnv = DBA::selectFirst('conv', [], ['id' => $item["convid"], 'uid' => $item["uid"]]);
+ if (!DBA::isResult($cnv)) {
+ Logger::log("conversation not found.");
return;
}
- $cnv = $r[0];
$conv = [
"author" => $cnv["creator"],
$arr = explode(' ', $profile['pub_keywords']);
if (count($arr)) {
for ($x = 0; $x < 5; $x ++) {
- if (trim($arr[$x])) {
+ if (!empty($arr[$x])) {
$tags .= '#'. trim($arr[$x]) .' ';
}
}
$recips = q(
"SELECT `id`,`name`,`network`,`pubkey`,`notify` FROM `contact` WHERE `network` = '%s'
AND `uid` = %d AND `rel` != %d",
- DBA::escape(NETWORK_DIASPORA),
+ DBA::escape(Protocol::DIASPORA),
intval($uid),
intval(Contact::SHARING)
);
$message = self::createProfileData($uid);
foreach ($recips as $recip) {
- logger("Send updated profile data for user ".$uid." to contact ".$recip["id"], LOGGER_DEBUG);
+ Logger::log("Send updated profile data for user ".$uid." to contact ".$recip["id"], Logger::DEBUG);
self::buildAndTransmit($owner, $recip, "profile", $message, false, "", false);
}
}
/**
- * @brief Stores the signature for likes that are created on our system
+ * @brief Creates the signature for likes that are created on our system
*
- * @param array $contact The contact array of the "like"
- * @param int $post_id The post id of the "like"
+ * @param integer $uid The user of that comment
+ * @param array $item Item array
*
- * @return bool Success
+ * @return array Signed content
*/
- public static function storeLikeSignature(array $contact, $post_id)
+ public static function createLikeSignature($uid, array $item)
{
- // Is the contact the owner? Then fetch the private key
- if (!$contact['self'] || ($contact['uid'] == 0)) {
- logger("No owner post, so not storing signature", LOGGER_DEBUG);
- return false;
- }
-
- $r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid']));
- if (!DBA::isResult($r)) {
- return false;
- }
-
- $contact["uprvkey"] = $r[0]['prvkey'];
-
- $item = Item::selectFirst([], ['id' => $post_id]);
- if (!DBA::isResult($item)) {
+ $owner = User::getOwnerDataById($uid);
+ if (empty($owner)) {
+ Logger::log("No owner post, so not storing signature", Logger::DEBUG);
return false;
}
return false;
}
- $message = self::constructLike($item, $contact);
+ $message = self::constructLike($item, $owner);
if ($message === false) {
return false;
}
- $message["author_signature"] = self::signature($contact, $message);
-
- /*
- * Now store the signature more flexible to dynamically support new fields.
- * This will break Diaspora compatibility with Friendica versions prior to 3.5.
- */
- DBA::insert('sign', ['iid' => $post_id, 'signed_text' => json_encode($message)]);
+ $message["author_signature"] = self::signature($owner, $message);
- logger('Stored diaspora like signature');
- return true;
+ return $message;
}
/**
- * @brief Stores the signature for comments that are created on our system
+ * @brief Creates the signature for Comments that are created on our system
*
- * @param array $item The item array of the comment
- * @param array $contact The contact array of the item owner
- * @param string $uprvkey The private key of the sender
- * @param int $message_id The message id of the comment
+ * @param integer $uid The user of that comment
+ * @param array $item Item array
*
- * @return bool Success
+ * @return array Signed content
*/
- public static function storeCommentSignature(array $item, array $contact, $uprvkey, $message_id)
+ public static function createCommentSignature($uid, array $item)
{
- if ($uprvkey == "") {
- logger('No private key, so not storing comment signature', LOGGER_DEBUG);
+ $owner = User::getOwnerDataById($uid);
+ if (empty($owner)) {
+ Logger::log("No owner post, so not storing signature", Logger::DEBUG);
return false;
}
- $contact["uprvkey"] = $uprvkey;
+ // This is a workaround for the behaviour of the "insert" function, see mod/item.php
+ $item['thr-parent'] = $item['parent-uri'];
+
+ $parent = Item::selectFirst(['parent-uri'], ['uri' => $item['parent-uri']]);
+ if (!DBA::isResult($parent)) {
+ return;
+ }
+
+ $item['parent-uri'] = $parent['parent-uri'];
- $message = self::constructComment($item, $contact);
+ $message = self::constructComment($item, $owner);
if ($message === false) {
return false;
}
- $message["author_signature"] = self::signature($contact, $message);
-
- /*
- * Now store the signature more flexible to dynamically support new fields.
- * This will break Diaspora compatibility with Friendica versions prior to 3.5.
- */
- DBA::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($message)]);
+ $message["author_signature"] = self::signature($owner, $message);
- logger('Stored diaspora comment signature');
- return true;
+ return $message;
}
}
projects / friendica.git / blobdiff