clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use the term-date as archive date

This commit is contained in:
Michael 2019-07-02 14:46:04 +00:00
parent 1d7154a7d1
commit 80c3a81618
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/Model/GContact.php
View File

@ -867,7 +867,7 @@ class GContact
public static function updateFromPublicContact($cid) public static function updateFromPublicContact($cid)
{ {
$fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gender', $fields = ['name', 'nick', 'url', 'nurl', 'location', 'about', 'keywords', 'gender',
'bd', 'contact-type', 'network', 'addr', 'notify', 'alias', 'archive', 'bd', 'contact-type', 'network', 'addr', 'notify', 'alias', 'archive', 'term-date',
'created', 'updated', 'avatar', 'success_update', 'failure_update', 'forum', 'prv']; 'created', 'updated', 'avatar', 'success_update', 'failure_update', 'forum', 'prv'];
$contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => 0, 'network' => Protocol::FEDERATED]); $contact = DBA::selectFirst('contact', $fields, ['id' => $cid, 'uid' => 0, 'network' => Protocol::FEDERATED]);
if (!DBA::isResult($contact)) { if (!DBA::isResult($contact)) {
@ -893,6 +893,8 @@ class GContact
// These fields are having different names but the same content // These fields are having different names but the same content
$gcontact['archived'] = $gcontact['archive']; $gcontact['archived'] = $gcontact['archive'];
unset($gcontact['archive']); unset($gcontact['archive']);
$gcontact['archive_date'] = $gcontact['term-date'];
unset($gcontact['term-date']);
$gcontact['birthday'] = $gcontact['bd']; $gcontact['birthday'] = $gcontact['bd'];
unset($gcontact['bd']); unset($gcontact['bd']);
$gcontact['photo'] = $gcontact['avatar']; $gcontact['photo'] = $gcontact['avatar'];
@ -911,9 +913,7 @@ class GContact
} }
} }
if ($gcontact['archived'] && (empty($old_gcontact['archive_date']) || ($old_gcontact['archive_date'] <= DBA::NULL_DATETIME))) { if (!$gcontact['archived']) {
$gcontact['archive_date'] = DateTimeFormat::utcNow();
} elseif (!$gcontact['archived']) {
$gcontact['archive_date'] = DBA::NULL_DATETIME; $gcontact['archive_date'] = DBA::NULL_DATETIME;
} }