nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Return early if an URI id cannot be obtained in ActivityPub\Processor::createItem

Browse source 
- Address https://github.com/friendica/friendica/issues/9250#issuecomment-743769813
This commit is contained in:
Hypolite Petovan 2020-12-13 13:42:08 -05:00
parent 61aa4efa89
commit 0441b912ac
2 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/Model/ItemURI.php
View file

@ -31,10 +31,10 @@ class ItemURI
* *
* @param array $fields Item-uri fields * @param array $fields Item-uri fields
* *
* @return integer item-uri id * @return int|null item-uri id
* @throws \Exception * @throws \Exception
*/ */
public static function insert($fields) public static function insert(array $fields)
{ {
// If the URI gets too long we only take the first parts and hope for best // If the URI gets too long we only take the first parts and hope for best
$uri = substr($fields['uri'], 0, 255); $uri = substr($fields['uri'], 0, 255);

4
src/Protocol/ActivityPub/Processor.php
View file

@ -327,6 +327,10 @@ class Processor
$item['guid'] = $activity['diaspora:guid'] ?: $guid; $item['guid'] = $activity['diaspora:guid'] ?: $guid;
$item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]); $item['uri-id'] = ItemURI::insert(['uri' => $item['uri'], 'guid' => $item['guid']]);
if (empty($item['uri-id'])) {
Logger::warning('Unable to get a uri-id for an item uri', ['uri' => $item['uri'], 'guid' => $item['guid']]);
return [];
}
$item = self::processContent($activity, $item); $item = self::processContent($activity, $item);
if (empty($item)) { if (empty($item)) {