harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

(untested currently) fetch conversation for GNU-Social and Mastodon when provided a comment with no local copy of the parent.

Browse Source
This commit is contained in:
zotlabs 2017-06-27 19:20:13 -07:00
parent 676481de58
commit 1273ac67f4
1 changed files with 47 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
include/feedutils.php
View File

@ -971,6 +971,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
foreach($items as $item) { foreach($items as $item) {
$is_reply = false; $is_reply = false;
$parent_link = '';
logger('processing ' . $item->get_id(), LOGGER_DEBUG); logger('processing ' . $item->get_id(), LOGGER_DEBUG);
@ -979,6 +980,9 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
$is_reply = true; $is_reply = true;
$parent_mid = normalise_id($rawthread[0]['attribs']['']['ref']); $parent_mid = normalise_id($rawthread[0]['attribs']['']['ref']);
} }
if(isset($rawthread[0]['attribs']['']['href'])) {
$parent_link = $rawthread[0]['attribs']['']['href'];
}
if($is_reply) { if($is_reply) {
@ -1050,7 +1054,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
intval($importer['channel_id']) intval($importer['channel_id'])
); );
if($c) { if($c) {
$pmid = $x[0]['parent_mid']; $pmid = $c[0]['parent_mid'];
$datarray['parent_mid'] = $pmid; $datarray['parent_mid'] = $pmid;
} }
} }
@ -1065,6 +1069,20 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
$datarray['parent_mid'] = $pmid; $datarray['parent_mid'] = $pmid;
} }
} }
if((! $pmid) && $parent_link !== '') {
$f = feed_conversation_fetch($importer,$contact,$parent_link);
if($f) {
$x = q("select parent_mid from item where mid = '%s' and uid = %d limit 1",
dbesc($parent_mid),
intval($importer['channel_id'])
);
if($x) {
$pmid = $x[0]['parent_mid'];
$datarray['parent_mid'] = $pmid;
}
}
}
if(! $pmid) { if(! $pmid) {
@ -1195,6 +1213,34 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
} }
} }
function feed_conversation_fetch($importer,$contact,$parent_link) {
$link = '';
// GNU-Social flavoured feeds
if(strpos($parent_link,'/notice/')) {
$link = str_replace('/notice/','/api/statuses/show',$link) . '.atom';
}
// Mastodon flavoured feeds
if(strpos($parent_link,'/users/') && strpos($parent_link,'/updates/')) {
$link = $parent_link . '.xml';
}
if(! $link)
return false;
$fetch = z_fetch_url($link);
if(! $fetch['success'])
return false;
consume_feed($fetch['body'],$importer,$contact,1);
consume_feed($fetch['body'],$importer,$contact,2);
}
/** /**
* @brief Normalise an id. * @brief Normalise an id.
* *