From 7d8b087f4a90dfa8b69bb7660cf68a2b021a31a2 Mon Sep 17 00:00:00 2001 From: friendica Date: Wed, 13 Jun 2012 19:59:20 -0700 Subject: fix to imported youtube videos, updating of contact profile photos, do not remove "dead" contacts but archive them. --- include/Contact.php | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'include/Contact.php') diff --git a/include/Contact.php b/include/Contact.php index 675d1c81e..3b255a072 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -146,12 +146,23 @@ function mark_for_death($contact) { ); } else { + + // TODO: We really should send a notification to the owner after 2-3 weeks + // so they won't be surprised when the contact vanishes and can take + // remedial action if this was a serious mistake or glitch + $expiry = $contact['term-date'] . ' + 32 days '; if(datetime_convert() > datetime_convert('UTC','UTC',$expiry)) { // relationship is really truly dead. + // archive them rather than delete + // though if the owner tries to unarchive them we'll start the whole process over again + + q("update contact set `archive` = 1 where id = %d limit 1", + intval($contact['id']) + ); - contact_remove($contact['id']); + //contact_remove($contact['id']); } } -- cgit v1.2.3 From be090cc8513504edcfaf368915e45308711f7e7c Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 14 Jun 2012 16:56:46 -0700 Subject: better handling of dead contacts --- include/Contact.php | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'include/Contact.php') diff --git a/include/Contact.php b/include/Contact.php index 3b255a072..14e1a52cd 100644 --- a/include/Contact.php +++ b/include/Contact.php @@ -139,6 +139,10 @@ function terminate_friendship($user,$self,$contact) { if(! function_exists('mark_for_death')) { function mark_for_death($contact) { + + if($contact['archive']) + return; + if($contact['term-date'] == '0000-00-00 00:00:00') { q("UPDATE `contact` SET `term-date` = '%s' WHERE `id` = %d LIMIT 1", dbesc(datetime_convert()), -- cgit v1.2.3