From a283b1183b4ec79ac2e35c0757391c4605bf30d4 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Tue, 1 Dec 2020 23:04:04 +0000
Subject: [PATCH] Move deletion

---
 src/Model/Post/Delayed.php | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Model/Post/Delayed.php b/src/Model/Post/Delayed.php
index 14f5d7198e..357a3e8aa9 100644
--- a/src/Model/Post/Delayed.php
+++ b/src/Model/Post/Delayed.php
@@ -93,10 +93,14 @@ class Delayed
 
 		Logger::notice('Post stored', ['id' => $id, 'uid' => $item['uid'], 'cid' => $item['contact-id']]);
 
+		// It should always contain an URI since this is needed to create a delayed post entry
+		if (!empty($item['uri'])) {
+			$result = self::delete($item['uri']);
+			Logger::notice('Delayed post entry deleted', ['result' => $result, 'uri' => $item['uri']]);
+		}
+
 		if (!empty($id) && (!empty($taglist) || !empty($attachments))) {
-			$feeditem = Item::selectFirst(['uri-id', 'uri'], ['id' => $id]);
-			$result = self::delete($feeditem['uri']);
-			Logger::notice('Delayed post entry deleted', ['result' => $result, 'item' => $feeditem]);
+			$feeditem = Item::selectFirst(['uri-id'], ['id' => $id]);
 
 			foreach ($taglist as $tag) {
 				Tag::store($feeditem['uri-id'], Tag::HASHTAG, $tag);