MrPetovan/friendica
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Feed should work now as well

Browse source
This commit is contained in:
Michael Vogel 2016-02-04 23:52:06 +01:00
parent 92a31344b5
commit 2bd36e5628
2 changed files with 25 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
include/import-dfrn.php
View file

@ -961,8 +961,10 @@ class dfrn2 {
$item["owner-avatar"] = $importer["thumb"]; $item["owner-avatar"] = $importer["thumb"];
} }
if(($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) if(($importer["rel"] == CONTACT_IS_FOLLOWER) && (!tgroup_check($importer["importer_uid"], $item))) {
logger("Contact ".$importer["id"]." is only follower and tgroup check was negative.", LOGGER_DEBUG);
return; return;
}
// This is my contact on another system, but it's really me. // This is my contact on another system, but it's really me.
// Turn this into a wall post. // Turn this into a wall post.
@ -1183,9 +1185,24 @@ class dfrn2 {
foreach ($deletions AS $deletion) foreach ($deletions AS $deletion)
self::process_deletion($header, $xpath, $deletion, $importer); self::process_deletion($header, $xpath, $deletion, $importer);
$entries = $xpath->query("/atom:feed/atom:entry"); if (!$sort_by_date) {
foreach ($entries AS $entry) $entries = $xpath->query("/atom:feed/atom:entry");
self::process_entry($header, $xpath, $entry, $importer); foreach ($entries AS $entry)
self::process_entry($header, $xpath, $entry, $importer);
} else {
$newentries = array();
$entries = $xpath->query("/atom:feed/atom:entry");
foreach ($entries AS $entry) {
$created = $xpath->query("atom:published/text()", $entry)->item(0)->nodeValue;
$newentries[strtotime($created)] = $entry;
}
// Now sort after the publishing date
ksort($newentries);
foreach ($newentries AS $entry)
self::process_entry($header, $xpath, $entry, $importer);
}
} }
} }
?> ?>

9
include/items.php
View file

@ -1695,11 +1695,9 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
} }
return; return;
} }
// dfrn-test
/*
if ($contact['network'] === NETWORK_DFRN) { if ($contact['network'] === NETWORK_DFRN) {
logger("Consume DFRN messages", LOGGER_DEBUG); logger("Consume DFRN messages", LOGGER_DEBUG);
logger("dfrn-test");
$r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`, $r = q("SELECT `contact`.*, `contact`.`uid` AS `importer_uid`,
`contact`.`pubkey` AS `cpubkey`, `contact`.`pubkey` AS `cpubkey`,
@ -1711,14 +1709,15 @@ function consume_feed($xml,$importer,&$contact, &$hub, $datedir = 0, $pass = 0)
FROM `contact` FROM `contact`
LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid` LEFT JOIN `user` ON `contact`.`uid` = `user`.`uid`
WHERE `contact`.`id` = %d AND `user`.`uid` = %d", WHERE `contact`.`id` = %d AND `user`.`uid` = %d",
dbesc($contact["id"], $importer["uid"]); dbesc($contact["id"]), dbesc($importer["uid"])
); );
if ($r) { if ($r) {
logger("Now import the DFRN feed");
dfrn2::import($xml,$r[0], true); dfrn2::import($xml,$r[0], true);
return; return;
} }
} }
*/
// Test - remove before flight // Test - remove before flight
//if ($pass < 2) { //if ($pass < 2) {
// $tempfile = tempnam(get_temppath(), "dfrn-consume-"); // $tempfile = tempnam(get_temppath(), "dfrn-consume-");