jakob/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #13689 from MrPetovan/bug/warnings

Browse source 
Fix a few warning messages
This commit is contained in:
Michael Vogel 2023-12-03 15:37:40 +01:00 committed by GitHub
commit 3b96690d0c
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/Module/Api/Mastodon/Statuses.php
View file

@ -122,8 +122,8 @@ class Statuses extends BaseApi
$existing_media = array_column(Post\Media::getByURIId($post['uri-id'], [Post\Media::AUDIO, Post\Media::VIDEO, Post\Media::IMAGE]), 'id');
foreach ($request['media_attributes'] as $attributes) {
if (in_array($attributes['id'], $existing_media)) {
Post\Media::updateById(['description' => $attributes['description']], $attributes['id']);
if (!empty($attributes['id']) && in_array($attributes['id'], $existing_media)) {
Post\Media::updateById(['description' => $attributes['description'] ?? null], $attributes['id']);
}
}
@ -227,7 +227,7 @@ class Statuses extends BaseApi
break;
}
}
if (!empty($owner['allow_cid'] . $owner['allow_gid'] . $owner['deny_cid'] . $owner['deny_gid'])) {
$item['allow_cid'] = $owner['allow_cid'];
$item['allow_gid'] = $owner['allow_gid'];
@ -306,7 +306,7 @@ class Statuses extends BaseApi
}
$item = DI::contentItem()->expandTags($item, $request['visibility'] == 'direct');
if (!empty($request['media_ids'])) {
$item = $this->storeMediaIds($request['media_ids'], $item);
}

2
src/Protocol/ActivityPub/Receiver.php
View file

@ -1213,7 +1213,7 @@ class Receiver
}
// Fetch the receivers for the public and the followers collection
if ((($receiver == $followers) || (($receiver == self::PUBLIC_COLLECTION) && !$isGroup) || ($isGroup && ($element == 'as:audience'))) && !empty($actor)) {
if ((($receiver == $followers) || (($receiver == self::PUBLIC_COLLECTION) && !$isGroup) || ($isGroup && ($element == 'as:audience'))) && !empty($profile)) {
$receivers = self::getReceiverForActor($tags, $receivers, $follower_target, $profile);
continue;
}