From 001aac995235f6849bea73bbe07387bede1c3c01 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sun, 5 Jun 2022 18:15:10 +0000
Subject: [PATCH] Issue 11602: Fix error during contact merhe

---
 src/Console/MergeContacts.php     |  4 ++++
 src/Module/Notifications/Ping.php |  4 ++--
 view/lang/C/messages.po           | 29 +++++++++++++++++------------
 3 files changed, 23 insertions(+), 14 deletions(-)

diff --git a/src/Console/MergeContacts.php b/src/Console/MergeContacts.php
index 79cd0b4b74..543ad316e7 100644
--- a/src/Console/MergeContacts.php
+++ b/src/Console/MergeContacts.php
@@ -73,6 +73,10 @@ HELP;
 		while ($duplicate = $this->dba->fetch($duplicates)) {
 			$this->out($this->l10n->t('%d %s, %d duplicates.', $duplicate['uri-id'], $duplicate['url'], $duplicate['total']));
 			if ($this->getOption(['e', 'execute'], false)) {
+				if (empty($duplicate['uri-id'])) {
+					$this->err($this->l10n->t('uri-id is empty for contact %s.', $duplicate['url']));
+					continue;
+				}
 				$this->mergeContacts($duplicate['uri-id']);
 			}
 		}
diff --git a/src/Module/Notifications/Ping.php b/src/Module/Notifications/Ping.php
index 7dc2158260..6dfb2db5af 100644
--- a/src/Module/Notifications/Ping.php
+++ b/src/Module/Notifications/Ping.php
@@ -92,7 +92,7 @@ class Ping extends BaseModule
 			} else {
 				$notifications = $this->notificationRepo->selectDigestForUser(local_user());
 			}
-
+			$this->logger->info('Blubb-1', ['uid' => local_user(), 'count' => count($notifications)]);
 			$condition = [
 				"`unseen` AND `uid` = ? AND NOT `origin` AND (`vid` != ? OR `vid` IS NULL)",
 				local_user(), Verb::getID(Activity::FOLLOW)
@@ -200,7 +200,7 @@ class Ping extends BaseModule
 				}
 			}, $notifications->getArrayCopy());
 			$navNotifications = array_filter($navNotifications);
-
+			$this->logger->info('Blubb-2', ['uid' => local_user(), 'count' => count($navNotifications)]);
 			$sysnotify_count = array_reduce($navNotifications, function (int $carry, ValueObject\FormattedNavNotification $navNotification) {
 				return $carry + ($navNotification->seen ? 0 : 1);
 			}, 0);
diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index fff804f3a9..9e73d60a3a 100644
--- a/view/lang/C/messages.po
+++ b/view/lang/C/messages.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: 2022.05-rc\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2022-06-05 11:15+0000\n"
+"POT-Creation-Date: 2022-06-05 18:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -1646,53 +1646,58 @@ msgstr ""
 msgid "%d %s, %d duplicates."
 msgstr ""
 
-#: src/Console/MergeContacts.php:86
+#: src/Console/MergeContacts.php:77
+#, php-format
+msgid "uri-id is empty for contact %s."
+msgstr ""
+
+#: src/Console/MergeContacts.php:90
 #, php-format
 msgid "No valid first countact found for uri-id %d."
 msgstr ""
 
-#: src/Console/MergeContacts.php:97
+#: src/Console/MergeContacts.php:101
 #, php-format
 msgid "Wrong duplicate found for uri-id %d in %d (url: %s != %s)."
 msgstr ""
 
-#: src/Console/MergeContacts.php:101
+#: src/Console/MergeContacts.php:105
 #, php-format
 msgid "Wrong duplicate found for uri-id %d in %d (nurl: %s != %s)."
 msgstr ""
 
-#: src/Console/MergeContacts.php:137
+#: src/Console/MergeContacts.php:141
 #, php-format
 msgid "Deletion of id %d failed"
 msgstr ""
 
-#: src/Console/MergeContacts.php:139
+#: src/Console/MergeContacts.php:143
 #, php-format
 msgid "Deletion of id %d was successful"
 msgstr ""
 
-#: src/Console/MergeContacts.php:145
+#: src/Console/MergeContacts.php:149
 #, php-format
 msgid "Updating \"%s\" in \"%s\" from %d to %d"
 msgstr ""
 
-#: src/Console/MergeContacts.php:147
+#: src/Console/MergeContacts.php:151
 msgid " - found"
 msgstr ""
 
-#: src/Console/MergeContacts.php:154
+#: src/Console/MergeContacts.php:158
 msgid " - failed"
 msgstr ""
 
-#: src/Console/MergeContacts.php:156
+#: src/Console/MergeContacts.php:160
 msgid " - success"
 msgstr ""
 
-#: src/Console/MergeContacts.php:160
+#: src/Console/MergeContacts.php:164
 msgid " - deleted"
 msgstr ""
 
-#: src/Console/MergeContacts.php:163
+#: src/Console/MergeContacts.php:167
 msgid " - done"
 msgstr ""
 
-- 
2.39.5