Remote-self: relocated the code (may now work?)

This commit is contained in:
Michael Vogel 2014-10-27 21:44:30 +01:00
parent 332531599e
commit f4860d3fd0

View file

@ -2619,27 +2619,32 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
$notify = true; $notify = true;
} }
if (!isset($datarray["app"]) OR ($datarray["app"] == ""))
$datarray["app"] = network_to_name($contact['network']);
if ($contact['network'] === NETWORK_FEED) if ($contact['network'] === NETWORK_FEED)
$datarray['private'] = 0; $datarray['private'] = 0;
elseif ($notify) { elseif ($notify) {
// At first store the original post $datarray2 = $datarray;
$r = item_store($datarray, false, false);
// Then create a new guid and uri and post it again as a forwarded post // Create a new guid and uri and post it as a forwarded post
$datarray["guid"] = get_guid(32); $datarray2["guid"] = get_guid(32);
$datarray["uri"] = item_new_uri($a->get_hostname(),$importer['uid']); $datarray2["uri"] = item_new_uri($a->get_hostname(),$importer['uid']);
$r = q("SELECT `id`,`url`,`name`,`photo`,`network` FROM `contact` WHERE `uid` = %d AND `self`", intval($importer['uid'])); $r = q("SELECT `id`,`url`,`name`,`photo`,`network` FROM `contact` WHERE `uid` = %d AND `self`", intval($importer['uid']));
if (count($r)) { if (count($r)) {
$datarray['contact-id'] = $r[0]["id"]; $datarray2['contact-id'] = $r[0]["id"];
$datarray['owner-name'] = $r[0]["name"]; $datarray2['owner-name'] = $r[0]["name"];
$datarray['owner-link'] = $r[0]["url"]; $datarray2['owner-link'] = $r[0]["url"];
$datarray['owner-avatar'] = $r[0]["photo"]; $datarray2['owner-avatar'] = $r[0]["photo"];
} }
}
if (!isset($datarray["app"]) OR ($datarray["app"] == "")) // Store the forwarded post
$datarray["app"] = network_to_name($contact['network']); $r = item_store($datarray2, false, true);
// Let the original item just be a regular item
$notify = false;
}
} else } else
$notify = false; $notify = false;