jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Small restructuring

Browse source
This commit is contained in:
Michael Vogel 2015-06-21 01:36:23 +02:00
parent df7b907bc4
commit 8229737d2d
1 changed files with 13 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
include/ostatus.php
View file

@ -400,18 +400,6 @@ function ostatus_import($xml,$importer,&$contact, &$hub) {
$item_id = ostatus_completion($conversation, $importer["uid"], $item); $item_id = ostatus_completion($conversation, $importer["uid"], $item);
if ($item_id <= 0) {
$reason = $item_id;
$item["app"] .= $item_id;
$item_id = item_store($item, true);
if ($item_id) {
logger("Uri ".$item["uri"]." wasn't found in conversation ".$conversation, LOGGER_DEBUG);
ostatus_store_conversation($item_id, $conversation_url);
}
}
//echo $xml;
//print_r($item);
if (!$item_id) { if (!$item_id) {
logger("Error storing item ".print_r($item, true), LOGGER_DEBUG); logger("Error storing item ".print_r($item, true), LOGGER_DEBUG);
continue; continue;
@ -509,7 +497,7 @@ function check_conversations($override = false) {
function ostatus_completion($conversation_url, $uid, $item = array()) { function ostatus_completion($conversation_url, $uid, $item = array()) {
$item_stored = -3; $item_stored = -1;
$conversation_url = ostatus_convert_href($conversation_url); $conversation_url = ostatus_convert_href($conversation_url);
@ -536,7 +524,7 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
// Preset the parent // Preset the parent
$r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid`=%d", $uid); $r = q("SELECT `id` FROM `contact` WHERE `self` AND `uid`=%d", $uid);
if (!$r) if (!$r)
return(-1); return(-2);
$parent = array(); $parent = array();
$parent["id"] = 0; $parent["id"] = 0;
@ -591,7 +579,7 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
return($item_stored); return($item_stored);
} else } else
return(-2); return(-3);
} }
$items = array_reverse($items); $items = array_reverse($items);
@ -821,10 +809,10 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
unset($arr["coord"]); unset($arr["coord"]);
// Copy fields from given item array // Copy fields from given item array
if (isset($item["uri"]) AND ($item["uri"] == $arr["uri"])) { if (isset($item["uri"]) AND (($item["uri"] == $arr["uri"]) OR ($item["uri"] == $single_conv->id))) {
$copy_fields = array("owner-name", "owner-link", "owner-avatar", "author-name", "author-link", "author-avatar", $copy_fields = array("owner-name", "owner-link", "owner-avatar", "author-name", "author-link", "author-avatar",
"gravity", "body", "object-type", "verb", "created", "edited", "coord", "tag", "gravity", "body", "object-type", "verb", "created", "edited", "coord", "tag",
"attach", "app", "type", "location", "contact-id"); "attach", "app", "type", "location", "contact-id", "uri");
foreach ($copy_fields AS $field) foreach ($copy_fields AS $field)
if (isset($item[$field])) if (isset($item[$field]))
$arr[$field] = $item[$field]; $arr[$field] = $item[$field];
@ -859,6 +847,14 @@ function ostatus_completion($conversation_url, $uid, $item = array()) {
} }
} }
if (($item_stored < 0) AND (count($item) > 0)) {
$item_stored = item_store($item, true);
if ($item_stored) {
logger("Uri ".$item["uri"]." wasn't found in conversation ".$conversation_url, LOGGER_DEBUG);
ostatus_store_conversation($item_stored, $conversation_url);
}
}
return($item_stored); return($item_stored);
} }