Funkwhale context file moved

src/Protocol/ActivityPub/Processor.php

@@ -935,7 +935,7 @@ class Processor
 				Logger::info('Item insertion successful', ['user' => $item['uid'], 'item_id' => $item_id]);
 				$success = true;
 			} else {
-				Logger::notice('Item insertion aborted', ['user' => $item['uid']]);
+				Logger::notice('Item insertion aborted', ['uri' => $item['uri'], 'uid' => $item['uid']]);
 			}
 
 			if ($item['uid'] == 0) {

src/Protocol/ActivityPub/Queue.php

@@ -179,7 +179,9 @@ class Queue
 	 */
 	public static function clear()
 	{
-		DBA::delete('inbox-entry', ["`wid` IS NULL AND `received` < ?", DateTimeFormat::utc('now - 4 hours')]);
+		// We delete all entries that aren't associated with a worker entry after seven days.
+		// The other entries are deleted when the worker deferred for too long.
+		DBA::delete('inbox-entry', ["`wid` IS NULL AND `received` < ?", DateTimeFormat::utc('now - 7 days')]);
 	}
 
 	/**
@@ -190,7 +192,7 @@ class Queue
 	 */
 	public static function processReplyByUri(string $uri)
 	{
-		$entries = DBA::select('inbox-entry', ['id'], ['in-reply-to-id' => $uri], ['order' => ['id' => true]]);
+		$entries = DBA::select('inbox-entry', ['id'], ["`in-reply-to-id` = ? AND `object-id` != ?", $uri, $uri]);
 		while ($entry = DBA::fetch($entries)) {
 			self::process($entry['id']);
 		}

src/Worker/FetchMissingActivity.php

@@ -42,6 +42,7 @@ class FetchMissingActivity
 			Queue::processReplyByUri($url);
 		} elseif (!Worker::defer()) {
 			Logger::info('Activity could not be fetched', ['url' => $url]);
+			// @todo performe recursive deletion of all entries
 		} else {
 			Logger::info('Fetching deferred', ['url' => $url]);
 		}