diff options
| author | Friendika <info@friendika.com> | 2010-11-08 20:56:09 -0800 |
|---|---|---|
| committer | Friendika <info@friendika.com> | 2010-11-08 20:56:09 -0800 |
| commit | 1f4048067e04580f36e22e49909ae6d4b89bf129 (patch) | |
| tree | ca7248b2c42900a379f9c320917c51c58c7c249e | |
| parent | e521dfd5e6e8da28d5a4057ff4ab368cc31c45bf (diff) | |
| download | volse-hubzilla-1f4048067e04580f36e22e49909ae6d4b89bf129.tar.gz volse-hubzilla-1f4048067e04580f36e22e49909ae6d4b89bf129.tar.bz2 volse-hubzilla-1f4048067e04580f36e22e49909ae6d4b89bf129.zip | |
more refactor remote reply off network
| -rw-r--r-- | include/items.php | 20 |
1 files changed, 13 insertions, 7 deletions
diff --git a/include/items.php b/include/items.php index fc68f185f..c10701b67 100644 --- a/include/items.php +++ b/include/items.php @@ -909,25 +909,32 @@ function consume_feed($xml,$importer,$contact, &$hub, $datedir = 0) { // FIXME update content if 'updated' changes if(count($r)) { $allow = $item->get_item_tags( NAMESPACE_DFRN, 'comment-allow'); - if((($allow) && ($allow[0]['data'] != $r[0]['last-child'])) || ($contact['network'] !== 'dfrn')) { + if(($allow) && ($allow[0]['data'] != $r[0]['last-child'])) { $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d", dbesc(datetime_convert()), dbesc($parent_uri), intval($importer['uid']) ); $r = q("UPDATE `item` SET `last-child` = %d , `changed` = '%s' WHERE `uri` = '%s' AND `uid` = %d LIMIT 1", - intval((($allow) ? $allow[0]['data'] : 1)), + intval($allow[0]['data']), dbesc(datetime_convert()), dbesc($item_id), intval($importer['uid']) ); - } continue; } $datarray = get_atom_elements($feed,$item); - if($contact['network'] === 'stat' && strlen($datarray['title'])) - unset($datarray['title']); + if($contact['network'] === 'stat') { + if(strlen($datarray['title'])) + unset($datarray['title']); + $r = q("UPDATE `item` SET `last-child` = 0, `changed` = '%s' WHERE `parent-uri` = '%s' AND `uid` = %d", + dbesc(datetime_convert()), + dbesc($parent_uri), + intval($importer['uid']) + ); + $datarray['last-child'] = 1; + } $datarray['parent-uri'] = $parent_uri; $datarray['uid'] = $importer['uid']; $datarray['contact-id'] = $contact['id']; @@ -977,10 +984,9 @@ function consume_feed($xml,$importer,$contact, &$hub, $datedir = 0) { if($contact['network'] === 'stat') { if(strlen($datarray['title'])) unset($datarray['title']); -// if(($contact['rel'] == REL_VIP) || ($contact['rel'] == REL_BUD)) -// basically allow comments to/from any OStatus contact, unless blocked by readonly $datarray['last-child'] = 1; } + $datarray['parent-uri'] = $item_id; $datarray['uid'] = $importer['uid']; $datarray['contact-id'] = $contact['id']; |