aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2018-04-09 23:39:47 -0700
committerzotlabs <mike@macgirvin.com>2018-04-09 23:39:47 -0700
commite060135304a337cf4a627b1f1e0dc7131f987362 (patch)
tree1c05141aaec9917f4e873c16ac59faecca38afc1 /include
parent6bf2c64aa2a5a25edbb84b747ab81a47d9e08abd (diff)
downloadvolse-hubzilla-e060135304a337cf4a627b1f1e0dc7131f987362.tar.gz
volse-hubzilla-e060135304a337cf4a627b1f1e0dc7131f987362.tar.bz2
volse-hubzilla-e060135304a337cf4a627b1f1e0dc7131f987362.zip
add commented_days parameter to item_expire(), default 7. Both expire_days and commented_days have to be exceeded to expire.
Diffstat (limited to 'include')
-rwxr-xr-xinclude/items.php10
1 files changed, 8 insertions, 2 deletions
diff --git a/include/items.php b/include/items.php
index 6ddab9bf8..8bc4595b6 100755
--- a/include/items.php
+++ b/include/items.php
@@ -3504,11 +3504,14 @@ function item_getfeedattach($item) {
}
-function item_expire($uid,$days) {
+function item_expire($uid,$days,$comment_days = 7) {
if((! $uid) || ($days < 1))
return;
+ if(! $comment_days)
+ $comment_days = 7;
+
// $expire_network_only = save your own wall posts
// and just expire conversations started by others
// do not enable this until we can pass bulk delete messages through zot
@@ -3527,6 +3530,7 @@ function item_expire($uid,$days) {
$r = q("SELECT id FROM item
WHERE uid = %d
AND created < %s - INTERVAL %s
+ AND commented < %s - INTERVAL %s
AND item_retained = 0
AND item_thread_top = 1
AND resource_type = ''
@@ -3534,7 +3538,9 @@ function item_expire($uid,$days) {
$sql_extra $item_normal LIMIT $expire_limit ",
intval($uid),
db_utcnow(),
- db_quoteinterval(intval($days).' DAY')
+ db_quoteinterval(intval($days) . ' DAY'),
+ db_utcnow(),
+ db_quoteinterval(intval($comment_days) . ' DAY')
);
if(! $r)