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

Merge pull request #11369 from annando/empty-item 

Prevent further processing of incoming posts when thay are rejected
This commit is contained in:
Hypolite Petovan 2022-03-22 08:54:20 -04:00 committed by GitHub
parent 56d0a33286 53ba68e222
commit 2438eb78dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
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;