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

ostatus - support likes of comments

Browse Source
This commit is contained in:
zotlabs 2017-09-24 21:09:21 -07:00
parent 06a674775e
commit 808605cd65
1 changed files with 19 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
include/feedutils.php
View File

@ -1033,6 +1033,12 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
if(! $datarray['mid']) if(! $datarray['mid'])
continue; continue;
$item_parent_mid = q("select parent_mid from item where mid = '%s' and uid = %d limit 1",
dbesc($parent_mid),
intval($importer['channel_id'])
);
// This probably isn't an appropriate default but we're about to change it // This probably isn't an appropriate default but we're about to change it
// if it's wrong. // if it's wrong.
@ -1128,18 +1134,12 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
$datarray['parent_mid'] = $pmid; $datarray['parent_mid'] = $pmid;
} }
} }
if(! $pmid) { if(($item_parent_mid) && (! $pmid)) {
$x = q("select parent_mid from item where mid = '%s' and uid = %d limit 1", logger('find_parent: matched in-reply-to: ' . $parent_mid, LOGGER_DEBUG);
dbesc($parent_mid), $pmid = $item_parent_mid[0]['parent_mid'];
intval($importer['channel_id']) $datarray['parent_mid'] = $pmid;
);
if($x) {
logger('find_parent: matched in-reply-to: ' . $parent_mid, LOGGER_DEBUG);
$pmid = $x[0]['parent_mid'];
$datarray['parent_mid'] = $pmid;
}
} }
if((! $pmid) && $parent_link !== '') { if((! $pmid) && $parent_link !== '') {
$f = feed_conversation_fetch($importer,$contact,$parent_link); $f = feed_conversation_fetch($importer,$contact,$parent_link);
if($f) { if($f) {
@ -1161,6 +1161,7 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
); );
if($x) { if($x) {
$item_parent_mid = $x;
$pmid = $x[0]['parent_mid']; $pmid = $x[0]['parent_mid'];
$datarray['parent_mid'] = $pmid; $datarray['parent_mid'] = $pmid;
} }
@ -1242,6 +1243,13 @@ function consume_feed($xml, $importer, &$contact, $pass = 0) {
set_iconfig($datarray,'system','parent_mid',$parent_mid,true); set_iconfig($datarray,'system','parent_mid',$parent_mid,true);
} }
// allow likes of comments
if($item_parent_mid && activity_match($datarray['verb'],ACTVITY_LIKE)) {
$datarray['thr_parent'] = $item_parent_mid[0]['parent_mid'];
}
$datarray['aid'] = $importer['channel_account_id']; $datarray['aid'] = $importer['channel_account_id'];
$datarray['uid'] = $importer['channel_id']; $datarray['uid'] = $importer['channel_id'];