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

Prevent further processing of incoming posts when thay are rejected

This commit is contained in:
Michael 2022-03-22 12:28:47 +00:00
parent 7c282c597d
commit 45199b498d
1 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -164,6 +164,10 @@ class Processor
if (!DBA::isResult($item)) { if (!DBA::isResult($item)) {
Logger::warning('No existing item, item will be created', ['uri' => $activity['id']]); Logger::warning('No existing item, item will be created', ['uri' => $activity['id']]);
$item = self::createItem($activity); $item = self::createItem($activity);
if (empty($item)) {
return;
}
self::postItem($activity, $item); self::postItem($activity, $item);
return; return;
} }
@ -416,6 +420,10 @@ class Processor
public static function createActivity($activity, $verb) public static function createActivity($activity, $verb)
{ {
$item = self::createItem($activity); $item = self::createItem($activity);
if (empty($item)) {
return;
}
$item['verb'] = $verb; $item['verb'] = $verb;
$item['thr-parent'] = $activity['object_id']; $item['thr-parent'] = $activity['object_id'];
$item['gravity'] = GRAVITY_ACTIVITY; $item['gravity'] = GRAVITY_ACTIVITY;
@ -584,6 +592,7 @@ class Processor
// The checks are split to improve the support when searching why a message was accepted. // The checks are split to improve the support when searching why a message was accepted.
if (count($activity['receiver']) != 1) { if (count($activity['receiver']) != 1) {
// The message has more than one receiver, so it is wanted. // The message has more than one receiver, so it is wanted.
if (!isset($item['uri-id'])) Logger::info('Blubb', ['callstack' => System::callstack(20), 'receiver' => $activity['receiver']]);
Logger::debug('Message has got several receivers - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]); Logger::debug('Message has got several receivers - accepted', ['uri-id' => $item['uri-id'], 'guid' => $item['guid'], 'url' => $item['uri']]);
return true; return true;
} }