use Friendica\Core\Config;
use Friendica\Core\L10n;
use Friendica\Core\PConfig;
+use Friendica\Core\Protocol;
use Friendica\Core\System;
use Friendica\Core\Worker;
-use Friendica\Database\DBM;
+use Friendica\Database\DBA;
use Friendica\Model\Contact;
+use Friendica\Model\Conversation;
use Friendica\Model\GContact;
use Friendica\Model\Group;
use Friendica\Model\Item;
use Friendica\Network\Probe;
use Friendica\Util\Crypto;
use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Map;
use Friendica\Util\Network;
use Friendica\Util\XML;
-use Friendica\Util\Map;
-use dba;
use SimpleXMLElement;
require_once 'include/dba.php';
*
* The list contains not only the official relays but also servers that we serve directly
*
- * @param integer $item_id The id of the item that is sent
+ * @param integer $item_id The id of the item that is sent
+ * @param array $contacts The previously fetched contacts
+ *
* @return array of relay servers
*/
- public static function relayList($item_id)
+ public static function relayList($item_id, array $contacts = [])
{
$serverlist = [];
// Fetching relay servers
$serverdata = Config::get("system", "relay_server");
- if ($serverdata != "") {
+
+ if (!empty($serverdata)) {
$servers = explode(",", $serverdata);
foreach ($servers as $server) {
$serverlist[$server] = trim($server);
}
if (Config::get("system", "relay_directly", false)) {
+ // We distribute our stuff based on the parent to ensure that the thread will be complete
+ $parent = Item::selectFirst(['parent'], ['id' => $item_id]);
+ if (!DBA::isResult($parent)) {
+ return;
+ }
+
// Servers that want to get all content
- $servers = dba::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'all']);
- while ($server = dba::fetch($servers)) {
+ $servers = DBA::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'all']);
+ while ($server = DBA::fetch($servers)) {
$serverlist[$server['url']] = $server['url'];
}
// All tags of the current post
- $condition = ['otype' => TERM_OBJ_POST, 'type' => TERM_HASHTAG, 'oid' => $item_id];
- $tags = dba::select('term', ['term'], $condition);
+ $condition = ['otype' => TERM_OBJ_POST, 'type' => TERM_HASHTAG, 'oid' => $parent['parent']];
+ $tags = DBA::select('term', ['term'], $condition);
$taglist = [];
- while ($tag = dba::fetch($tags)) {
+ while ($tag = DBA::fetch($tags)) {
$taglist[] = $tag['term'];
}
// All servers who wants content with this tag
$tagserverlist = [];
if (!empty($taglist)) {
- $tagserver = dba::select('gserver-tag', ['gserver-id'], ['tag' => $taglist]);
- while ($server = dba::fetch($tagserver)) {
+ $tagserver = DBA::select('gserver-tag', ['gserver-id'], ['tag' => $taglist]);
+ while ($server = DBA::fetch($tagserver)) {
$tagserverlist[] = $server['gserver-id'];
}
}
// All adresses with the given id
if (!empty($tagserverlist)) {
- $servers = dba::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]);
- while ($server = dba::fetch($servers)) {
+ $servers = DBA::select('gserver', ['url'], ['relay-subscribe' => true, 'relay-scope' => 'tags', 'id' => $tagserverlist]);
+ while ($server = DBA::fetch($servers)) {
$serverlist[$server['url']] = $server['url'];
}
}
}
// Now we are collecting all relay contacts
- $contacts = [];
foreach ($serverlist as $server_url) {
// We don't send messages to ourselves
- if (!link_compare($server_url, System::baseUrl())) {
- $cid = self::getRelayContactId($server_url);
- if (!is_bool($cid)) {
- $contacts[] = $cid;
+ if (link_compare($server_url, System::baseUrl())) {
+ continue;
+ }
+ $contact = self::getRelayContact($server_url);
+ if (is_bool($contact)) {
+ continue;
+ }
+
+ $exists = false;
+ foreach ($contacts as $entry) {
+ if ($entry['batch'] == $contact['batch']) {
+ $exists = true;
}
}
+
+ if (!$exists) {
+ $contacts[] = $contact;
+ }
}
return $contacts;
* @param string $server_url The url of the server
* @return array with the contact
*/
- private static function getRelayContactId($server_url)
+ private static function getRelayContact($server_url)
{
- $batch = $server_url . '/receive/public';
-
- $fields = ['batch', 'id', 'name', 'network', 'nick',
- 'url', 'archive', 'blocked', 'contact-type'];
- // Fetch the first unarchived, unblocked account
- $condition = ['uid' => 0, 'network' => NETWORK_DIASPORA, 'batch' => $batch,
- 'archive' => false, 'blocked' => false];
- $contact = dba::selectFirst('contact', $fields, $condition);
-
- // If there is nothing found, we check if there is already a relay account
- if (!DBM::is_result($contact)) {
- $condition = ['uid' => 0, 'network' => NETWORK_DIASPORA, 'batch' => $batch,
- 'contact-type' => ACCOUNT_TYPE_RELAY];
- $contact = dba::selectFirst('contact', $fields, $condition);
- }
- if (DBM::is_result($contact)) {
+ $fields = ['batch', 'id', 'name', 'network', 'archive', 'blocked'];
+
+ // Fetch the relay contact
+ $condition = ['uid' => 0, 'nurl' => normalise_link($server_url),
+ 'contact-type' => Contact::ACCOUNT_TYPE_RELAY];
+ $contact = DBA::selectFirst('contact', $fields, $condition);
+
+ if (DBA::isResult($contact)) {
if ($contact['archive'] || $contact['blocked']) {
return false;
}
-
- // Mark relay accounts as a relay, if this hadn't been the case before
- if (($contact['url'] == $server_url) && ($contact['nick'] == 'relay') &&
- ($contact['name'] == 'relay') && ($contact['contact-type'] != ACCOUNT_TYPE_RELAY)) {
- $fields = ['contact-type' => ACCOUNT_TYPE_RELAY];
- dba::update('contact', $fields, ['id' => $contact['id']]);
- }
return $contact;
} else {
- $fields = ['uid' => 0, 'created' => DateTimeFormat::utcNow(),
- 'name' => 'relay', 'nick' => 'relay',
- 'url' => $server_url, 'nurl' => normalise_link($server_url),
- 'batch' => $batch, 'network' => NETWORK_DIASPORA,
- 'rel' => CONTACT_IS_FOLLOWER, 'blocked' => false,
- 'contact-type' => ACCOUNT_TYPE_RELAY,
- 'pending' => false, 'writable' => true];
- dba::insert('contact', $fields);
-
- $fields = ['batch', 'id', 'name', 'network'];
- $contact = dba::selectFirst('contact', $fields, $condition);
- if (DBM::is_result($contact)) {
+ self::setRelayContact($server_url);
+
+ $contact = DBA::selectFirst('contact', $fields, $condition);
+ if (DBA::isResult($contact)) {
return $contact;
}
-
}
// It should never happen that we arrive here
return [];
}
+ /**
+ * @brief Update or insert a relay contact
+ *
+ * @param string $server_url The url of the server
+ * @param array $network_fields Optional network specific fields
+ */
+ public static function setRelayContact($server_url, array $network_fields = [])
+ {
+ $fields = ['created' => DateTimeFormat::utcNow(),
+ 'name' => 'relay', 'nick' => 'relay',
+ 'url' => $server_url, 'network' => Protocol::DIASPORA,
+ 'batch' => $server_url . '/receive/public',
+ 'rel' => Contact::FOLLOWER, 'blocked' => false,
+ 'pending' => false, 'writable' => true];
+
+ $fields = array_merge($fields, $network_fields);
+
+ $condition = ['uid' => 0, 'nurl' => normalise_link($server_url),
+ 'contact-type' => Contact::ACCOUNT_TYPE_RELAY];
+
+ if (DBA::exists('contact', $condition)) {
+ unset($fields['created']);
+ }
+
+ DBA::update('contact', $fields, $condition, true);
+ }
+
/**
* @brief Return a list of participating contacts for a thread
*
*
* @return array of relay servers
*/
- public static function participantsForThread($thread, $contacts)
+ 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`,
`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`
WHERE `participation`.`iid` = ?", $thread);
- while ($contact = dba::fetch($r)) {
+ while ($contact = DBA::fetch($r)) {
if (!empty($contact['fnetwork'])) {
$contact['network'] = $contact['fnetwork'];
}
$contacts[] = $contact;
}
}
- dba::close($r);
+ DBA::close($r);
return $contacts;
}
/**
* @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($importer, $raw)
+ public static function decodeRaw(array $importer, $raw, $no_exit = false)
{
$data = json_decode($raw);
if (!is_object($j_outer_key_bundle)) {
logger('Outer Salmon did not verify. Discarding.');
- System::httpExit(400);
+ if ($no_exit) {
+ return false;
+ } else {
+ System::httpExit(400);
+ }
}
$outer_iv = base64_decode($j_outer_key_bundle->iv);
if (!is_object($basedom)) {
logger('Received data does not seem to be an XML. Discarding. '.$xml);
- System::httpExit(400);
+ if ($no_exit) {
+ return false;
+ } else {
+ System::httpExit(400);
+ }
}
$base = $basedom->children(NAMESPACE_SALMON_ME);
$author_addr = base64_decode($key_id);
if ($author_addr == '') {
logger('No author could be decoded. Discarding. Message: ' . $xml);
- System::httpExit(400);
+ 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);
+ 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);
+ if ($no_exit) {
+ return false;
+ } else {
+ System::httpExit(400);
+ }
}
return ['message' => (string)base64url_decode($base->data),
* 'author' -> author diaspora handle
* 'key' -> author public key (converted to pkcs#8)
*/
- public static function decode($importer, $xml)
+ public static function decode(array $importer, $xml)
{
$public = false;
$basedom = XML::parseString($xml);
return false;
}
- if (!($postdata = self::validPosting($msg))) {
+ if (!($fields = self::validPosting($msg))) {
logger("Invalid posting");
return false;
}
- $fields = $postdata['fields'];
-
- // Is it a an action (comment, like, ...) for our own post?
- if (isset($fields->parent_guid) && !$postdata["relayed"]) {
- $guid = notags(unxmlify($fields->parent_guid));
- $importer = self::importerForGuid($guid);
- if (is_array($importer)) {
- logger("delivering to origin: ".$importer["name"]);
- $message_id = self::dispatch($importer, $msg, $fields);
- return $message_id;
- }
- }
-
- // Process item retractions. This has to be done separated from the other stuff,
- // since retractions for comments could come even from non followers.
- if (!empty($fields) && in_array($fields->getName(), ['retraction'])) {
- $target = notags(unxmlify($fields->target_type));
- if (in_array($target, ["Comment", "Like", "Post", "Reshare", "StatusMessage"])) {
- logger('processing retraction for '.$target, LOGGER_DEBUG);
- $importer = ["uid" => 0, "page-flags" => PAGE_FREELOVE];
- $message_id = self::dispatch($importer, $msg, $fields);
- return $message_id;
- }
- }
-
- // Now distribute it to the followers
- $r = q(
- "SELECT `user`.* FROM `user` WHERE `user`.`uid` IN
- (SELECT `contact`.`uid` FROM `contact` WHERE `contact`.`network` = '%s' AND `contact`.`addr` = '%s')
- AND NOT `account_expired` AND NOT `account_removed`",
- dbesc(NETWORK_DIASPORA),
- dbesc($msg["author"])
- );
-
- if (DBM::is_result($r)) {
- foreach ($r as $rr) {
- logger("delivering to: ".$rr["username"]);
- self::dispatch($rr, $msg, $fields);
- }
- } elseif (!Config::get('system', 'relay_subscribe', false)) {
- logger("Unwanted message from ".$msg["author"]." send by ".$_SERVER["REMOTE_ADDR"]." with ".$_SERVER["HTTP_USER_AGENT"].": ".print_r($msg, true), LOGGER_DEBUG);
- } else {
- // Use a dummy importer to import the data for the public copy
- $importer = ["uid" => 0, "page-flags" => PAGE_FREELOVE];
- $message_id = self::dispatch($importer, $msg, $fields);
- }
+ $importer = ["uid" => 0, "page-flags" => Contact::PAGE_FREELOVE];
+ $success = self::dispatch($importer, $msg, $fields);
- return $message_id;
+ return $success;
}
/**
*
* @return int The message id of the generated message, "true" or "false" if there was an error
*/
- public static function dispatch($importer, $msg, $fields = null)
+ public static function dispatch(array $importer, $msg, $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")
// This is only needed for private postings since this is already done for public ones before
if (is_null($fields)) {
- if (!($postdata = self::validPosting($msg))) {
+ $private = true;
+ if (!($fields = self::validPosting($msg))) {
logger("Invalid posting");
return false;
}
- $fields = $postdata['fields'];
+ } else {
+ $private = false;
}
$type = $fields->getName();
switch ($type) {
case "account_migration":
+ if (!$private) {
+ logger('Message with type ' . $type . ' is not private, quitting.');
+ return false;
+ }
return self::receiveAccountMigration($importer, $fields);
case "account_deletion":
- return self::receiveAccountDeletion($importer, $fields);
+ return self::receiveAccountDeletion($fields);
case "comment":
return self::receiveComment($importer, $sender, $fields, $msg["message"]);
case "contact":
+ if (!$private) {
+ logger('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.');
+ return false;
+ }
return self::receiveConversation($importer, $msg, $fields);
case "like":
return self::receiveLike($importer, $sender, $fields);
case "message":
+ if (!$private) {
+ logger('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.');
+ return false;
+ }
return self::receiveParticipation($importer, $fields);
case "photo": // Not implemented
return self::receivePollParticipation($importer, $fields);
case "profile":
+ if (!$private) {
+ logger('Message with type ' . $type . ' is not private, quitting.');
+ return false;
+ }
return self::receiveProfile($importer, $fields);
case "reshare":
// Only some message types have signatures. So we quit here for the other types.
if (!in_array($type, ["comment", "like"])) {
- return ["fields" => $fields, "relayed" => false];
+ return $fields;
}
// No author_signature? This is a must, so we quit.
if (!isset($author_signature)) {
}
if (isset($parent_author_signature)) {
- $relayed = true;
-
$key = self::key($msg["author"]);
+ if (empty($key)) {
+ logger("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);
return false;
}
- } else {
- $relayed = false;
}
$key = self::key($fields->author);
+ if (empty($key)) {
+ logger("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);
return false;
} else {
- return ["fields" => $fields, "relayed" => $relayed];
+ return $fields;
}
}
{
$update = false;
- $person = dba::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]);
- if (DBM::is_result($person)) {
+ $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
+ if (DBA::isResult($person)) {
logger("In cache " . print_r($person, true), LOGGER_DEBUG);
// update record occasionally so it doesn't get stale
}
}
- if (!DBM::is_result($person) || $update) {
+ if (!DBA::isResult($person) || $update) {
logger("create or refresh", LOGGER_DEBUG);
- $r = Probe::uri($handle, NETWORK_DIASPORA);
+ $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)) {
- self::addFContact($r, $update);
+ if ($r && ($r["network"] === Protocol::DIASPORA)) {
+ self::updateFContact($r);
// Fetch the updated or added contact
- $person = dba::selectFirst('fcontact', [], ['network' => NETWORK_DIASPORA, 'addr' => $handle]);
- if (!DBM::is_result($person)) {
+ $person = DBA::selectFirst('fcontact', [], ['network' => Protocol::DIASPORA, 'addr' => $handle]);
+ if (!DBA::isResult($person)) {
$person = $r;
}
}
/**
* @brief Updates the fcontact table
*
- * @param array $arr The fcontact data
- * @param bool $update Update or insert?
- *
- * @return string The id of the fcontact entry
+ * @param array $arr The fcontact data
*/
- private static function addFContact($arr, $update = false)
+ private static function updateFContact($arr)
{
- if ($update) {
- $r = q(
- "UPDATE `fcontact` SET
- `name` = '%s',
- `photo` = '%s',
- `request` = '%s',
- `nick` = '%s',
- `addr` = '%s',
- `guid` = '%s',
- `batch` = '%s',
- `notify` = '%s',
- `poll` = '%s',
- `confirm` = '%s',
- `alias` = '%s',
- `pubkey` = '%s',
- `updated` = '%s'
- WHERE `url` = '%s' AND `network` = '%s'",
- dbesc($arr["name"]),
- dbesc($arr["photo"]),
- dbesc($arr["request"]),
- dbesc($arr["nick"]),
- dbesc(strtolower($arr["addr"])),
- dbesc($arr["guid"]),
- dbesc($arr["batch"]),
- dbesc($arr["notify"]),
- dbesc($arr["poll"]),
- dbesc($arr["confirm"]),
- dbesc($arr["alias"]),
- dbesc($arr["pubkey"]),
- dbesc(DateTimeFormat::utcNow()),
- dbesc($arr["url"]),
- dbesc($arr["network"])
- );
- } else {
- $r = q(
- "INSERT INTO `fcontact` (`url`,`name`,`photo`,`request`,`nick`,`addr`, `guid`,
- `batch`, `notify`,`poll`,`confirm`,`network`,`alias`,`pubkey`,`updated`)
- VALUES ('%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s','%s')",
- dbesc($arr["url"]),
- dbesc($arr["name"]),
- dbesc($arr["photo"]),
- dbesc($arr["request"]),
- dbesc($arr["nick"]),
- dbesc($arr["addr"]),
- dbesc($arr["guid"]),
- dbesc($arr["batch"]),
- dbesc($arr["notify"]),
- dbesc($arr["poll"]),
- dbesc($arr["confirm"]),
- dbesc($arr["network"]),
- dbesc($arr["alias"]),
- dbesc($arr["pubkey"]),
- dbesc(DateTimeFormat::utcNow())
- );
- }
+ $fields = ['name' => $arr["name"], 'photo' => $arr["photo"],
+ 'request' => $arr["request"], 'nick' => $arr["nick"],
+ 'addr' => strtolower($arr["addr"]), 'guid' => $arr["guid"],
+ 'batch' => $arr["batch"], 'notify' => $arr["notify"],
+ 'poll' => $arr["poll"], 'confirm' => $arr["confirm"],
+ 'alias' => $arr["alias"], 'pubkey' => $arr["pubkey"],
+ 'updated' => DateTimeFormat::utcNow()];
- return $r;
+ $condition = ['url' => $arr["url"], 'network' => $arr["network"]];
+
+ DBA::update('fcontact', $fields, $condition, true);
}
/**
logger("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 (DBM::is_result($r)) {
- return strtolower($r[0]["addr"]);
+ if (DBA::isResult($contact) && !empty($contact["addr"])) {
+ return strtolower($contact["addr"]);
}
}
intval($contact_id)
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
$contact = $r[0];
logger("contact 'self' = ".$contact['self']." 'url' = ".$contact['url'], LOGGER_DEBUG);
$r = q(
"SELECT `url` FROM `fcontact` WHERE `url` != '' AND `network` = '%s' AND `guid` = '%s'",
- dbesc(NETWORK_DIASPORA),
- dbesc($fcontact_guid)
+ DBA::escape(Protocol::DIASPORA),
+ DBA::escape($fcontact_guid)
);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($r)) {
return $r[0]['url'];
}
*/
private static function contactByHandle($uid, $handle)
{
- // First do a direct search on the contact table
- $r = q(
- "SELECT * FROM `contact` WHERE `uid` = %d AND `addr` = '%s' LIMIT 1",
- intval($uid),
- dbesc($handle)
- );
-
- if (DBM::is_result($r)) {
- return $r[0];
- } else {
- /*
- * We haven't found it?
- * We use another function for it that will possibly create a contact entry.
- */
- $cid = Contact::getIdForURL($handle, $uid);
-
- if ($cid > 0) {
- /// @TODO Contact retrieval should be encapsulated into an "entity" class like `Contact`
- $r = q("SELECT * FROM `contact` WHERE `id` = %d LIMIT 1", intval($cid));
+ $cid = Contact::getIdForURL($handle, $uid);
+ if (!$cid) {
+ $handle_parts = explode("@", $handle);
+ $nurl_sql = "%%://" . $handle_parts[1] . "%%/profile/" . $handle_parts[0];
+ $cid = Contact::getIdForURL($nurl_sql, $uid);
+ }
- if (DBM::is_result($r)) {
- return $r[0];
- }
- }
+ if (!$cid) {
+ logger("Haven't found a contact for user " . $uid . " and handle " . $handle, LOGGER_DEBUG);
+ return false;
}
- $handle_parts = explode("@", $handle);
- $nurl_sql = "%%://".$handle_parts[1]."%%/profile/".$handle_parts[0];
- $r = q(
- "SELECT * FROM `contact` WHERE `network` = '%s' AND `uid` = %d AND `nurl` LIKE '%s' LIMIT 1",
- dbesc(NETWORK_DFRN),
- intval($uid),
- dbesc($nurl_sql)
- );
- if (DBM::is_result($r)) {
- return $r[0];
+ $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);
+ return false;
}
- logger("Haven't found contact for user ".$uid." and handle ".$handle, LOGGER_DEBUG);
- return false;
+ return $contact;
}
/**
*
* @return bool is the contact allowed to post?
*/
- private static function postAllow($importer, $contact, $is_comment = false)
+ private static function postAllow(array $importer, array $contact, $is_comment = false)
{
/*
* Perhaps we were already sharing with this person. Now they're sharing with us.
*/
// It is deactivated by now, due to side effects. See issue https://github.com/friendica/friendica/pull/4033
// It is not removed by now. Possibly the code is needed?
- //if (!$is_comment && $contact["rel"] == CONTACT_IS_FOLLOWER && in_array($importer["page-flags"], array(PAGE_FREELOVE))) {
- // dba::update(
+ //if (!$is_comment && $contact["rel"] == Contact::FOLLOWER && in_array($importer["page-flags"], array(Contact::PAGE_FREELOVE))) {
+ // DBA::update(
// 'contact',
- // array('rel' => CONTACT_IS_FRIEND, 'writable' => true),
+ // array('rel' => Contact::FRIEND, 'writable' => true),
// array('id' => $contact["id"], 'uid' => $contact["uid"])
// );
//
- // $contact["rel"] = CONTACT_IS_FRIEND;
+ // $contact["rel"] = Contact::FRIEND;
// logger("defining user ".$contact["nick"]." as friend");
//}
// We don't seem to like that person
- if ($contact["blocked"] || $contact["readonly"]) {
+ if ($contact["blocked"]) {
// Maybe blocked, don't accept.
return false;
// We are following this person?
- } elseif (($contact["rel"] == CONTACT_IS_SHARING) || ($contact["rel"] == CONTACT_IS_FRIEND)) {
+ } elseif (($contact["rel"] == Contact::SHARING) || ($contact["rel"] == Contact::FRIEND)) {
// Yes, then it is fine.
return true;
// Is it a post to a community?
- } elseif (($contact["rel"] == CONTACT_IS_FOLLOWER) && ($importer["page-flags"] == PAGE_COMMUNITY)) {
+ } elseif (($contact["rel"] == Contact::FOLLOWER) && in_array($importer["page-flags"], [Contact::PAGE_COMMUNITY, Contact::PAGE_PRVGROUP])) {
// That's good
return true;
// Is the message a global user or a comment?
*
* @return array The contact data
*/
- private static function allowedContactByHandle($importer, $handle, $is_comment = false)
+ private static function allowedContactByHandle(array $importer, $handle, $is_comment = false)
{
$contact = self::contactByHandle($importer["uid"], $handle);
if (!$contact) {
logger("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) {
+ if ($is_comment && ($importer["uid"] != 0)) {
+ return self::contactByHandle(0, $handle);
+ } elseif ($is_comment) {
return $importer;
} else {
return false;
*/
private static function messageExists($uid, $guid)
{
- $r = q(
- "SELECT `id` FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
- intval($uid),
- dbesc($guid)
- );
-
- if (DBM::is_result($r)) {
+ $item = Item::selectFirst(['id'], ['uid' => $uid, 'guid' => $guid]);
+ if (DBA::isResult($item)) {
logger("message ".$guid." already exists for user ".$uid);
- return $r[0]["id"];
+ return $item["id"];
}
return false;
* @param array $item The item array
* @return void
*/
- private static function fetchGuid($item)
+ private static function fetchGuid(array $item)
{
$expression = "=diaspora://.*?/post/([0-9A-Za-z\-_@.:]{15,254}[0-9A-Za-z])=ism";
preg_replace_callback(
private static function storeByGuid($guid, $server, $uid = 0)
{
$serverparts = parse_url($server);
+
+ if (empty($serverparts["host"]) || empty($serverparts["scheme"])) {
+ return false;
+ }
+
$server = $serverparts["scheme"]."://".$serverparts["host"];
logger("Trying to fetch item ".$guid." from ".$server, LOGGER_DEBUG);
$author = "";
// Fetch the author - for the old and the new Diaspora version
- if ($source_xml->post->status_message->diaspora_handle) {
+ if ($source_xml->post->status_message && $source_xml->post->status_message->diaspora_handle) {
$author = (string)$source_xml->post->status_message->diaspora_handle;
} elseif ($source_xml->author && ($source_xml->getName() == "status_message")) {
$author = (string)$source_xml->author;
*
* @return array the item record
*/
- private static function parentItem($uid, $guid, $author, $contact)
+ private static function parentItem($uid, $guid, $author, array $contact)
{
- $r = q(
- "SELECT `id`, `parent`, `body`, `wall`, `uri`, `guid`, `private`, `origin`,
- `author-name`, `author-link`, `author-avatar`,
- `owner-name`, `owner-link`, `owner-avatar`
- FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
- intval($uid),
- dbesc($guid)
- );
-
- if (!$r) {
- $result = self::storeByGuid($guid, $contact["url"], $uid);
-
- if (!$result) {
- $person = self::personByHandle($author);
- $result = self::storeByGuid($guid, $person["url"], $uid);
+ $fields = ['id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin',
+ 'author-name', 'author-link', 'author-avatar',
+ 'owner-name', 'owner-link', 'owner-avatar'];
+ $condition = ['uid' => $uid, 'guid' => $guid];
+ $item = Item::selectFirst($fields, $condition);
+
+ if (!DBA::isResult($item)) {
+ $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);
- $r = q(
- "SELECT `id`, `body`, `wall`, `uri`, `private`, `origin`,
- `author-name`, `author-link`, `author-avatar`,
- `owner-name`, `owner-link`, `owner-avatar`
- FROM `item` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
- intval($uid),
- dbesc($guid)
- );
+ $item = Item::selectFirst($fields, $condition);
}
}
- if (!$r) {
+ if (!DBA::isResult($item)) {
logger("parent item not found: parent: ".$guid." - user: ".$uid);
return false;
} else {
logger("parent item found: parent: ".$guid." - user: ".$uid);
- return $r[0];
+ return $item;
}
}
private static function authorContactByUrl($def_contact, $person, $uid)
{
$condition = ['nurl' => normalise_link($person["url"]), 'uid' => $uid];
- $contact = dba::selectFirst('contact', ['id', 'network'], $condition);
- if (DBM::is_result($contact)) {
+ $contact = DBA::selectFirst('contact', ['id', 'network'], $condition);
+ if (DBA::isResult($contact)) {
$cid = $contact["id"];
$network = $contact["network"];
} else {
$cid = $def_contact["id"];
- $network = NETWORK_DIASPORA;
+ $network = Protocol::DIASPORA;
}
return ["cid" => $cid, "network" => $network];
*/
private static function plink($addr, $guid, $parent_guid = '')
{
- $r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
+ $contact = Contact::getDetailsByAddr($addr);
// Fallback
- if (!DBM::is_result($r)) {
+ if (!$contact) {
if ($parent_guid != '') {
- return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
+ return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
} else {
- return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
+ return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
}
}
- // Friendica contacts are often detected as Diaspora contacts in the "fcontact" table
- // So we try another way as well.
- $s = q("SELECT `network` FROM `gcontact` WHERE `nurl`='%s' LIMIT 1", dbesc(normalise_link($r[0]["url"])));
- if (DBM::is_result($s)) {
- $r[0]["network"] = $s[0]["network"];
- }
-
- if ($r[0]["network"] == NETWORK_DFRN) {
- return str_replace("/profile/".$r[0]["nick"]."/", "/display/".$guid, $r[0]["url"]."/");
+ if ($contact["network"] == Protocol::DFRN) {
+ return str_replace("/profile/" . $contact["nick"] . "/", "/display/" . $guid, $contact["url"] . "/");
}
- if (self::isRedmatrix($r[0]["url"])) {
- return $r[0]["url"]."/?f=&mid=".$guid;
+ if (self::isRedmatrix($contact["url"])) {
+ return $contact["url"] . "/?f=&mid=" . $guid;
}
if ($parent_guid != '') {
- return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
+ return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $parent_guid . "#" . $guid;
} else {
- return "https://".substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
+ return "https://" . substr($addr, strpos($addr, "@") + 1) . "/posts/" . $guid;
}
}
*
* @return bool Success
*/
- private static function receiveAccountMigration($importer, $data)
+ private static function receiveAccountMigration(array $importer, $data)
{
$old_handle = notags(unxmlify($data->author));
$new_handle = notags(unxmlify($data->profile->author));
// change the technical stuff in contact and gcontact
$data = Probe::uri($new_handle);
- if ($data['network'] == NETWORK_PHANTOM) {
+ if ($data['network'] == Protocol::PHANTOM) {
logger('Account for '.$new_handle." couldn't be probed.");
return false;
}
'notify' => $data['notify'], 'poll' => $data['poll'],
'network' => $data['network']];
- dba::update('contact', $fields, ['addr' => $old_handle]);
+ DBA::update('contact', $fields, ['addr' => $old_handle]);
$fields = ['url' => $data['url'], 'nurl' => normalise_link($data['url']),
'name' => $data['name'], 'nick' => $data['nick'],
'notify' => $data['notify'], 'photo' => $data['photo'],
'server_url' => $data['baseurl'], 'network' => $data['network']];
- dba::update('gcontact', $fields, ['addr' => $old_handle]);
+ DBA::update('gcontact', $fields, ['addr' => $old_handle]);
logger('Contacts are updated.');
- // update items
- /// @todo This is an extreme performance killer
- $fields = [
- 'owner-link' => [$contact["url"], $data["url"]],
- 'author-link' => [$contact["url"], $data["url"]],
- ];
- foreach ($fields as $n => $f) {
- $r = q(
- "SELECT `id` FROM `item` WHERE `%s` = '%s' AND `uid` = %d LIMIT 1",
- $n,
- dbesc($f[0]),
- intval($importer["uid"])
- );
-
- if (DBM::is_result($r)) {
- $x = q(
- "UPDATE `item` SET `%s` = '%s' WHERE `%s` = '%s' AND `uid` = %d",
- $n,
- dbesc($f[1]),
- $n,
- dbesc($f[0]),
- intval($importer["uid"])
- );
-
- if ($x === false) {
- return false;
- }
- }
- }
-
- logger('Items are updated.');
-
return true;
}
/**
* @brief Processes an account deletion
*
- * @param array $importer Array of the importer user
* @param object $data The message object
*
* @return bool Success
*/
- private static function receiveAccountDeletion($importer, $data)
+ private static function receiveAccountDeletion($data)
{
- /// @todo Account deletion should remove the contact from the global contacts as well
-
$author = notags(unxmlify($data->author));
- $contact = self::contactByHandle($importer["uid"], $author);
- if (!$contact) {
- logger("cannot find contact for author: ".$author);
- return false;
+ $contacts = DBA::select('contact', ['id'], ['addr' => $author]);
+ while ($contact = DBA::fetch($contacts)) {
+ Contact::remove($contact["id"]);
}
- // We now remove the contact
- Contact::remove($contact["id"]);
+ DBA::delete('gcontact', ['addr' => $author]);
+
+ logger('Removed contacts for ' . $author);
+
return true;
}
*/
private static function getUriFromGuid($author, $guid, $onlyfound = false)
{
- $r = q("SELECT `uri` FROM `item` WHERE `guid` = '%s' LIMIT 1", dbesc($guid));
- if (DBM::is_result($r)) {
- return $r[0]["uri"];
+ $item = Item::selectFirst(['uri'], ['guid' => $guid]);
+ if (DBA::isResult($item)) {
+ return $item["uri"];
} elseif (!$onlyfound) {
- return $author.":".$guid;
+ $person = self::personByHandle($author);
+
+ $parts = parse_url($person['url']);
+ unset($parts['path']);
+ $host_url = Network::unparseURL($parts);
+
+ return $host_url . '/objects/' . $guid;
}
return "";
*/
private static function getGuidFromUri($uri, $uid)
{
- $r = q("SELECT `guid` FROM `item` WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", dbesc($uri), intval($uid));
- if (DBM::is_result($r)) {
- return $r[0]["guid"];
+ $item = Item::selectFirst(['guid'], ['uri' => $uri, 'uid' => $uid]);
+ if (DBA::isResult($item)) {
+ return $item["guid"];
} else {
return false;
}
*/
private static function importerForGuid($guid)
{
- $item = dba::fetch_first("SELECT `uid` FROM `item` WHERE `origin` AND `guid` = ? LIMIT 1", $guid);
-
- if (DBM::is_result($item)) {
+ $item = Item::selectFirst(['uid'], ['origin' => true, 'guid' => $guid]);
+ if (DBA::isResult($item)) {
logger("Found user ".$item['uid']." as owner of item ".$guid, LOGGER_DEBUG);
- $contact = dba::fetch_first("SELECT * FROM `contact` WHERE `self` AND `uid` = ?", $item['uid']);
- if (DBM::is_result($contact)) {
+ $contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $item['uid']]);
+ if (DBA::isResult($contact)) {
return $contact;
}
}
*
* @return int The message id of the generated comment or "false" if there was an error
*/
- private static function receiveComment($importer, $sender, $data, $xml)
+ private static function receiveComment(array $importer, $sender, $data, $xml)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$datarray["contact-id"] = $author_contact["cid"];
$datarray["network"] = $author_contact["network"];
- $datarray["author-name"] = $person["name"];
$datarray["author-link"] = $person["url"];
- $datarray["author-avatar"] = ((x($person, "thumb")) ? $person["thumb"] : $person["photo"]);
+ $datarray["author-id"] = Contact::getIdForURL($person["url"], 0);
- $datarray["owner-name"] = $contact["name"];
$datarray["owner-link"] = $contact["url"];
- $datarray["owner-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
+ $datarray["owner-id"] = Contact::getIdForURL($contact["url"], 0);
$datarray["guid"] = $guid;
$datarray["uri"] = self::getUriFromGuid($author, $guid);
- $datarray["type"] = "remote-comment";
$datarray["verb"] = ACTIVITY_POST;
$datarray["gravity"] = GRAVITY_COMMENT;
$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;
self::fetchGuid($datarray);
+ // If we are the origin of the parent we store the original data.
+ // We notify our followers during the item storage.
+ if ($parent_item["origin"]) {
+ $datarray['diaspora_signed_text'] = json_encode($data);
+ }
+
$message_id = Item::insert($datarray);
if ($message_id <= 0) {
if ($message_id) {
logger("Stored comment ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
- }
-
- // If we are the origin of the parent we store the original data and notify our followers
- if ($message_id && $parent_item["origin"]) {
- // Formerly we stored the signed text, the signature and the author in different fields.
- // We now store the raw data so that we are more flexible.
- dba::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($data)]);
-
- // notify others
- Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $message_id);
+ if ($datarray['uid'] == 0) {
+ Item::distribute($message_id, json_encode($data));
+ }
}
return true;
*
* @return bool "true" if it was successful
*/
- private static function receiveConversationMessage($importer, $contact, $data, $msg, $mesg, $conversation)
+ private static function receiveConversationMessage(array $importer, array $contact, $data, $msg, $mesg, $conversation)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$person = self::personByHandle($msg_author);
- dba::lock('mail');
+ DBA::lock('mail');
- $r = q(
- "SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($msg_guid),
- intval($importer["uid"])
- );
- if (DBM::is_result($r)) {
+ if (DBA::exists('mail', ['guid' => $msg_guid, 'uid' => $importer["uid"]])) {
logger("duplicate message already delivered.", LOGGER_DEBUG);
return false;
}
"INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
VALUES (%d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
intval($importer["uid"]),
- dbesc($msg_guid),
+ DBA::escape($msg_guid),
intval($conversation["id"]),
- dbesc($person["name"]),
- dbesc($person["photo"]),
- dbesc($person["url"]),
+ DBA::escape($person["name"]),
+ DBA::escape($person["photo"]),
+ DBA::escape($person["url"]),
intval($contact["id"]),
- dbesc($subject),
- dbesc($body),
+ DBA::escape($subject),
+ DBA::escape($body),
0,
0,
- dbesc($message_uri),
- dbesc($author.":".$guid),
- dbesc($msg_created_at)
+ DBA::escape($message_uri),
+ DBA::escape($author.":".$guid),
+ DBA::escape($msg_created_at)
);
- dba::unlock();
+ DBA::unlock();
- dba::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
+ DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
notification(
[
"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"]
);
*
* @return bool Success
*/
- private static function receiveConversation($importer, $msg, $data)
+ private static function receiveConversation(array $importer, $msg, $data)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
return false;
}
- $conversation = null;
-
- $c = q(
- "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
- intval($importer["uid"]),
- dbesc($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')",
intval($importer["uid"]),
- dbesc($guid),
- dbesc($author),
- dbesc($created_at),
- dbesc(DateTimeFormat::utcNow()),
- dbesc($subject),
- dbesc($participants)
+ DBA::escape($guid),
+ DBA::escape($author),
+ DBA::escape($created_at),
+ DBA::escape(DateTimeFormat::utcNow()),
+ DBA::escape($subject),
+ DBA::escape($participants)
);
if ($r) {
- $c = q(
- "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
- intval($importer["uid"]),
- dbesc($guid)
- );
- }
-
- if ($c) {
- $conversation = $c[0];
+ $conversation = DBA::selectFirst('conv', [], ['uid' => $importer["uid"], 'guid' => $guid]);
}
}
if (!$conversation) {
return true;
}
- /**
- * @brief Creates the body for a "like" message
- *
- * @param array $contact The contact that send us the "like"
- * @param array $parent_item The item array of the parent item
- * @param string $guid message guid
- *
- * @return string the body
- */
- private static function constructLikeBody($contact, $parent_item, $guid)
- {
- $bodyverb = L10n::t('%1$s likes %2$s\'s %3$s');
-
- $ulink = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
- $alink = "[url=".$parent_item["author-link"]."]".$parent_item["author-name"]."[/url]";
- $plink = "[url=".System::baseUrl()."/display/".urlencode($guid)."]".L10n::t("status")."[/url]";
-
- return sprintf($bodyverb, $ulink, $alink, $plink);
- }
-
- /**
- * @brief Creates a XML object for a "like"
- *
- * @param array $importer Array of the importer user
- * @param array $parent_item The item array of the parent item
- *
- * @return string The XML
- */
- private static function constructLikeObject($importer, $parent_item)
- {
- $objtype = ACTIVITY_OBJ_NOTE;
- $link = '<link rel="alternate" type="text/html" href="'.System::baseUrl()."/display/".$importer["nickname"]."/".$parent_item["id"].'" />';
- $parent_body = $parent_item["body"];
-
- $xmldata = ["object" => ["type" => $objtype,
- "local" => "1",
- "id" => $parent_item["uri"],
- "link" => $link,
- "title" => "",
- "content" => $parent_body]];
-
- return XML::fromArray($xmldata, $xml, true);
- }
-
/**
* @brief Processes "like" messages
*
*
* @return int The message id of the generated like or "false" if there was an error
*/
- private static function receiveLike($importer, $sender, $data)
+ private static function receiveLike(array $importer, $sender, $data)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$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-name"] = $person["name"];
$datarray["author-link"] = $person["url"];
- $datarray["author-avatar"] = ((x($person, "thumb")) ? $person["thumb"] : $person["photo"]);
+ $datarray["author-id"] = Contact::getIdForURL($person["url"], 0);
- $datarray["owner-name"] = $contact["name"];
$datarray["owner-link"] = $contact["url"];
- $datarray["owner-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
+ $datarray["owner-id"] = Contact::getIdForURL($contact["url"], 0);
$datarray["guid"] = $guid;
$datarray["uri"] = self::getUriFromGuid($author, $guid);
- $datarray["type"] = "activity";
$datarray["verb"] = $verb;
- $datarray["gravity"] = GRAVITY_LIKE;
+ $datarray["gravity"] = GRAVITY_ACTIVITY;
$datarray["parent-uri"] = $parent_item["uri"];
$datarray["object-type"] = ACTIVITY_OBJ_NOTE;
- $datarray["object"] = self::constructLikeObject($importer, $parent_item);
- $datarray["body"] = self::constructLikeBody($contact, $parent_item, $guid);
+ $datarray["body"] = $verb;
- $message_id = Item::insert($datarray);
-
- if ($message_id <= 0) {
- return false;
- }
-
- if ($message_id) {
- logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
- }
+ // Diaspora doesn't provide a date for likes
+ $datarray["changed"] = $datarray["created"] = $datarray["edited"] = DateTimeFormat::utcNow();
// like on comments have the comment as parent. So we need to fetch the toplevel parent
if ($parent_item["id"] != $parent_item["parent"]) {
- $toplevel = dba::selectFirst('item', ['origin'], ['id' => $parent_item["parent"]]);
+ $toplevel = Item::selectFirst(['origin'], ['id' => $parent_item["parent"]]);
$origin = $toplevel["origin"];
} else {
$origin = $parent_item["origin"];
}
- // If we are the origin of the parent we store the original data and notify our followers
- if ($message_id && $origin) {
- // Formerly we stored the signed text, the signature and the author in different fields.
- // We now store the raw data so that we are more flexible.
- dba::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($data)]);
+ // If we are the origin of the parent we store the original data.
+ // We notify our followers during the item storage.
+ if ($origin) {
+ $datarray['diaspora_signed_text'] = json_encode($data);
+ }
- // notify others
- Worker::add(PRIORITY_HIGH, "Notifier", "comment-import", $message_id);
+ $message_id = Item::insert($datarray);
+
+ if ($message_id <= 0) {
+ return false;
+ }
+
+ if ($message_id) {
+ logger("Stored like ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+ if ($datarray['uid'] == 0) {
+ Item::distribute($message_id, json_encode($data));
+ }
}
return true;
*
* @return bool Success?
*/
- private static function receiveMessage($importer, $data)
+ private static function receiveMessage(array $importer, $data)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
$conversation = null;
- $c = q(
- "SELECT * FROM `conv` WHERE `uid` = %d AND `guid` = '%s' LIMIT 1",
- intval($importer["uid"]),
- dbesc($conversation_guid)
- );
- if ($c) {
- $conversation = $c[0];
- } else {
+ $condition = ['uid' => $importer["uid"], 'guid' => $conversation_guid];
+ $conversation = DBA::selectFirst('conv', [], $condition);
+
+ if (!DBA::isResult($conversation)) {
logger("conversation not available.");
return false;
}
$body = self::replacePeopleGuid($body, $person["url"]);
- dba::lock('mail');
+ DBA::lock('mail');
- $r = q(
- "SELECT `id` FROM `mail` WHERE `guid` = '%s' AND `uid` = %d LIMIT 1",
- dbesc($guid),
- intval($importer["uid"])
- );
- if (DBM::is_result($r)) {
+ if (DBA::exists('mail', ['guid' => $guid, 'uid' => $importer["uid"]])) {
logger("duplicate message already delivered.", LOGGER_DEBUG);
return false;
}
"INSERT INTO `mail` (`uid`, `guid`, `convid`, `from-name`,`from-photo`,`from-url`,`contact-id`,`title`,`body`,`seen`,`reply`,`uri`,`parent-uri`,`created`)
VALUES ( %d, '%s', %d, '%s', '%s', '%s', %d, '%s', '%s', %d, %d, '%s','%s','%s')",
intval($importer["uid"]),
- dbesc($guid),
+ DBA::escape($guid),
intval($conversation["id"]),
- dbesc($person["name"]),
- dbesc($person["photo"]),
- dbesc($person["url"]),
+ DBA::escape($person["name"]),
+ DBA::escape($person["photo"]),
+ DBA::escape($person["url"]),
intval($contact["id"]),
- dbesc($conversation["subject"]),
- dbesc($body),
+ DBA::escape($conversation["subject"]),
+ DBA::escape($body),
0,
1,
- dbesc($message_uri),
- dbesc($author.":".$conversation["guid"]),
- dbesc($created_at)
+ DBA::escape($message_uri),
+ DBA::escape($author.":".$conversation["guid"]),
+ DBA::escape($created_at)
);
- dba::unlock();
+ DBA::unlock();
- dba::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
+ DBA::update('conv', ['updated' => DateTimeFormat::utcNow()], ['id' => $conversation["id"]]);
return true;
}
*
* @return bool always true
*/
- private static function receiveParticipation($importer, $data)
+ private static function receiveParticipation(array $importer, $data)
{
$author = strtolower(notags(unxmlify($data->author)));
$parent_guid = notags(unxmlify($data->parent_guid));
return false;
}
- $item = dba::selectFirst('item', ['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => false]);
- if (!DBM::is_result($item)) {
+ $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);
return false;
}
logger('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]);
+ if (!DBA::exists('participation', ['iid' => $item['id'], 'server' => $server])) {
+ DBA::insert('participation', ['iid' => $item['id'], 'cid' => $contact_id, 'fid' => $person['id'], 'server' => $server]);
}
// Send all existing comments and likes to the requesting server
- $comments = dba::p("SELECT `item`.`id`, `item`.`verb`, `contact`.`self`
- FROM `item`
- INNER JOIN `contact` ON `contact`.`id` = `item`.`contact-id`
- WHERE `item`.`parent` = ? AND `item`.`id` != `item`.`parent`", $item['id']);
- while ($comment = dba::fetch($comments)) {
+ $comments = Item::select(['id', 'parent', 'verb', 'self'], ['parent' => $item['id']]);
+ while ($comment = Item::fetch($comments)) {
+ if ($comment['id'] == $comment['parent']) {
+ continue;
+ }
if ($comment['verb'] == ACTIVITY_POST) {
$cmd = $comment['self'] ? 'comment-new' : 'comment-import';
} else {
logger("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::close($comments);
return true;
}
*
* @return bool always true
*/
- private static function receivePhoto($importer, $data)
+ private static function receivePhoto(array $importer, $data)
{
// There doesn't seem to be a reason for this function,
// since the photo data is transmitted in the status message as well
*
* @return bool always true
*/
- private static function receivePollParticipation($importer, $data)
+ private static function receivePollParticipation(array $importer, $data)
{
// We don't support polls by now
return true;
*
* @return bool Success
*/
- private static function receiveProfile($importer, $data)
+ private static function receiveProfile(array $importer, $data)
{
$author = strtolower(notags(unxmlify($data->author)));
$birthday = $contact["bd"];
}
- $r = q(
- "UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s', `name-date` = '%s', `bd` = '%s',
- `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s' WHERE `id` = %d AND `uid` = %d",
- dbesc($name),
- dbesc($nick),
- dbesc($author),
- dbesc(DateTimeFormat::utcNow()),
- dbesc($birthday),
- dbesc($location),
- dbesc($about),
- dbesc($keywords),
- dbesc($gender),
- intval($contact["id"]),
- intval($importer["uid"])
- );
+ $fields = ['name' => $name, 'location' => $location,
+ 'name-date' => DateTimeFormat::utcNow(),
+ 'about' => $about, 'gender' => $gender,
+ 'addr' => $author, 'nick' => $nick,
+ 'keywords' => $keywords];
+
+ if (!empty($birthday)) {
+ $fields['bd'] = $birthday;
+ }
+
+ 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,
* @param array $contact The contact that send the request
* @return void
*/
- private static function receiveRequestMakeFriend($importer, $contact)
+ private static function receiveRequestMakeFriend(array $importer, array $contact)
{
$a = get_app();
- if ($contact["rel"] == CONTACT_IS_SHARING) {
- dba::update(
+ if ($contact["rel"] == Contact::SHARING) {
+ DBA::update(
'contact',
- ['rel' => CONTACT_IS_FRIEND, 'writable' => true],
+ ['rel' => Contact::FRIEND, 'writable' => true],
['id' => $contact["id"], 'uid' => $importer["uid"]]
);
}
- // send notification
-
- $r = q(
- "SELECT `hide-friends` FROM `profile` WHERE `uid` = %d AND `is-default` = 1 LIMIT 1",
- intval($importer["uid"])
- );
-
- if ($r && !$r[0]["hide-friends"] && !$contact["hidden"] && intval(PConfig::get($importer["uid"], "system", "post_newfriend"))) {
- $self = q(
- "SELECT * FROM `contact` WHERE `self` AND `uid` = %d LIMIT 1",
- intval($importer["uid"])
- );
-
- // they are not CONTACT_IS_FOLLOWER anymore but that's what we have in the array
-
- if ($self && $contact["rel"] == CONTACT_IS_FOLLOWER) {
- $arr = [];
- $arr["protocol"] = PROTOCOL_DIASPORA;
- $arr["uri"] = $arr["parent-uri"] = item_new_uri($a->get_hostname(), $importer["uid"]);
- $arr["uid"] = $importer["uid"];
- $arr["contact-id"] = $self[0]["id"];
- $arr["wall"] = 1;
- $arr["type"] = 'wall';
- $arr["gravity"] = 0;
- $arr["origin"] = 1;
- $arr["author-name"] = $arr["owner-name"] = $self[0]["name"];
- $arr["author-link"] = $arr["owner-link"] = $self[0]["url"];
- $arr["author-avatar"] = $arr["owner-avatar"] = $self[0]["thumb"];
- $arr["verb"] = ACTIVITY_FRIEND;
- $arr["object-type"] = ACTIVITY_OBJ_PERSON;
-
- $A = "[url=".$self[0]["url"]."]".$self[0]["name"]."[/url]";
- $B = "[url=".$contact["url"]."]".$contact["name"]."[/url]";
- $BPhoto = "[url=".$contact["url"]."][img]".$contact["thumb"]."[/img][/url]";
- $arr["body"] = L10n::t('%1$s is now friends with %2$s', $A, $B)."\n\n\n".$BPhoto;
-
- $arr["object"] = self::constructNewFriendObject($contact);
-
- $user = dba::selectFirst('user', ['allow_cid', 'allow_gid', 'deny_cid', 'deny_gid'], ['uid' => $importer["uid"]]);
-
- $arr["allow_cid"] = $user["allow_cid"];
- $arr["allow_gid"] = $user["allow_gid"];
- $arr["deny_cid"] = $user["deny_cid"];
- $arr["deny_gid"] = $user["deny_gid"];
-
- $i = Item::insert($arr);
- if ($i) {
- Worker::add(PRIORITY_HIGH, "Notifier", "activity", $i);
- }
- }
- }
- }
-
- /**
- * @brief Creates a XML object for a "new friend" message
- *
- * @param array $contact Array of the contact
- *
- * @return string The XML
- */
- private static function constructNewFriendObject($contact)
- {
- $objtype = ACTIVITY_OBJ_PERSON;
- $link = '<link rel="alternate" type="text/html" href="'.$contact["url"].'" />'."\n".
- '<link rel="photo" type="image/jpeg" href="'.$contact["thumb"].'" />'."\n";
-
- $xmldata = ["object" => ["type" => $objtype,
- "title" => $contact["name"],
- "id" => $contact["url"]."/".$contact["name"],
- "link" => $link]];
-
- return XML::fromArray($xmldata, $xml, true);
}
/**
*
* @return bool Success
*/
- private static function receiveContactRequest($importer, $data)
+ private static function receiveContactRequest(array $importer, $data)
{
$author = unxmlify($data->author);
$recipient = unxmlify($data->recipient);
// 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_IS_FRIEND])) {
- $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
- if ($u) {
+ if (in_array($contact["rel"], [Contact::FRIEND])) {
+ $user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]);
+ if (DBA::isResult($user)) {
logger("Sending share message to author ".$author." - Contact: ".$contact["id"]." - User: ".$importer["uid"], LOGGER_DEBUG);
- $ret = self::sendShare($u[0], $contact);
+ $ret = self::sendShare($user, $contact);
}
}
return true;
}
}
- if (!$following && $sharing && in_array($importer["page-flags"], [PAGE_SOAPBOX, PAGE_NORMAL])) {
+ 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);
return false;
} elseif (!$following && !$sharing) {
$ret = self::personByHandle($author);
- if (!$ret || ($ret["network"] != NETWORK_DIASPORA)) {
+ if (!$ret || ($ret["network"] != Protocol::DIASPORA)) {
logger("Cannot resolve diaspora handle ".$author." for ".$recipient);
return false;
}
"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"]),
- dbesc($ret["network"]),
- dbesc($ret["addr"]),
+ DBA::escape($ret["network"]),
+ DBA::escape($ret["addr"]),
DateTimeFormat::utcNow(),
- dbesc($ret["url"]),
- dbesc(normalise_link($ret["url"])),
- dbesc($batch),
- dbesc($ret["name"]),
- dbesc($ret["nick"]),
- dbesc($ret["photo"]),
- dbesc($ret["pubkey"]),
- dbesc($ret["notify"]),
- dbesc($ret["poll"]),
+ DBA::escape($ret["url"]),
+ DBA::escape(normalise_link($ret["url"])),
+ DBA::escape($batch),
+ DBA::escape($ret["name"]),
+ DBA::escape($ret["nick"]),
+ DBA::escape($ret["photo"]),
+ DBA::escape($ret["pubkey"]),
+ DBA::escape($ret["notify"]),
+ DBA::escape($ret["poll"]),
1,
2
);
Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true);
- if ($importer["page-flags"] == PAGE_NORMAL) {
+ if (in_array($importer["page-flags"], [Contact::PAGE_NORMAL, Contact::PAGE_PRVGROUP])) {
logger("Sending intra message for author ".$author.".", LOGGER_DEBUG);
$hash = random_string().(string)time(); // Generate a confirm_key
intval($contact_record["id"]),
0,
0,
- dbesc(L10n::t("Sharing notification from Diaspora network")),
- dbesc($hash),
- dbesc(DateTimeFormat::utcNow())
+ DBA::escape(L10n::t("Sharing notification from Diaspora network")),
+ DBA::escape($hash),
+ DBA::escape(DateTimeFormat::utcNow())
);
} else {
// automatic friend approval
Contact::updateAvatar($contact_record["photo"], $importer["uid"], $contact_record["id"]);
- // technically they are sharing with us (CONTACT_IS_SHARING),
- // but if our page-type is PAGE_COMMUNITY or PAGE_SOAPBOX
- // we are going to change the relationship and make them a follower.
-
- if (($importer["page-flags"] == PAGE_FREELOVE) && $sharing && $following) {
- $new_relation = CONTACT_IS_FRIEND;
- } elseif (($importer["page-flags"] == PAGE_FREELOVE) && $sharing) {
- $new_relation = CONTACT_IS_SHARING;
+ /*
+ * 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) {
+ $new_relation = Contact::SHARING;
} else {
- $new_relation = CONTACT_IS_FOLLOWER;
+ $new_relation = Contact::FOLLOWER;
}
$r = q(
WHERE `id` = %d
",
intval($new_relation),
- dbesc(DateTimeFormat::utcNow()),
- dbesc(DateTimeFormat::utcNow()),
+ DBA::escape(DateTimeFormat::utcNow()),
+ DBA::escape(DateTimeFormat::utcNow()),
intval($contact_record["id"])
);
- $u = q("SELECT * FROM `user` WHERE `uid` = %d LIMIT 1", intval($importer["uid"]));
- if ($u) {
+ $user = DBA::selectFirst('user', [], ['uid' => $importer["uid"]]);
+ if (DBA::isResult($user)) {
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);
+ $ret = self::sendShare($user, $contact_record);
// Send the profile data, maybe it weren't transmitted before
self::sendProfile($importer["uid"], [$contact_record]);
*
* @return array The fetched item
*/
- private static function originalItem($guid, $orig_author, $author)
+ public static function originalItem($guid, $orig_author)
{
+ if (empty($guid)) {
+ logger('Empty guid. Quitting.');
+ return false;
+ }
+
// Do we already have this item?
- $r = q(
- "SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
- `author-name`, `author-link`, `author-avatar`
- FROM `item` WHERE `guid` = '%s' AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
- dbesc($guid)
- );
+ $fields = ['body', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
+ 'author-name', 'author-link', 'author-avatar'];
+ $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false];
+ $item = Item::selectFirst($fields, $condition);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($item)) {
logger("reshared message ".$guid." already exists on system.");
// Maybe it is already a reshared item?
// Then refetch the content, if it is a reshare from a reshare.
// If it is a reshared post from another network then reformat to avoid display problems with two share elements
- if (self::isReshare($r[0]["body"], true)) {
- $r = [];
- } elseif (self::isReshare($r[0]["body"], false) || strstr($r[0]["body"], "[share")) {
- $r[0]["body"] = Markdown::toBBCode(BBCode::toMarkdown($r[0]["body"]));
+ if (self::isReshare($item["body"], true)) {
+ $item = [];
+ } elseif (self::isReshare($item["body"], false) || strstr($item["body"], "[share")) {
+ $item["body"] = Markdown::toBBCode(BBCode::toMarkdown($item["body"]));
- $r[0]["body"] = self::replacePeopleGuid($r[0]["body"], $r[0]["author-link"]);
+ $item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
// Add OEmbed and other information to the body
- $r[0]["body"] = add_page_info_to_body($r[0]["body"], false, true);
+ $item["body"] = add_page_info_to_body($item["body"], false, true);
- return $r[0];
+ return $item;
} else {
- return $r[0];
+ return $item;
}
}
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($item)) {
+ if (empty($orig_author)) {
+ logger('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);
- $item_id = self::storeByGuid($guid, $server);
+ $stored = self::storeByGuid($guid, $server);
- if (!$item_id) {
+ if (!$stored) {
$server = "http://".substr($orig_author, strpos($orig_author, "@") + 1);
- logger("2nd try: reshared message ".$guid." will be fetched without SLL from the server ".$server);
- $item_id = self::storeByGuid($guid, $server);
+ logger("2nd try: reshared message ".$guid." will be fetched without SSL from the server ".$server);
+ $stored = self::storeByGuid($guid, $server);
}
- if ($item_id) {
- $r = q(
- "SELECT `body`, `tag`, `app`, `created`, `object-type`, `uri`, `guid`,
- `author-name`, `author-link`, `author-avatar`
- FROM `item` WHERE `id` = %d AND `visible` AND NOT `deleted` AND `body` != '' LIMIT 1",
- intval($item_id)
- );
+ if ($stored) {
+ $fields = ['body', 'tag', 'app', 'created', 'object-type', 'uri', 'guid',
+ 'author-name', 'author-link', 'author-avatar'];
+ $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false];
+ $item = Item::selectFirst($fields, $condition);
- if (DBM::is_result($r)) {
+ if (DBA::isResult($item)) {
// If it is a reshared post from another network then reformat to avoid display problems with two share elements
- if (self::isReshare($r[0]["body"], false)) {
- $r[0]["body"] = Markdown::toBBCode(BBCode::toMarkdown($r[0]["body"]));
- $r[0]["body"] = self::replacePeopleGuid($r[0]["body"], $r[0]["author-link"]);
+ if (self::isReshare($item["body"], false)) {
+ $item["body"] = Markdown::toBBCode(BBCode::toMarkdown($item["body"]));
+ $item["body"] = self::replacePeopleGuid($item["body"], $item["author-link"]);
}
- return $r[0];
+ return $item;
}
}
}
*
* @return int the message id
*/
- private static function receiveReshare($importer, $data, $xml)
+ private static function receiveReshare(array $importer, $data, $xml)
{
$author = notags(unxmlify($data->author));
$guid = notags(unxmlify($data->guid));
return true;
}
- $original_item = self::originalItem($root_guid, $root_author, $author);
+ $original_item = self::originalItem($root_guid, $root_author);
if (!$original_item) {
return false;
}
$datarray["uid"] = $importer["uid"];
$datarray["contact-id"] = $contact["id"];
- $datarray["network"] = NETWORK_DIASPORA;
+ $datarray["network"] = Protocol::DIASPORA;
- $datarray["author-name"] = $contact["name"];
$datarray["author-link"] = $contact["url"];
- $datarray["author-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
+ $datarray["author-id"] = Contact::getIdForURL($contact["url"], 0);
- $datarray["owner-name"] = $datarray["author-name"];
$datarray["owner-link"] = $datarray["author-link"];
- $datarray["owner-avatar"] = $datarray["author-avatar"];
+ $datarray["owner-id"] = $datarray["author-id"];
$datarray["guid"] = $guid;
$datarray["uri"] = $datarray["parent-uri"] = self::getUriFromGuid($author, $guid);
$datarray["verb"] = ACTIVITY_POST;
$datarray["gravity"] = GRAVITY_PARENT;
- $datarray["protocol"] = PROTOCOL_DIASPORA;
+ $datarray["protocol"] = Conversation::PARCEL_DIASPORA;
$datarray["source"] = $xml;
$prefix = share_header(
if ($message_id) {
logger("Stored reshare ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+ if ($datarray['uid'] == 0) {
+ Item::distribute($message_id);
+ }
return true;
} else {
return false;
*
* @return bool success
*/
- private static function itemRetraction($importer, $contact, $data)
+ private static function itemRetraction(array $importer, array $contact, $data)
{
$author = notags(unxmlify($data->author));
$target_guid = notags(unxmlify($data->target_guid));
}
// Fetch items that are about to be deleted
- $fields = ['uid', 'id', 'parent', 'parent-uri', 'author-link'];
+ $fields = ['uid', 'id', 'parent', 'parent-uri', 'author-link', 'file'];
// When we receive a public retraction, we delete every item that we find.
if ($importer['uid'] == 0) {
- $condition = ["`guid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid];
+ $condition = ['guid' => $target_guid, 'deleted' => false];
} else {
- $condition = ["`guid` = ? AND `uid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid, $importer['uid']];
+ $condition = ['guid' => $target_guid, 'deleted' => false, 'uid' => $importer['uid']];
}
- $r = dba::select('item', $fields, $condition);
- if (!DBM::is_result($r)) {
+
+ $r = Item::select($fields, $condition);
+ if (!DBA::isResult($r)) {
logger("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");
return false;
}
- while ($item = dba::fetch($r)) {
+ 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);
+ continue;
+ }
+
// Fetch the parent item
- $parent = dba::selectFirst('item', ['author-link', 'origin'], ['id' => $item["parent"]]);
+ $parent = Item::selectFirst(['author-link'], ['id' => $item["parent"]]);
// Only delete it if the parent author really fits
if (!link_compare($parent["author-link"], $contact["url"]) && !link_compare($item["author-link"], $contact["url"])) {
continue;
}
- Item::deleteById($item["id"]);
+ Item::delete(['id' => $item['id']]);
logger("Deleted target ".$target_guid." (".$item["id"].") from user ".$item["uid"]." parent: ".$item["parent"], LOGGER_DEBUG);
-
- // Now check if the retraction needs to be relayed by us
- if ($parent["origin"]) {
- // notify others
- Worker::add(PRIORITY_HIGH, "Notifier", "drop", $item["id"]);
- }
}
return true;
*
* @return bool Success
*/
- private static function receiveRetraction($importer, $sender, $data)
+ private static function receiveRetraction(array $importer, $sender, $data)
{
$target_type = notags(unxmlify($data->target_type));
return false;
}
+ if (!$contact) {
+ $contact = [];
+ }
+
logger("Got retraction for ".$target_type.", sender ".$sender." and user ".$importer["uid"], LOGGER_DEBUG);
switch ($target_type) {
case "StatusMessage":
return self::itemRetraction($importer, $contact, $data);
- case "Contact":
- case "Person":
- /// @todo What should we do with an "unshare"?
- // Removing the contact isn't correct since we still can read the public items
- Contact::remove($contact["id"]);
- return true;
+ case "PollParticipation":
+ case "Photo":
+ // Currently unsupported
+ break;
default:
logger("Unknown target type ".$target_type);
*
* @return int The message id of the newly created item
*/
- private static function receiveStatusMessage($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-name"] = $contact["name"];
$datarray["author-link"] = $contact["url"];
- $datarray["author-avatar"] = ((x($contact, "thumb")) ? $contact["thumb"] : $contact["photo"]);
+ $datarray["author-id"] = Contact::getIdForURL($contact["url"], 0);
- $datarray["owner-name"] = $datarray["author-name"];
$datarray["owner-link"] = $datarray["author-link"];
- $datarray["owner-avatar"] = $datarray["author-avatar"];
+ $datarray["owner-id"] = $datarray["author-id"];
$datarray["guid"] = $guid;
$datarray["uri"] = $datarray["parent-uri"] = self::getUriFromGuid($author, $guid);
$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"]);
if ($message_id) {
logger("Stored item ".$datarray["guid"]." with message id ".$message_id, LOGGER_DEBUG);
+ if ($datarray['uid'] == 0) {
+ Item::distribute($message_id);
+ }
return true;
} else {
return false;
*
* @return string the handle in the format user@domain.tld
*/
- private static function myHandle($contact)
+ private static function myHandle(array $contact)
{
- if ($contact["addr"] != "") {
+ if (!empty($contact["addr"])) {
return $contact["addr"];
}
$nick = $contact["nick"];
}
- return $nick."@".substr(System::baseUrl(), strpos(System::baseUrl(), "://") + 3);
+ return $nick . "@" . substr(System::baseUrl(), strpos(System::baseUrl(), "://") + 3);
}
*
* @return string The encrypted data
*/
- public static function encodePrivateData($msg, $user, $contact, $prvkey, $pubkey)
+ public static function encodePrivateData($msg, array $user, array $contact, $prvkey, $pubkey)
{
logger("Message: ".$msg, LOGGER_DATA);
*
* @return string The envelope
*/
- public static function buildMagicEnvelope($msg, $user)
+ public static function buildMagicEnvelope($msg, array $user)
{
$b64url_data = base64url_encode($msg);
$data = str_replace(["\n", "\r", " ", "\t"], ["", "", "", ""], $b64url_data);
*
* @return string The message that will be transmitted to other servers
*/
- public static function buildMessage($msg, $user, $contact, $prvkey, $pubkey, $public = false)
+ public static function buildMessage($msg, array $user, array $contact, $prvkey, $pubkey, $public = false)
{
// The message is put into an envelope with the sender's signature
$envelope = self::buildMagicEnvelope($msg, $user);
*
* @return int Result of the transmission
*/
- public static function transmit($owner, $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false)
+ public static function transmit(array $owner, array $contact, $envelope, $public_batch, $queue_run = false, $guid = "", $no_queue = false)
{
$a = get_app();
}
}
- logger("transmit: ".$logid."-".$guid." returns: ".$return_code);
+ logger("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'] != ACCOUNT_TYPE_RELAY)) {
+ if (!$no_queue && !empty($contact['contact-type']) && ($contact['contact-type'] != Contact::ACCOUNT_TYPE_RELAY)) {
logger("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"
*
* @return int Result of the transmission
*/
- private static function buildAndTransmit($owner, $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
+ private static function buildAndTransmit(array $owner, array $contact, $type, $message, $public_batch = false, $guid = "", $spool = false)
{
$msg = self::buildPostXml($type, $message);
logger('send guid '.$guid, LOGGER_DEBUG);
// Fallback if the private key wasn't transmitted in the expected field
- if ($owner['uprvkey'] == "") {
+ if (empty($owner['uprvkey'])) {
$owner['uprvkey'] = $owner['prvkey'];
}
$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);
*
* @return int The result of the transmission
*/
- private static function sendParticipation($contact, $item)
+ private static function sendParticipation(array $contact, array $item)
{
// Don't send notifications for private postings
if ($item['private']) {
// If the item belongs to a user, we take this user id.
if ($item['uid'] == 0) {
$condition = ['verified' => true, 'blocked' => false, 'account_removed' => false, 'account_expired' => false];
- $first_user = dba::selectFirst('user', ['uid'], $condition);
+ $first_user = DBA::selectFirst('user', ['uid'], $condition);
$owner = User::getOwnerDataById($first_user['uid']);
} else {
$owner = User::getOwnerDataById($item['uid']);
$author = self::myHandle($owner);
$message = ["author" => $author,
- "guid" => get_guid(32),
+ "guid" => System::createUUID(),
"parent_type" => "Post",
"parent_guid" => $item["guid"]];
*
* @return int The result of the transmission
*/
- public static function sendAccountMigration($owner, $contact, $uid)
+ public static function sendAccountMigration(array $owner, array $contact, $uid)
{
$old_handle = PConfig::get($uid, 'system', 'previous_addr');
$profile = self::createProfileData($uid);
*
* @return int The result of the transmission
*/
- public static function sendShare($owner, $contact)
+ public static function sendShare(array $owner, array $contact)
{
/**
* @todo support the different possible combinations of "following" and "sharing"
/*
switch ($contact["rel"]) {
- case CONTACT_IS_FRIEND:
+ case Contact::FRIEND:
$following = true;
$sharing = true;
- case CONTACT_IS_SHARING:
+
+ case Contact::SHARING:
$following = false;
$sharing = true;
- case CONTACT_IS_FOLLOWER:
+
+ case Contact::FOLLOWER:
$following = true;
$sharing = false;
}
*
* @return int The result of the transmission
*/
- public static function sendUnshare($owner, $contact)
+ public static function sendUnshare(array $owner, array $contact)
{
$message = ["author" => self::myHandle($owner),
"recipient" => $contact["addr"],
// Skip if it isn't a pure repeated messages
// Does it start with a share?
if ((strpos($body, "[share") > 0) && $complete) {
- return(false);
+ return false;
}
// Does it end with a share?
if (strlen($body) > (strrpos($body, "[/share]") + 8)) {
- return(false);
+ return false;
}
$attributes = preg_replace("/\[share(.*?)\]\s?(.*?)\s?\[\/share\]\s?/ism", "$1", $body);
// Skip if there is no shared message in there
if ($body == $attributes) {
- return(false);
+ return false;
}
// If we don't do the complete check we quit here
- if (!$complete) {
- return true;
- }
$guid = "";
preg_match("/guid='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$guid = $matches[1];
}
preg_match('/guid="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$guid = $matches[1];
}
- if ($guid != "") {
- $r = q(
- "SELECT `contact-id` FROM `item` WHERE `guid` = '%s' AND `network` IN ('%s', '%s') LIMIT 1",
- dbesc($guid),
- NETWORK_DFRN,
- NETWORK_DIASPORA
- );
- if ($r) {
+ if (($guid != "") && $complete) {
+ $condition = ['guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]];
+ $item = Item::selectFirst(['contact-id'], $condition);
+ if (DBA::isResult($item)) {
$ret= [];
- $ret["root_handle"] = self::handleFromContact($r[0]["contact-id"]);
+ $ret["root_handle"] = self::handleFromContact($item["contact-id"]);
$ret["root_guid"] = $guid;
- return($ret);
+ return $ret;
+ } elseif ($complete) {
+ // We are resharing something that isn't a DFRN or Diaspora post.
+ // So we have to return "false" on "$complete" to not trigger a reshare.
+ return false;
}
+ } elseif (($guid == "") && $complete) {
+ return false;
}
+ $ret["root_guid"] = $guid;
+
$profile = "";
preg_match("/profile='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profile = $matches[1];
}
preg_match('/profile="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
+ if (!empty($matches[1])) {
$profile = $matches[1];
}
$ret= [];
- $ret["root_handle"] = preg_replace("=https?://(.*)/u/(.*)=ism", "$2@$1", $profile);
- if (($ret["root_handle"] == $profile) || ($ret["root_handle"] == "")) {
- return(false);
- }
-
- $link = "";
- preg_match("/link='(.*?)'/ism", $attributes, $matches);
- if ($matches[1] != "") {
- $link = $matches[1];
- }
-
- preg_match('/link="(.*?)"/ism', $attributes, $matches);
- if ($matches[1] != "") {
- $link = $matches[1];
+ if ($profile != "") {
+ if (Contact::getIdForURL($profile)) {
+ $author = Contact::getDetailsByURL($profile);
+ $ret["root_handle"] = $author['addr'];
+ }
}
- $ret["root_guid"] = preg_replace("=https?://(.*)/posts/(.*)=ism", "$2", $link);
- if (($ret["root_guid"] == $link) || (trim($ret["root_guid"]) == "")) {
- return(false);
+ if (empty($ret) && !$complete) {
+ return true;
}
- return($ret);
+ return $ret;
}
/**
private static function buildEvent($event_id)
{
$r = q("SELECT `guid`, `uid`, `start`, `finish`, `nofinish`, `summary`, `desc`, `location`, `adjust` FROM `event` WHERE `id` = %d", intval($event_id));
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
return [];
}
$eventdata = [];
$r = q("SELECT `timezone` FROM `user` WHERE `uid` = %d", intval($event['uid']));
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
return [];
}
$user = $r[0];
$r = q("SELECT `addr`, `nick` FROM `contact` WHERE `uid` = %d AND `self`", intval($event['uid']));
- if (!DBM::is_result($r)) {
+ if (!DBA::isResult($r)) {
return [];
}
* 'type' -> Message type ("status_message" or "reshare")
* 'message' -> Array of XML elements of the status
*/
- public static function buildStatus($item, $owner)
+ public static function buildStatus(array $item, array $owner)
{
$cachekey = "diaspora:buildStatus:".$item['guid'];
$myaddr = self::myHandle($owner);
- $public = (($item["private"]) ? "false" : "true");
+ $public = ($item["private"] ? "false" : "true");
$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
$title = $item["title"];
$body = $item["body"];
+ if ($item['author-link'] != $item['owner-link']) {
+ require_once 'mod/share.php';
+ $body = share_header($item['author-name'], $item['author-link'], $item['author-avatar'],
+ "", $item['created'], $item['plink']) . $body . '[/share]';
+ }
+
// convert to markdown
$body = html_entity_decode(BBCode::toMarkdown($body));
if ($item["attach"]) {
$cnt = preg_match_all('/href=\"(.*?)\"(.*?)title=\"(.*?)\"/ism', $item["attach"], $matches, PREG_SET_ORDER);
- if (cnt) {
+ if ($cnt) {
$body .= "\n".L10n::t("Attachments:")."\n";
foreach ($matches as $mtch) {
$body .= "[".$mtch[3]."](".$mtch[1].")\n";
*
* @return int The result of the transmission
*/
- public static function sendStatus($item, $owner, $contact, $public_batch = false)
+ public static function sendStatus(array $item, array $owner, array $contact, $public_batch = false)
{
$status = self::buildStatus($item, $owner);
*
* @return array The data for a "like"
*/
- private static function constructLike($item, $owner)
+ private static function constructLike(array $item, array $owner)
{
- $p = q(
- "SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
- dbesc($item["thr-parent"])
- );
- if (!DBM::is_result($p)) {
+ $parent = Item::selectFirst(['guid', 'uri', 'parent-uri'], ['uri' => $item["thr-parent"]]);
+ if (!DBA::isResult($parent)) {
return false;
}
- $parent = $p[0];
-
$target_type = ($parent["uri"] === $parent["parent-uri"] ? "Post" : "Comment");
$positive = null;
if ($item['verb'] === ACTIVITY_LIKE) {
*
* @return array The data for an "EventParticipation"
*/
- private static function constructAttend($item, $owner)
+ private static function constructAttend(array $item, array $owner)
{
- $p = q(
- "SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
- dbesc($item["thr-parent"])
- );
- if (!DBM::is_result($p)) {
+ $parent = Item::selectFirst(['guid', 'uri', 'parent-uri'], ['uri' => $item["thr-parent"]]);
+ if (!DBA::isResult($parent)) {
return false;
}
- $parent = $p[0];
-
switch ($item['verb']) {
case ACTIVITY_ATTEND:
$attend_answer = 'accepted';
*
* @return array The data for a comment
*/
- private static function constructComment($item, $owner)
+ private static function constructComment(array $item, array $owner)
{
$cachekey = "diaspora:constructComment:".$item['guid'];
return $result;
}
- $p = q(
- "SELECT `guid` FROM `item` WHERE `parent` = %d AND `id` = %d LIMIT 1",
- intval($item["parent"]),
- intval($item["parent"])
- );
-
- if (!DBM::is_result($p)) {
+ $parent = Item::selectFirst(['guid'], ['id' => $item["parent"], 'parent' => $item["parent"]]);
+ if (!DBA::isResult($parent)) {
return false;
}
- $parent = $p[0];
-
$text = html_entity_decode(BBCode::toMarkdown($item["body"]));
$created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM);
*
* @return int The result of the transmission
*/
- public static function sendFollowup($item, $owner, $contact, $public_batch = false)
+ public static function sendFollowup(array $item, array $owner, array $contact, $public_batch = false)
{
if (in_array($item['verb'], [ACTIVITY_ATTEND, ACTIVITY_ATTENDNO, ACTIVITY_ATTENDMAYBE])) {
$message = self::constructAttend($item, $owner);
*
* @return string The message
*/
- private static function messageFromSignature($item, $signature)
+ private static function messageFromSignature(array $item, array $signature)
{
// Split the signed text
$signed_parts = explode(";", $signature['signed_text']);
*
* @return int The result of the transmission
*/
- public static function sendRelay($item, $owner, $contact, $public_batch = false)
+ public static function sendRelay(array $item, array $owner, array $contact, $public_batch = false)
{
if ($item["deleted"]) {
return self::sendRetraction($item, $owner, $contact, $public_batch, true);
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) {
+ $fields = ['signed_text', 'signature', 'signer'];
+ $signature = DBA::selectFirst('sign', $fields, ['iid' => $item["id"]]);
+ if (!DBA::isResult($signature)) {
logger("Couldn't fetch signatur for item ".$item["guid"]." (".$item["id"].")", LOGGER_DEBUG);
return false;
}
- $signature = $r[0];
-
// 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']) {
*
* @return int The result of the transmission
*/
- public static function sendRetraction($item, $owner, $contact, $public_batch = false, $relay = false)
+ public static function sendRetraction(array $item, array $owner, array $contact, $public_batch = false, $relay = false)
{
$itemaddr = self::handleFromContact($item["contact-id"], $item["author-id"]);
*
* @return int The result of the transmission
*/
- public static function sendMail($item, $owner, $contact)
+ public static function sendMail(array $item, array $owner, array $contact)
{
$myaddr = self::myHandle($owner);
- $r = q(
- "SELECT * FROM `conv` WHERE `id` = %d AND `uid` = %d LIMIT 1",
- intval($item["convid"]),
- intval($item["uid"])
- );
-
- if (!DBM::is_result($r)) {
+ $cnv = DBA::selectFirst('conv', [], ['id' => $item["convid"], 'uid' => $item["uid"]]);
+ if (!DBA::isResult($cnv)) {
logger("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",
- dbesc(NETWORK_DIASPORA),
+ DBA::escape(Protocol::DIASPORA),
intval($uid),
- intval(CONTACT_IS_SHARING)
+ intval(Contact::SHARING)
);
}
*
* @return bool Success
*/
- public static function storeLikeSignature($contact, $post_id)
+ public static function storeLikeSignature(array $contact, $post_id)
{
// Is the contact the owner? Then fetch the private key
if (!$contact['self'] || ($contact['uid'] == 0)) {
return false;
}
- $r = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($contact['uid']));
- if (!DBM::is_result($r)) {
+ $user = DBA::selectFirst('user', ['prvkey'], ['uid' => $contact["uid"]]);
+ if (!DBA::isResult($user)) {
return false;
}
- $contact["uprvkey"] = $r[0]['prvkey'];
+ $contact["uprvkey"] = $user['prvkey'];
- $r = q("SELECT * FROM `item` WHERE `id` = %d LIMIT 1", intval($post_id));
- if (!DBM::is_result($r)) {
+ $item = Item::selectFirst([], ['id' => $post_id]);
+ if (!DBA::isResult($item)) {
return false;
}
- if (!in_array($r[0]["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
+ if (!in_array($item["verb"], [ACTIVITY_LIKE, ACTIVITY_DISLIKE])) {
return false;
}
- $message = self::constructLike($r[0], $contact);
+ $message = self::constructLike($item, $contact);
if ($message === false) {
return false;
}
* 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)]);
+ DBA::insert('sign', ['iid' => $post_id, 'signed_text' => json_encode($message)]);
logger('Stored diaspora like signature');
return true;
*
* @return bool Success
*/
- public static function storeCommentSignature($item, $contact, $uprvkey, $message_id)
+ public static function storeCommentSignature(array $item, array $contact, $uprvkey, $message_id)
{
if ($uprvkey == "") {
logger('No private key, so not storing comment signature', LOGGER_DEBUG);
* 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)]);
+ DBA::insert('sign', ['iid' => $message_id, 'signed_text' => json_encode($message)]);
logger('Stored diaspora comment signature');
return true;
projects / friendica.git / blobdiff