*/
private static function verify_magic_envelope($envelope) {
- $basedom = parse_xml_string($envelope, false);
+ $basedom = parse_xml_string($envelope);
if (!is_object($basedom)) {
logger("Envelope is no XML file");
$basedom = parse_xml_string($xml);
if (!is_object($basedom)) {
- logger('Received data does not seem to be an XML. Discarding.');
+ logger('Received data does not seem to be an XML. Discarding. '.$xml);
http_status_exit(400);
}
$public = true;
$author_link = str_replace('acct:','',$children->header->author_id);
} else {
+ // This happens with posts from a relais
+ if (!$importer) {
+ logger("This is no private post in the old format", LOGGER_DEBUG);
+ return false;
+ }
$encrypted_header = json_decode(base64_decode($children->encrypted_header));
$decrypted = self::aes_decrypt($outer_key, $outer_iv, $ciphertext);
logger('decrypted: '.$decrypted, LOGGER_DEBUG);
- $idom = parse_xml_string($decrypted,false);
+ $idom = parse_xml_string($decrypted);
$inner_iv = base64_decode($idom->iv);
$inner_aes_key = base64_decode($idom->aes_key);
}
}
+ // 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(), array('retraction'))) {
+ $target = notags(unxmlify($fields->target_type));
+ if (in_array($target, array("Comment", "Like", "Post", "Reshare", "StatusMessage"))) {
+ logger('processing retraction for '.$target, LOGGER_DEBUG);
+ $importer = array("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')
*/
private static function valid_posting($msg) {
- $data = parse_xml_string($msg["message"], false);
+ $data = parse_xml_string($msg["message"]);
if (!is_object($data)) {
logger("No valid XML ".$msg["message"], LOGGER_DEBUG);
return false;
}
- $source_xml = parse_xml_string($x, false);
+ $source_xml = parse_xml_string($x);
if (!is_object($source_xml))
return false;
* @return array the item record
*/
private static function parent_item($uid, $guid, $author, $contact) {
- $r = q("SELECT `id`, `parent`, `body`, `wall`, `uri`, `private`, `origin`,
+ $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",
*
* @return string the post link
*/
- private static function plink($addr, $guid) {
+ private static function plink($addr, $guid, $parent_guid = '') {
$r = q("SELECT `url`, `nick`, `network` FROM `fcontact` WHERE `addr`='%s' LIMIT 1", dbesc($addr));
// Fallback
- if (!$r)
- return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+ if (!dbm::is_result($r)) {
+ if ($parent_guid != '') {
+ return "https://".substr($addr,strpos($addr,"@") + 1)."/posts/".$parent_guid."#".$guid;
+ } else {
+ 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 ($s)
+ 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 ($r[0]["network"] == NETWORK_DFRN) {
+ return str_replace("/profile/".$r[0]["nick"]."/", "/display/".$guid, $r[0]["url"]."/");
+ }
- if (self::is_redmatrix($r[0]["url"]))
+ if (self::is_redmatrix($r[0]["url"])) {
return $r[0]["url"]."/?f=&mid=".$guid;
+ }
- return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+ if ($parent_guid != '') {
+ return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$parent_guid."#".$guid;
+ } else {
+ return "https://".substr($addr,strpos($addr,"@")+1)."/posts/".$guid;
+ }
}
/**
$datarray["changed"] = $datarray["created"] = $datarray["edited"] = $created_at;
+ $datarray["plink"] = self::plink($author, $guid, $parent_item['guid']);
+
$body = diaspora2bb($text);
$datarray["body"] = self::replace_people_guid($body, $person["url"]);
// If it is a reshared post from another network then reformat to avoid display problems with two share elements
if (self::is_reshare($r[0]["body"], true)) {
$r = array();
- } elseif (self::is_reshare($r[0]["body"], false)) {
+ } elseif (self::is_reshare($r[0]["body"], false) || strstr($r[0]["body"], "[share")) {
$r[0]["body"] = diaspora2bb(bb2diaspora($r[0]["body"]));
$r[0]["body"] = self::replace_people_guid($r[0]["body"], $r[0]["author-link"]);
return false;
}
- if (!isset($contact["url"])) {
+ if (empty($contact["url"])) {
$contact["url"] = $person["url"];
}
- $r = q("SELECT `id`, `parent`, `parent-uri`, `author-link` FROM `item` WHERE `guid` = '%s' AND `uid` = %d AND NOT `file` LIKE '%%[%%' LIMIT 1",
- dbesc($target_guid),
- intval($importer["uid"])
- );
- if (!$r) {
- logger("Target guid ".$target_guid." was not found for user ".$importer["uid"]);
+ // Fetch items that are about to be deleted
+ $fields = array('uid', 'id', 'parent', 'parent-uri', 'author-link');
+
+ // When we receive a public retraction, we delete every item that we find.
+ if ($importer['uid'] == 0) {
+ $condition = array("`guid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid);
+ } else {
+ $condition = array("`guid` = ? AND `uid` = ? AND NOT `file` LIKE '%%[%%' AND NOT `deleted`", $target_guid, $importer['uid']);
+ }
+ $r = dba::select('item', $fields, $condition);
+ if (!dbm::is_result($r)) {
+ logger("Target guid ".$target_guid." was not found on this system for user ".$importer['uid'].".");
return false;
}
- // Check if the sender is the thread owner
- $p = q("SELECT `id`, `author-link`, `origin` FROM `item` WHERE `id` = %d",
- intval($r[0]["parent"]));
+ while ($item = dba::fetch($r)) {
+ // Fetch the parent item
+ $parent = dba::select('item', array('author-link', 'origin'), array('id' => $item["parent"]), array('limit' => 1));
- // Only delete it if the parent author really fits
- if (!link_compare($p[0]["author-link"], $contact["url"]) && !link_compare($r[0]["author-link"], $contact["url"])) {
- logger("Thread author ".$p[0]["author-link"]." and item author ".$r[0]["author-link"]." don't fit to expected contact ".$contact["url"], LOGGER_DEBUG);
- return false;
- }
+ // Only delete it if the parent author really fits
+ if (!link_compare($parent["author-link"], $contact["url"]) && !link_compare($item["author-link"], $contact["url"])) {
+ logger("Thread author ".$parent["author-link"]." and item author ".$item["author-link"]." don't fit to expected contact ".$contact["url"], LOGGER_DEBUG);
+ continue;
+ }
- // Currently we don't have a central deletion function that we could use in this case. The function "item_drop" doesn't work for that case
- dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
- 'edited' => datetime_convert(), 'changed' => datetime_convert()),
- array('id' => $r[0]["id"]));
+ // Currently we don't have a central deletion function that we could use in this case. The function "item_drop" doesn't work for that case
+ dba::update('item', array('deleted' => true, 'title' => '', 'body' => '',
+ 'edited' => datetime_convert(), 'changed' => datetime_convert()),
+ array('id' => $item["id"]));
- delete_thread($r[0]["id"], $r[0]["parent-uri"]);
+ // Delete the thread - if it is a starting post and not a comment
+ if ($target_type != 'Comment') {
+ delete_thread($item["id"], $item["parent-uri"]);
+ }
- logger("Deleted target ".$target_guid." (".$r[0]["id"].") from user ".$importer["uid"]." parent: ".$p[0]["id"], LOGGER_DEBUG);
+ 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 ($p[0]["origin"]) {
- // notify others
- proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $r[0]["id"]);
+ // Now check if the retraction needs to be relayed by us
+ if ($parent["origin"]) {
+ // notify others
+ proc_run(PRIORITY_HIGH, "include/notifier.php", "drop", $item["id"]);
+ }
}
return true;