Merge pull request #8469 from MrPetovan/bug/notices

Add object key existence check in ActivityPub/Transmitter
pull/8471/head
Michael Vogel 2020-03-29 23:29:34 +02:00 zatwierdzone przez GitHub
commit 5734fcbf21
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 2 dodań i 2 usunięć

Wyświetl plik

@ -193,10 +193,10 @@ class Transmitter
$items = Item::select(['id'], $condition, ['limit' => [($page - 1) * 20, 20], 'order' => ['created' => true]]);
while ($item = Item::fetch($items)) {
$activity = self::createActivityFromItem($item['id'], true);
$activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
$activity['type'] = $activity['type'] == 'Update' ? 'Create' : $activity['type'];
// Only list "Create" activity objects here, no reshares
if (is_array($activity['object']) && ($activity['type'] == 'Create')) {
if (!empty($activity['object']) && ($activity['type'] == 'Create')) {
$list[] = $activity['object'];
}
}