*/
private function author_contact_by_url($contact, $person, $uid) {
- $r = q("SELECT `id`, `network` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
+ $r = q("SELECT `id`, `network`, `url` FROM `contact` WHERE `nurl` = '%s' AND `uid` = %d LIMIT 1",
dbesc(normalise_link($person["url"])), intval($uid));
if ($r) {
$cid = $r[0]["id"];
$network = $r[0]["network"];
+
+ // We are receiving content from a user that is about to be terminated
+ // This means the user is vital, so we remove a possible termination date.
+ unmark_for_death($contact);
} else {
$cid = $contact["id"];
$network = NETWORK_DIASPORA;
}
- return (array("cid" => $cid, "network" => $network));
+ return array("cid" => $cid, "network" => $network);
}
/**
$r = q("SELECT `id` FROM `mail` WHERE `uri` = '%s' LIMIT 1",
dbesc($message_uri)
);
- if($r) {
+ if (dbm::is_result($r)) {
logger("duplicate message already delivered.", LOGGER_DEBUG);
return false;
}
$body = "[img]".unxmlify($photo->remote_photo_path).
unxmlify($photo->remote_photo_name)."[/img]\n".$body;
- $datarray["object-type"] = ACTIVITY_OBJ_PHOTO;
+ $datarray["object-type"] = ACTIVITY_OBJ_IMAGE;
} else {
$datarray["object-type"] = ACTIVITY_OBJ_NOTE;
} else {
// queue message for redelivery
add_to_queue($contact["id"], NETWORK_DIASPORA, $slap, $public_batch);
+
+ // The message could not be delivered. We mark the contact as "dead"
+ mark_for_death($contact);
}
+ } elseif (($return_code >= 200) AND ($return_code <= 299)) {
+ // We successfully delivered a message, the contact is alive
+ unmark_for_death($contact);
}
return(($return_code) ? $return_code : (-1));
"created_at" => $created,
"provider_display_name" => $item["app"]);
- if (count($location) == 0)
+ // Diaspora rejects messages when they contain a location without "lat" or "lng"
+ if (!isset($location["lat"]) OR !isset($location["lng"])) {
unset($message["location"]);
+ }
$type = "status_message";
}
$p = q("SELECT `guid`, `uri`, `parent-uri` FROM `item` WHERE `uri` = '%s' LIMIT 1",
dbesc($item["thr-parent"]));
- if(!$p)
+ if (!dbm::is_result($p))
return false;
$parent = $p[0];
intval($item["parent"])
);
- if (!$p)
+ if (!dbm::is_result($p))
return false;
$parent = $p[0];
intval($item["uid"])
);
- if (!$r) {
+ if (!dbm::is_result($r)) {
logger("conversation not found.");
return;
}