Don't transmit content to already archived contacts

This commit is contained in:
Michael Vogel 2019-08-27 21:01:11 +02:00
parent b2162f34e9
commit 9b7432781b
5 changed files with 64 additions and 7 deletions

View file

@ -429,6 +429,11 @@ class Notifier
if (DBA::isResult($r)) {
foreach ($r as $rr) {
if (!empty($rr['id']) && Contact::isArchived($rr['id'])) {
Logger::info('Contact is archived', $rr);
continue;
}
if (self::isRemovalActivity($cmd, $owner, $rr['network'])) {
Logger::log('Skipping dropping for ' . $rr['url'] . ' since the network supports account removal commands.', Logger::DEBUG);
continue;
@ -463,6 +468,11 @@ class Notifier
// delivery loop
while ($contact = DBA::fetch($delivery_contacts_stmt)) {
if (!empty($contact['id']) && Contact::isArchived($contact['id'])) {
Logger::info('Contact is archived', $contact);
continue;
}
if (self::isRemovalActivity($cmd, $owner, $contact['network'])) {
Logger::log('Skipping dropping for ' . $contact['url'] . ' since the network supports account removal commands.', Logger::DEBUG);
continue;