X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FDiaspora.php;h=b5ecfcefcc9d16f1b934fdd7d8d87e735249e1b2;hb=510032444f7d8f51a196b0b20792ebcc21a883e0;hp=ccd825d4e17bb2350a7152e81981780df057fd5a;hpb=ff1074d38fb992d9ff897be95b5fa480fbfb7f24;p=friendica.git diff --git a/src/Protocol/Diaspora.php b/src/Protocol/Diaspora.php index ccd825d4e1..b5ecfcefcc 100644 --- a/src/Protocol/Diaspora.php +++ b/src/Protocol/Diaspora.php @@ -16,10 +16,12 @@ use Friendica\Core\Cache; 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; @@ -29,10 +31,9 @@ use Friendica\Model\User; 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'; @@ -54,13 +55,14 @@ class Diaspora * * @return array of relay servers */ - public static function relayList($item_id, $contacts = []) + 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); @@ -70,37 +72,37 @@ class Diaspora 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 (!DBM::is_result($parent)) { + 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' => $parent['parent']]; - $tags = dba::select('term', ['term'], $condition); + $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']; } } @@ -144,10 +146,10 @@ class Diaspora // Fetch the relay contact $condition = ['uid' => 0, 'nurl' => normalise_link($server_url), - 'contact-type' => ACCOUNT_TYPE_RELAY]; - $contact = dba::selectFirst('contact', $fields, $condition); + 'contact-type' => Contact::ACCOUNT_TYPE_RELAY]; + $contact = DBA::selectFirst('contact', $fields, $condition); - if (DBM::is_result($contact)) { + if (DBA::isResult($contact)) { if ($contact['archive'] || $contact['blocked']) { return false; } @@ -155,8 +157,8 @@ class Diaspora } else { self::setRelayContact($server_url); - $contact = dba::selectFirst('contact', $fields, $condition); - if (DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', $fields, $condition); + if (DBA::isResult($contact)) { return $contact; } } @@ -171,25 +173,25 @@ class Diaspora * @param string $server_url The url of the server * @param array $network_fields Optional network specific fields */ - public static function setRelayContact($server_url, $network_fields = []) + public static function setRelayContact($server_url, array $network_fields = []) { $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_IS_FOLLOWER, 'blocked' => false, + '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' => ACCOUNT_TYPE_RELAY]; + 'contact-type' => Contact::ACCOUNT_TYPE_RELAY]; - if (dba::exists('contact', $condition)) { + if (DBA::exists('contact', $condition)) { unset($fields['created']); } - dba::update('contact', $fields, $condition, true); + DBA::update('contact', $fields, $condition, true); } /** @@ -204,15 +206,15 @@ class Diaspora * * @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']; } @@ -234,7 +236,7 @@ class Diaspora $contacts[] = $contact; } } - dba::close($r); + DBA::close($r); return $contacts; } @@ -363,15 +365,16 @@ class Diaspora /** * @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); @@ -386,7 +389,11 @@ class Diaspora 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); @@ -401,7 +408,11 @@ class Diaspora 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); @@ -423,19 +434,31 @@ class Diaspora $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), @@ -454,7 +477,7 @@ class Diaspora * '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); @@ -604,7 +627,7 @@ class Diaspora return false; } - $importer = ["uid" => 0, "page-flags" => PAGE_FREELOVE]; + $importer = ["uid" => 0, "page-flags" => Contact::PAGE_FREELOVE]; $success = self::dispatch($importer, $msg, $fields); return $success; @@ -619,7 +642,7 @@ class Diaspora * * @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") @@ -898,8 +921,8 @@ class Diaspora { $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 @@ -913,18 +936,18 @@ class Diaspora } } - 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)) { + 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; } } @@ -950,7 +973,7 @@ class Diaspora $condition = ['url' => $arr["url"], 'network' => $arr["network"]]; - dba::update('fcontact', $fields, $condition, true); + DBA::update('fcontact', $fields, $condition, true); } /** @@ -968,13 +991,10 @@ class Diaspora 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"]); } } @@ -983,7 +1003,7 @@ class Diaspora 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); @@ -1016,11 +1036,11 @@ class Diaspora $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']; } @@ -1039,46 +1059,26 @@ class Diaspora */ 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; } /** @@ -1090,7 +1090,7 @@ class Diaspora * * @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. @@ -1099,14 +1099,14 @@ class Diaspora */ // 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"); //} @@ -1115,11 +1115,11 @@ class Diaspora // 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) && in_array($importer["page-flags"], [PAGE_COMMUNITY, PAGE_PRVGROUP])) { + } 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? @@ -1140,13 +1140,15 @@ class Diaspora * * @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; @@ -1171,7 +1173,7 @@ class Diaspora private static function messageExists($uid, $guid) { $item = Item::selectFirst(['id'], ['uid' => $uid, 'guid' => $guid]); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { logger("message ".$guid." already exists for user ".$uid); return $item["id"]; } @@ -1185,7 +1187,7 @@ class Diaspora * @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( @@ -1267,6 +1269,11 @@ class Diaspora 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); @@ -1378,7 +1385,7 @@ class Diaspora * * @return array the item record */ - private static function parentItem($uid, $guid, $author, $contact) + private static function parentItem($uid, $guid, $author, array $contact) { $fields = ['id', 'parent', 'body', 'wall', 'uri', 'guid', 'private', 'origin', 'author-name', 'author-link', 'author-avatar', @@ -1386,12 +1393,13 @@ class Diaspora $condition = ['uid' => $uid, 'guid' => $guid]; $item = Item::selectFirst($fields, $condition); - if (!DBM::is_result($item)) { - $result = self::storeByGuid($guid, $contact["url"], $uid); + if (!DBA::isResult($item)) { + $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) { @@ -1401,7 +1409,7 @@ class Diaspora } } - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { logger("parent item not found: parent: ".$guid." - user: ".$uid); return false; } else { @@ -1424,13 +1432,13 @@ class Diaspora 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]; @@ -1470,7 +1478,7 @@ class Diaspora } } - if ($contact["network"] == NETWORK_DFRN) { + if ($contact["network"] == Protocol::DFRN) { return str_replace("/profile/" . $contact["nick"] . "/", "/display/" . $guid, $contact["url"] . "/"); } @@ -1493,7 +1501,7 @@ class Diaspora * * @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)); @@ -1520,7 +1528,7 @@ class Diaspora // 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; } @@ -1531,7 +1539,7 @@ class Diaspora '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'], @@ -1539,7 +1547,7 @@ class Diaspora '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.'); @@ -1557,12 +1565,12 @@ class Diaspora { $author = notags(unxmlify($data->author)); - $contacts = dba::select('contact', ['id'], ['addr' => $author]); - while ($contact = dba::fetch($contacts)) { + $contacts = DBA::select('contact', ['id'], ['addr' => $author]); + while ($contact = DBA::fetch($contacts)) { Contact::remove($contact["id"]); } - dba::delete('gcontact', ['addr' => $author]); + DBA::delete('gcontact', ['addr' => $author]); logger('Removed contacts for ' . $author); @@ -1581,20 +1589,16 @@ class Diaspora private static function getUriFromGuid($author, $guid, $onlyfound = false) { $item = Item::selectFirst(['uri'], ['guid' => $guid]); - if (DBM::is_result($item)) { + 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 ""; @@ -1611,7 +1615,7 @@ class Diaspora private static function getGuidFromUri($uri, $uid) { $item = Item::selectFirst(['guid'], ['uri' => $uri, 'uid' => $uid]); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { return $item["guid"]; } else { return false; @@ -1628,10 +1632,10 @@ class Diaspora private static function importerForGuid($guid) { $item = Item::selectFirst(['uid'], ['origin' => true, 'guid' => $guid]); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { logger("Found user ".$item['uid']." as owner of item ".$guid, LOGGER_DEBUG); - $contact = dba::selectFirst('contact', [], ['self' => true, 'uid' => $item['uid']]); - if (DBM::is_result($contact)) { + $contact = DBA::selectFirst('contact', [], ['self' => true, 'uid' => $item['uid']]); + if (DBA::isResult($contact)) { return $contact; } } @@ -1648,7 +1652,7 @@ class Diaspora * * @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)); @@ -1707,7 +1711,6 @@ class Diaspora $datarray["guid"] = $guid; $datarray["uri"] = self::getUriFromGuid($author, $guid); - $datarray["type"] = "remote-comment"; $datarray["verb"] = ACTIVITY_POST; $datarray["gravity"] = GRAVITY_COMMENT; @@ -1719,7 +1722,7 @@ class Diaspora $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; @@ -1766,7 +1769,7 @@ class Diaspora * * @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)); @@ -1797,14 +1800,9 @@ class Diaspora $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; } @@ -1813,24 +1811,24 @@ class Diaspora "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( [ @@ -1840,10 +1838,10 @@ class Diaspora "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"] ); @@ -1859,7 +1857,7 @@ class Diaspora * * @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)); @@ -1879,37 +1877,21 @@ class Diaspora 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) { @@ -1933,7 +1915,7 @@ class Diaspora * * @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)); @@ -1981,22 +1963,18 @@ class Diaspora $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); - $datarray["type"] = "activity"; $datarray["verb"] = $verb; $datarray["gravity"] = GRAVITY_ACTIVITY; $datarray["parent-uri"] = $parent_item["uri"]; @@ -2005,6 +1983,9 @@ class Diaspora $datarray["body"] = $verb; + // 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 = Item::selectFirst(['origin'], ['id' => $parent_item["parent"]]); @@ -2043,7 +2024,7 @@ class Diaspora * * @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)); @@ -2058,14 +2039,10 @@ class Diaspora $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; } @@ -2082,14 +2059,9 @@ class Diaspora $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; } @@ -2098,24 +2070,24 @@ class Diaspora "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; } @@ -2127,7 +2099,7 @@ class Diaspora * * @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)); @@ -2145,7 +2117,7 @@ class Diaspora } $item = Item::selectFirst(['id'], ['guid' => $parent_guid, 'origin' => true, 'private' => false]); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { logger('Item not found, no origin or private: '.$parent_guid); return false; } @@ -2160,8 +2132,8 @@ class Diaspora 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 @@ -2178,7 +2150,7 @@ class Diaspora 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; } @@ -2191,7 +2163,7 @@ class Diaspora * * @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 @@ -2206,7 +2178,7 @@ class Diaspora * * @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; @@ -2220,7 +2192,7 @@ class Diaspora * * @return bool Success */ - private static function receiveProfile($importer, $data) + private static function receiveProfile(array $importer, $data) { $author = strtolower(notags(unxmlify($data->author))); @@ -2289,9 +2261,9 @@ class Diaspora $fields['bd'] = $birthday; } - dba::update('contact', $fields, ['id' => $contact['id']]); + 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, @@ -2313,14 +2285,14 @@ class Diaspora * @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"]] ); } @@ -2334,7 +2306,7 @@ class Diaspora * * @return bool Success */ - private static function receiveContactRequest($importer, $data) + private static function receiveContactRequest(array $importer, $data) { $author = unxmlify($data->author); $recipient = unxmlify($data->recipient); @@ -2371,11 +2343,11 @@ class Diaspora // 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; @@ -2386,7 +2358,7 @@ class Diaspora } } - 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) { @@ -2402,7 +2374,7 @@ class Diaspora $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; } @@ -2413,18 +2385,18 @@ class Diaspora "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 ); @@ -2444,7 +2416,7 @@ class Diaspora Contact::updateAvatar($ret["photo"], $importer['uid'], $contact_record["id"], true); - if (in_array($importer["page-flags"], [PAGE_NORMAL, PAGE_PRVGROUP])) { + 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 @@ -2456,9 +2428,9 @@ class Diaspora 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 @@ -2467,16 +2439,17 @@ class Diaspora 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( @@ -2489,15 +2462,15 @@ class Diaspora 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]); @@ -2529,7 +2502,7 @@ class Diaspora $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false]; $item = Item::selectFirst($fields, $condition); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { logger("reshared message ".$guid." already exists on system."); // Maybe it is already a reshared item? @@ -2551,7 +2524,7 @@ class Diaspora } } - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { if (empty($orig_author)) { logger('Empty author for guid ' . $guid . '. Quitting.'); return false; @@ -2573,7 +2546,7 @@ class Diaspora $condition = ['guid' => $guid, 'visible' => true, 'deleted' => false, 'private' => false]; $item = Item::selectFirst($fields, $condition); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { // If it is a reshared post from another network then reformat to avoid display problems with two share elements if (self::isReshare($item["body"], false)) { $item["body"] = Markdown::toBBCode(BBCode::toMarkdown($item["body"])); @@ -2596,7 +2569,7 @@ class Diaspora * * @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)); @@ -2627,7 +2600,7 @@ class Diaspora $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); @@ -2641,7 +2614,7 @@ class Diaspora $datarray["verb"] = ACTIVITY_POST; $datarray["gravity"] = GRAVITY_PARENT; - $datarray["protocol"] = PROTOCOL_DIASPORA; + $datarray["protocol"] = Conversation::PARCEL_DIASPORA; $datarray["source"] = $xml; $prefix = share_header( @@ -2688,7 +2661,7 @@ class Diaspora * * @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)); @@ -2715,7 +2688,7 @@ class Diaspora } $r = Item::select($fields, $condition); - if (!DBM::is_result($r)) { + if (!DBA::isResult($r)) { logger("Target guid ".$target_guid." was not found on this system for user ".$importer['uid']."."); return false; } @@ -2752,7 +2725,7 @@ class Diaspora * * @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)); @@ -2762,6 +2735,10 @@ class Diaspora return false; } + if (!$contact) { + $contact = []; + } + logger("Got retraction for ".$target_type.", sender ".$sender." and user ".$importer["uid"], LOGGER_DEBUG); switch ($target_type) { @@ -2793,7 +2770,7 @@ class Diaspora * * @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)); @@ -2851,7 +2828,7 @@ class Diaspora $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); @@ -2865,7 +2842,7 @@ class Diaspora $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"]); @@ -2913,9 +2890,9 @@ class Diaspora * * @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"]; } @@ -2927,7 +2904,7 @@ class Diaspora $nick = $contact["nick"]; } - return $nick."@".substr(System::baseUrl(), strpos(System::baseUrl(), "://") + 3); + return $nick . "@" . substr(System::baseUrl(), strpos(System::baseUrl(), "://") + 3); } @@ -2942,7 +2919,7 @@ class Diaspora * * @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); @@ -2980,7 +2957,7 @@ class Diaspora * * @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); @@ -3023,7 +3000,7 @@ class Diaspora * * @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); @@ -3067,7 +3044,7 @@ class Diaspora * * @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(); @@ -3113,10 +3090,10 @@ class Diaspora 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" @@ -3158,7 +3135,7 @@ class Diaspora * * @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); @@ -3166,14 +3143,14 @@ class Diaspora 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); @@ -3192,7 +3169,7 @@ class Diaspora * * @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']) { @@ -3211,7 +3188,7 @@ class Diaspora // 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']); @@ -3220,7 +3197,7 @@ class Diaspora $author = self::myHandle($owner); $message = ["author" => $author, - "guid" => System::createGUID(32), + "guid" => System::createUUID(), "parent_type" => "Post", "parent_guid" => $item["guid"]]; @@ -3241,7 +3218,7 @@ class Diaspora * * @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); @@ -3266,7 +3243,7 @@ class Diaspora * * @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" @@ -3277,13 +3254,15 @@ class Diaspora /* 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; } @@ -3307,7 +3286,7 @@ class Diaspora * * @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"], @@ -3352,19 +3331,19 @@ class Diaspora $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 != "") && $complete) { - $condition = ['guid' => $guid, 'network' => [NETWORK_DFRN, NETWORK_DIASPORA]]; + $condition = ['guid' => $guid, 'network' => [Protocol::DFRN, Protocol::DIASPORA]]; $item = Item::selectFirst(['contact-id'], $condition); - if (DBM::is_result($item)) { + if (DBA::isResult($item)) { $ret= []; $ret["root_handle"] = self::handleFromContact($item["contact-id"]); $ret["root_guid"] = $guid; @@ -3382,12 +3361,12 @@ class Diaspora $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]; } @@ -3417,7 +3396,7 @@ class Diaspora 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 []; } @@ -3426,14 +3405,14 @@ class Diaspora $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 []; } @@ -3499,7 +3478,7 @@ class Diaspora * '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']; @@ -3510,7 +3489,7 @@ class Diaspora $myaddr = self::myHandle($owner); - $public = (($item["private"]) ? "false" : "true"); + $public = ($item["private"] ? "false" : "true"); $created = DateTimeFormat::utc($item["created"], DateTimeFormat::ATOM); @@ -3545,7 +3524,7 @@ class Diaspora 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"; @@ -3613,7 +3592,7 @@ class Diaspora * * @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); @@ -3628,10 +3607,10 @@ class Diaspora * * @return array The data for a "like" */ - private static function constructLike($item, $owner) + private static function constructLike(array $item, array $owner) { $parent = Item::selectFirst(['guid', 'uri', 'parent-uri'], ['uri' => $item["thr-parent"]]); - if (!DBM::is_result($parent)) { + if (!DBA::isResult($parent)) { return false; } @@ -3659,10 +3638,10 @@ class Diaspora * * @return array The data for an "EventParticipation" */ - private static function constructAttend($item, $owner) + private static function constructAttend(array $item, array $owner) { $parent = Item::selectFirst(['guid', 'uri', 'parent-uri'], ['uri' => $item["thr-parent"]]); - if (!DBM::is_result($parent)) { + if (!DBA::isResult($parent)) { return false; } @@ -3696,7 +3675,7 @@ class Diaspora * * @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']; @@ -3706,7 +3685,7 @@ class Diaspora } $parent = Item::selectFirst(['guid'], ['id' => $item["parent"], 'parent' => $item["parent"]]); - if (!DBM::is_result($parent)) { + if (!DBA::isResult($parent)) { return false; } @@ -3740,7 +3719,7 @@ class Diaspora * * @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); @@ -3770,7 +3749,7 @@ class Diaspora * * @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']); @@ -3820,7 +3799,7 @@ class Diaspora * * @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); @@ -3833,19 +3812,13 @@ class Diaspora 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']) { @@ -3890,7 +3863,7 @@ class Diaspora * * @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"]); @@ -3922,21 +3895,15 @@ class Diaspora * * @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"], @@ -4091,7 +4058,7 @@ class Diaspora $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]) .' '; } } @@ -4137,9 +4104,9 @@ class Diaspora $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) ); } @@ -4163,7 +4130,7 @@ class Diaspora * * @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)) { @@ -4171,15 +4138,15 @@ class Diaspora 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']; $item = Item::selectFirst([], ['id' => $post_id]); - if (!DBM::is_result($item)) { + if (!DBA::isResult($item)) { return false; } @@ -4198,7 +4165,7 @@ class Diaspora * 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; @@ -4214,7 +4181,7 @@ class Diaspora * * @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); @@ -4234,7 +4201,7 @@ class Diaspora * 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;