Merge remote-tracking branch 'upstream/develop' into json-ld

[friendica.git] / src / Module / DFRN / Notify.php

diff --git a/src/Module/DFRN/Notify.php b/src/Module/DFRN/Notify.php
index e1a2f19d487897c9528e28b802ee439d626ff32d..2dae0da0ad8a11816dfe1ef922cbfa95631c9cc7 100644 (file)
--- a/src/Module/DFRN/Notify.php
+++ b/src/Module/DFRN/Notify.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -59,12 +59,13 @@ class Notify extends BaseModule
                }
        }
 
-       private static function dispatchPublic($postdata)
+       private static function dispatchPublic(array $postdata)
        {
                $msg = Diaspora::decodeRaw($postdata, '', true);
-               if (!$msg) {
+               if (!is_array($msg)) {
                        // We have to fail silently to be able to hand it over to the salmon parser
-                       return false;
+                       Logger::warning('Diaspora::decodeRaw() has failed for some reason.');
+                       return;
                }
 
                // Fetch the corresponding public contact
@@ -88,10 +89,10 @@ class Notify extends BaseModule
                System::xmlExit($ret, 'Done');
        }
 
-       private static function dispatchPrivate($user, $postdata)
+       private static function dispatchPrivate(array $user, string $postdata)
        {
                $msg = Diaspora::decodeRaw($postdata, $user['prvkey'] ?? '');
-               if (!$msg) {
+               if (!is_array($msg)) {
                        System::xmlExit(4, 'Unable to parse message');
                }