Only attach images

[friendica.git] / src / Worker / Notifier.php

diff --git a/src/Worker/Notifier.php b/src/Worker/Notifier.php
index b236abc1951a012ea069837d5120c03ad3a20ec1..7d3d3d6b7cc7033a1a8d06d18d78361d7e893c42 100644 (file)
--- a/src/Worker/Notifier.php
+++ b/src/Worker/Notifier.php
@@ -191,6 +191,10 @@ class Notifier
                        // when the original comment author does support the Diaspora protocol.
                        if ($thr_parent['author-link'] && $target_item['parent-uri'] != $target_item['thr-parent']) {
                                $diaspora_delivery = Diaspora::isSupportedByContactUrl($thr_parent['author-link']);
+                               if ($diaspora_delivery &&  empty($target_item['signed_text'])) {
+                                       Logger::debug('Post has got no Diaspora signature, so there will be no Diaspora delivery', ['guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id']]);
+                                       $diaspora_delivery = false;
+                               }
                                Logger::info('Threaded comment', ['diaspora_delivery' => (int)$diaspora_delivery]);
                        }
 
@@ -502,7 +506,7 @@ class Notifier
                $a = DI::app();
                $delivery_queue_count = 0;
 
-               if ($target_item['verb'] == Activity::ANNOUNCE) {
+               if (!empty($target_item['verb']) && ($target_item['verb'] == Activity::ANNOUNCE)) {
                        Logger::notice('Announces are only delivery via ActivityPub', ['cmd' => $cmd, 'id' => $target_item['id'], 'guid' => $target_item['guid'], 'uri-id' => $target_item['uri-id'], 'uri' => $target_item['uri']]);
                        return 0;
                }