Friendica/friendica-github
1
0
Fork 0
mirror of https://github.com/friendica/friendica synced 2025-02-22 13:58:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

Extract getTopLevelParent() into ItemInserter

Browse source
This commit is contained in:
Art4 2025-01-23 10:42:43 +00:00
parent ddfdf02b34
commit 9cd6c025d5
2 changed files with 75 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

71
src/Model/Item.php
View file

@ -750,72 +750,6 @@ class Item
return self::getParent($thread_parent['thr-parent-id']); return self::getParent($thread_parent['thr-parent-id']);
} }
/**
* Fetch top-level parent data for the given item array
*
* @param array $item
* @return array item array with parent data
* @throws \Exception
*/
private static function getTopLevelParent(array $item, ItemInserter $itemInserter): array
{
$fields = [
'uid', 'uri', 'parent-uri', 'id', 'deleted',
'uri-id', 'parent-uri-id', 'restrictions', 'verb',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'wall', 'private', 'origin', 'author-id'
];
$condition = ['uri-id' => [$item['thr-parent-id'], $item['parent-uri-id']], 'uid' => $item['uid']];
$params = ['order' => ['id' => false]];
$parent = Post::selectFirst($fields, $condition, $params);
if (!DI::dba()->isResult($parent) && Post::exists(['uri-id' => [$item['thr-parent-id'], $item['parent-uri-id']], 'uid' => 0])) {
$stored = Item::storeForUserByUriId($item['thr-parent-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]);
if (!$stored && ($item['thr-parent-id'] != $item['parent-uri-id'])) {
$stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]);
}
if ($stored) {
DI::logger()->info('Stored thread parent item for user', ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'stored' => $stored]);
$parent = Post::selectFirst($fields, $condition, $params);
}
}
if (!DI::dba()->isResult($parent)) {
DI::logger()->notice('item parent was not found - ignoring item', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
return [];
}
if ($itemInserter->hasRestrictions($item, $parent['author-id'], $parent['restrictions'])) {
DI::logger()->notice('Restrictions apply - ignoring item', ['restrictions' => $parent['restrictions'], 'verb' => $parent['verb'], 'uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
return [];
}
if ($parent['uri-id'] == $parent['parent-uri-id']) {
return $parent;
}
$condition = [
'uri-id' => $parent['parent-uri-id'],
'parent-uri-id' => $parent['parent-uri-id'],
'uid' => $parent['uid']
];
$params = ['order' => ['id' => false]];
$toplevel_parent = Post::selectFirst($fields, $condition, $params);
if (!DI::dba()->isResult($toplevel_parent) && $item['origin']) {
$stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]);
DI::logger()->info('Stored parent item for user', ['uri-id' => $item['parent-uri-id'], 'uid' => $item['uid'], 'stored' => $stored]);
$toplevel_parent = Post::selectFirst($fields, $condition, $params);
}
if (!DI::dba()->isResult($toplevel_parent)) {
DI::logger()->notice('item top level parent was not found - ignoring item', ['parent-uri-id' => $parent['parent-uri-id'], 'uid' => $parent['uid']]);
return [];
}
return $toplevel_parent;
}
/** /**
* Inserts item record * Inserts item record
* *
@ -830,7 +764,8 @@ class Item
DI::contentItem(), DI::contentItem(),
DI::activity(), DI::activity(),
DI::logger(), DI::logger(),
DI::baseUrl() DI::dba(),
DI::baseUrl(),
); );
$orig_item = $item; $orig_item = $item;
@ -916,7 +851,7 @@ class Item
} }
if ($item['gravity'] !== self::GRAVITY_PARENT) { if ($item['gravity'] !== self::GRAVITY_PARENT) {
$toplevel_parent = self::getTopLevelParent($item, $itemInserter); $toplevel_parent = $itemInserter->getTopLevelParent($item);
if (empty($toplevel_parent)) { if (empty($toplevel_parent)) {
return 0; return 0;
} }

73
src/Model/ItemInserter.php
View file

@ -10,6 +10,7 @@ namespace Friendica\Model;
use Friendica\App\BaseURL; use Friendica\App\BaseURL;
use Friendica\Content\Item as ItemContent; use Friendica\Content\Item as ItemContent;
use Friendica\Core\Protocol; use Friendica\Core\Protocol;
use Friendica\Database\Database;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
use Friendica\Util\DateTimeFormat; use Friendica\Util\DateTimeFormat;
use Psr\Log\LoggerInterface; use Psr\Log\LoggerInterface;
@ -29,17 +30,21 @@ final class ItemInserter
private LoggerInterface $logger; private LoggerInterface $logger;
private Database $database;
private string $baseUrl; private string $baseUrl;
public function __construct( public function __construct(
ItemContent $itemContent, ItemContent $itemContent,
Activity $activity, Activity $activity,
LoggerInterface $logger, LoggerInterface $logger,
Database $database,
BaseURL $baseURL BaseURL $baseURL
) { ) {
$this->itemContent = $itemContent; $this->itemContent = $itemContent;
$this->activity = $activity; $this->activity = $activity;
$this->logger = $logger; $this->logger = $logger;
$this->database = $database;
$this->baseUrl = $baseURL->__toString(); $this->baseUrl = $baseURL->__toString();
} }
@ -148,7 +153,73 @@ final class ItemInserter
return $item; return $item;
} }
public function hasRestrictions(array $item, int $author_id, int $restrictions = null): bool /**
* Fetch top-level parent data for the given item array
*
* @param array $item
* @return array item array with parent data
* @throws \Exception
*/
public function getTopLevelParent(array $item): array
{
$fields = [
'uid', 'uri', 'parent-uri', 'id', 'deleted',
'uri-id', 'parent-uri-id', 'restrictions', 'verb',
'allow_cid', 'allow_gid', 'deny_cid', 'deny_gid',
'wall', 'private', 'origin', 'author-id'
];
$condition = ['uri-id' => [$item['thr-parent-id'], $item['parent-uri-id']], 'uid' => $item['uid']];
$params = ['order' => ['id' => false]];
$parent = Post::selectFirst($fields, $condition, $params);
if (!$this->database->isResult($parent) && Post::exists(['uri-id' => [$item['thr-parent-id'], $item['parent-uri-id']], 'uid' => 0])) {
$stored = Item::storeForUserByUriId($item['thr-parent-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]);
if (!$stored && ($item['thr-parent-id'] != $item['parent-uri-id'])) {
$stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]);
}
if ($stored) {
$this->logger->info('Stored thread parent item for user', ['uri-id' => $item['thr-parent-id'], 'uid' => $item['uid'], 'stored' => $stored]);
$parent = Post::selectFirst($fields, $condition, $params);
}
}
if (!$this->database->isResult($parent)) {
$this->logger->notice('item parent was not found - ignoring item', ['uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
return [];
}
if ($this->hasRestrictions($item, $parent['author-id'], $parent['restrictions'])) {
$this->logger->notice('Restrictions apply - ignoring item', ['restrictions' => $parent['restrictions'], 'verb' => $parent['verb'], 'uri-id' => $item['uri-id'], 'thr-parent-id' => $item['thr-parent-id'], 'uid' => $item['uid']]);
return [];
}
if ($parent['uri-id'] == $parent['parent-uri-id']) {
return $parent;
}
$condition = [
'uri-id' => $parent['parent-uri-id'],
'parent-uri-id' => $parent['parent-uri-id'],
'uid' => $parent['uid']
];
$params = ['order' => ['id' => false]];
$toplevel_parent = Post::selectFirst($fields, $condition, $params);
if (!$this->database->isResult($toplevel_parent) && $item['origin']) {
$stored = Item::storeForUserByUriId($item['parent-uri-id'], $item['uid'], ['post-reason' => Item::PR_COMPLETION]);
$this->logger->info('Stored parent item for user', ['uri-id' => $item['parent-uri-id'], 'uid' => $item['uid'], 'stored' => $stored]);
$toplevel_parent = Post::selectFirst($fields, $condition, $params);
}
if (!$this->database->isResult($toplevel_parent)) {
$this->logger->notice('item top level parent was not found - ignoring item', ['parent-uri-id' => $parent['parent-uri-id'], 'uid' => $parent['uid']]);
return [];
}
return $toplevel_parent;
}
private function hasRestrictions(array $item, int $author_id, int $restrictions = null): bool
{ {
if (empty($restrictions) || ($author_id == $item['author-id'])) { if (empty($restrictions) || ($author_id == $item['author-id'])) {
return false; return false;