Only spool mirrored posts

[friendica.git] / src / Model / Post / Delayed.php

diff --git a/src/Model/Post/Delayed.php b/src/Model/Post/Delayed.php
index 963122b5b83eba98a070553b962bbca124339ca9..87e5fe8235ae810dc5d3fdd69e6f8f57e1bf6e13 100644 (file)
--- a/src/Model/Post/Delayed.php
+++ b/src/Model/Post/Delayed.php
@@ -42,7 +42,7 @@ class Delayed
         */ 
        public static function add(string $delayed, array $item, int $notify = 0, array $taglist = [], array $attachments = [])
        {
-               if (empty($item['uri']) || empty($item['uid']) || self::exists($item['uri'])) {
+               if (empty($item['uri']) || empty($item['uid']) || self::exists($item['uri'], $item['uid'])) {
                        return false;
                }
 
@@ -59,9 +59,9 @@ class Delayed
         *
         * @return bool delete success
         */
-       private static function delete(string $uri)
+       private static function delete(string $uri, int $uid)
        {
-               return DBA::delete('delayed-post', ['uri' => $uri]);
+               return DBA::delete('delayed-post', ['uri' => $uri, 'uid' => $uid]);
        }
 
        /**
@@ -71,9 +71,9 @@ class Delayed
         *
         * @return bool "true" if an entry with that URI exists
         */
-       public static function exists(string $uri)
+       public static function exists(string $uri, int $uid)
        {
-               return DBA::exists('delayed-post', ['uri' => $uri]);
+               return DBA::exists('delayed-post', ['uri' => $uri, 'uid' => $uid]);
        }
 
        /**
@@ -92,8 +92,8 @@ 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']);
+               if (!empty($item['uri']) && self::exists($item['uri'], $item['uid'])) {
+                       $result = self::delete($item['uri'], $item['uid']);
                        Logger::notice('Delayed post entry deleted', ['result' => $result, 'uri' => $item['uri']]);
                }