friendica
/
friendica
mirror of https://github.com/friendica/friendica
6
0
Fork 1
Code Issues Packages Projects Releases 1 Wiki Activity

Improve expire for item-content and item-activity

This commit is contained in:
Michael 2018-07-05 22:07:50 +00:00
parent 44e405d22b
commit 014eea8e12
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/Model/Item.php
View File

@ -766,6 +766,10 @@ class Item extends BaseObject
dba::update('item', $item_fields, ['id' => $item['id']]);
}
}
} else {
if (empty($item['iaid'])) {
// To-Do
}
}
if (!empty($tags)) {

7
src/Worker/Expire.php
View File

@ -26,10 +26,13 @@ class Expire {
if ($param == 'delete') {
logger('Delete expired items', LOGGER_DEBUG);
// physically remove anything that has been deleted for more than two months
$r = dba::p("SELECT `id`, `icid` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
$r = dba::p("SELECT `id`, `iaid`, `icid` FROM `item` WHERE `deleted` AND `changed` < UTC_TIMESTAMP() - INTERVAL 60 DAY");
while ($row = dba::fetch($r)) {
dba::delete('item', ['id' => $row['id']]);
if (!dba::exists('item', ['icid' => $row['icid']])) {
if (!empty($row['iaid']) && !dba::exists('item', ['iaid' => $row['iaid']])) {
dba::delete('item-content', ['id' => $row['icid']]);
}
if (!empty($row['icid']) && !dba::exists('item', ['icid' => $row['icid']])) {
dba::delete('item-content', ['id' => $row['icid']]);
}
}