From d3709d8497f45b14b5fa27142f73990fc19bc465 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 24 May 2022 20:02:54 +0000
Subject: [PATCH] Delete on invalid

---
 src/Console/MoveToAvatarCache.php |  3 ++-
 view/lang/C/messages.po           | 15 ++++++++++-----
 2 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/src/Console/MoveToAvatarCache.php b/src/Console/MoveToAvatarCache.php
index 60d87dee18..76638f891d 100644
--- a/src/Console/MoveToAvatarCache.php
+++ b/src/Console/MoveToAvatarCache.php
@@ -146,7 +146,8 @@ HELP;
 		}
 
 		if ($quit_on_invalid && $fields['photo'] == '') {
-			echo ' ' . $this->l10n->t('Quit') . "\n";
+			echo ' ' . $this->l10n->t('Quit on invalid photo %d', $contact['avatar']) . "\n";
+			Photo::delete(['resource-id' => $resourceid]);
 			return;
 		}
 
diff --git a/view/lang/C/messages.po b/view/lang/C/messages.po
index c5c06d98c1..ee41147186 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-05-24 19:09+0000\n"
+"POT-Creation-Date: 2022-05-24 20:02+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"
@@ -1641,26 +1641,31 @@ msgstr ""
 msgid "The contact has been blocked from the node"
 msgstr ""
 
-#: src/Console/MoveToAvatarCache.php:93
+#: src/Console/MoveToAvatarCache.php:92
 #, php-format
 msgid "no resource in photo %s"
 msgstr ""
 
-#: src/Console/MoveToAvatarCache.php:101
+#: src/Console/MoveToAvatarCache.php:118
 #, php-format
 msgid "no photo with id %s"
 msgstr ""
 
-#: src/Console/MoveToAvatarCache.php:110
+#: src/Console/MoveToAvatarCache.php:127
 #, php-format
 msgid "no image data for photo with id %s"
 msgstr ""
 
-#: src/Console/MoveToAvatarCache.php:119
+#: src/Console/MoveToAvatarCache.php:136
 #, php-format
 msgid "invalid image for id %s"
 msgstr ""
 
+#: src/Console/MoveToAvatarCache.php:149
+#, php-format
+msgid "Quit on invalid photo %d"
+msgstr ""
+
 #: src/Console/PostUpdate.php:87
 #, php-format
 msgid "Post update version number has been set to %s."