clones/friendica
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Improved processing of leftover queued posts

This commit is contained in:
Michael 2023-10-26 05:01:54 +00:00
parent 35cf140cb2
commit c7739ef9c4
2 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/Protocol/ActivityPub/Processor.php
View File

@ -752,6 +752,7 @@ class Processor
{ {
$post = self::getUriIdForFeaturedCollection($activity); $post = self::getUriIdForFeaturedCollection($activity);
if (empty($post)) { if (empty($post)) {
Queue::remove($activity);
return; return;
} }

7
src/Protocol/ActivityPub/Queue.php
View File

@ -252,12 +252,7 @@ class Queue
{ {
$entries = DBA::select('inbox-entry', ['id', 'type', 'object-type', 'object-id', 'in-reply-to-id'], ["`trust` AND `wid` IS NULL"], ['order' => ['id' => true]]); $entries = DBA::select('inbox-entry', ['id', 'type', 'object-type', 'object-id', 'in-reply-to-id'], ["`trust` AND `wid` IS NULL"], ['order' => ['id' => true]]);
while ($entry = DBA::fetch($entries)) { while ($entry = DBA::fetch($entries)) {
// Don't process entries of items that are answer to nonexistent posts if (!self::isProcessable($entry['id'])) {
if (!empty($entry['in-reply-to-id']) && !Post::exists(['uri' => $entry['in-reply-to-id']])) {
continue;
}
// We don't need to process entries that depend on already existing entries.
if (!empty($entry['in-reply-to-id']) && DBA::exists('inbox-entry', ["`id` != ? AND `object-id` = ?", $entry['id'], $entry['in-reply-to-id']])) {
continue; continue;
} }
Logger::debug('Process leftover entry', $entry); Logger::debug('Process leftover entry', $entry);