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

Merge pull request #4807 from annando/archival-days 

We can now define the days after a contact is archived
This commit is contained in:
Tobias Diekershoff 2018-04-10 14:34:18 +02:00 committed by GitHub
parent eaff717696 869d8ab12d
commit 9d5abaca1c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
doc/htconfig.md
View File

@ -25,8 +25,9 @@ Example: To set the automatic database cleanup process add this line to your .ht
* **allowed_link_protocols** (Array) - Allowed protocols in links URLs, add at your own risk. http is always allowed. * **allowed_link_protocols** (Array) - Allowed protocols in links URLs, add at your own risk. http is always allowed.
* **always_show_preview** (Boolean) - Only show small preview picures. Default value is false. * **always_show_preview** (Boolean) - Only show small preview picures. Default value is false.
* **block_local_dir** (Boolean) - Blocks the access to the directory of the local users. * **archival_days** (Integer) - Number of days that we try to deliver content before we archive a contact. Defaults to 32.
* **auth_cookie_lifetime** (Integer) - Number of days that should pass without any activity before a user who chose "Remember me" when logging in is considered logged out. Defaults to 7. * **auth_cookie_lifetime** (Integer) - Number of days that should pass without any activity before a user who chose "Remember me" when logging in is considered logged out. Defaults to 7.
* **block_local_dir** (Boolean) - Blocks the access to the directory of the local users.
* **config_adapter** (jit|preload) - Allow to switch the configuration adapter to improve performances at the cost of memory consumption. Default value is "jit" * **config_adapter** (jit|preload) - Allow to switch the configuration adapter to improve performances at the cost of memory consumption. Default value is "jit"
* **curl_range_bytes** - Maximum number of bytes that should be fetched. Default is 0, which mean "no limit". * **curl_range_bytes** - Maximum number of bytes that should be fetched. Default is 0, which mean "no limit".
* **db_log** - Name of a logfile to log slow database queries * **db_log** - Name of a logfile to log slow database queries

4
src/Model/Contact.php
View File

@ -306,7 +306,9 @@ class Contact extends BaseObject
*/ */
/// @todo Check for contact vitality via probing /// @todo Check for contact vitality via probing
$expiry = $contact['term-date'] . ' + 32 days '; $archival_days = Config::get('system', 'archival_days', 32);
$expiry = $contact['term-date'] . ' + ' . $archival_days . ' days ';
if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) { if (DateTimeFormat::utcNow() > DateTimeFormat::utc($expiry)) {
/* Relationship is really truly dead. archive them rather than /* Relationship is really truly dead. archive them rather than
* delete, though if the owner tries to unarchive them we'll start * delete, though if the owner tries to unarchive them we'll start

2
src/Protocol/Diaspora.php
View File

@ -3319,7 +3319,7 @@ class Diaspora
} }
} }
logger("transmit: ".$logid."-".$guid." returns: ".$return_code); logger("transmit: ".$logid."-".$guid." to ".$dest_url." returns: ".$return_code);
if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) { if (!$return_code || (($return_code == 503) && (stristr($a->get_curl_headers(), "retry-after")))) {
if (!$no_queue && ($contact['contact-type'] != ACCOUNT_TYPE_RELAY)) { if (!$no_queue && ($contact['contact-type'] != ACCOUNT_TYPE_RELAY)) {

8
src/Worker/Queue.php
View File

@ -86,7 +86,7 @@ class Queue
logger("Check server " . $server . " (" . $contact["network"] . ")"); logger("Check server " . $server . " (" . $contact["network"] . ")");
$vital = PortableContact::checkServer($server, $contact["network"], true); $vital = PortableContact::checkServer($server, $contact["network"], true);
Cache::set($cachekey_server . $server, $vital, CACHE_QUARTER_HOUR); Cache::set($cachekey_server . $server, $vital, CACHE_MINUTE);
} }
if (!is_null($vital) && !$vital) { if (!is_null($vital) && !$vital) {
@ -118,7 +118,7 @@ class Queue
QueueModel::removeItem($q_item['id']); QueueModel::removeItem($q_item['id']);
} else { } else {
QueueModel::updateTime($q_item['id']); QueueModel::updateTime($q_item['id']);
Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
} }
break; break;
case NETWORK_OSTATUS: case NETWORK_OSTATUS:
@ -127,7 +127,7 @@ class Queue
if ($deliver_status == -1) { if ($deliver_status == -1) {
QueueModel::updateTime($q_item['id']); QueueModel::updateTime($q_item['id']);
Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
} else { } else {
QueueModel::removeItem($q_item['id']); QueueModel::removeItem($q_item['id']);
} }
@ -141,7 +141,7 @@ class Queue
QueueModel::removeItem($q_item['id']); QueueModel::removeItem($q_item['id']);
} else { } else {
QueueModel::updateTime($q_item['id']); QueueModel::updateTime($q_item['id']);
Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_QUARTER_HOUR); Cache::set($cachekey_deadguy . $contact['notify'], true, CACHE_MINUTE);
} }
break; break;