keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #7215 from annando/fix-defer

Browse source 
The only reason we don't defer is when it was a post to a relay
This commit is contained in:
Philipp 2019-06-01 13:35:02 +02:00 committed by GitHub
commit 32a8f4d37b
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Worker/Delivery.php
View file

@ -405,7 +405,7 @@ class Delivery extends BaseObject
// The message could not be delivered. We mark the contact as "dead" // The message could not be delivered. We mark the contact as "dead"
Model\Contact::markForArchival($contact); Model\Contact::markForArchival($contact);
if (!empty($contact['contact-type']) && ($contact['contact-type'] != Model\Contact::TYPE_RELAY)) { if (empty($contact['contact-type']) || ($contact['contact-type'] != Model\Contact::TYPE_RELAY)) {
Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]); Logger::info('Delivery failed: defer message', ['id' => defaults($target_item, 'guid', $target_item['id'])]);
// defer message for redelivery // defer message for redelivery
Worker::defer(); Worker::defer();