mexon/friendica
1
0
Fork 0
Code Pull requests Activity

Merge pull request #9616 from annando/expiry-notification-priority

Browse source 
Configuration for the priority of the notification for expired messages
This commit is contained in:
Hypolite Petovan 2020-11-30 17:16:24 -05:00 committed by GitHub
commit aa4372447a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Model/Item.php
View file

@ -1186,7 +1186,9 @@ class Item
self::markForDeletion(['uri' => $item['uri'], 'deleted' => false], $priority); self::markForDeletion(['uri' => $item['uri'], 'deleted' => false], $priority);
// send the notification upstream/downstream // send the notification upstream/downstream
if ($priority) {
Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", Delivery::DELETION, intval($item['id'])); Worker::add(['priority' => $priority, 'dont_fork' => true], "Notifier", Delivery::DELETION, intval($item['id']));
}
} elseif ($item['uid'] != 0) { } elseif ($item['uid'] != 0) {
Post\User::update($item['uri-id'], $item['uid'], ['hidden' => true]); Post\User::update($item['uri-id'], $item['uid'], ['hidden' => true]);
@ -3111,6 +3113,8 @@ class Item
$expired = 0; $expired = 0;
$priority = DI::config()->get('system', 'expire-notify-priority');
while ($item = Item::fetch($items)) { while ($item = Item::fetch($items)) {
// don't expire filed items // don't expire filed items
@ -3130,7 +3134,7 @@ class Item
continue; continue;
} }
self::markForDeletionById($item['id'], PRIORITY_LOW); self::markForDeletionById($item['id'], $priority);
++$expired; ++$expired;
} }

4
static/defaults.config.php
View file

@ -237,6 +237,10 @@ return [
// restricts develop log writes to requests originating from this IP address. // restricts develop log writes to requests originating from this IP address.
'dlogip' => '', 'dlogip' => '',
// expire-notify-priority (integer)
// Priority for the expirary notification
'expire-notify-priority' => PRIORITY_LOW,
// free_crawls (Integer) // free_crawls (Integer)
// Number of "free" searches when system => permit_crawling is enabled. // Number of "free" searches when system => permit_crawling is enabled.
'free_crawls' => 10, 'free_crawls' => 10,