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

Merge remote-tracking branch 'upstream/2023.03-rc' into diaspora-signature

Browse source
This commit is contained in:
Michael 2023-04-12 05:53:18 +00:00
commit a4ef546433
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Factory/Api/Mastodon/Attachment.php
View file

@ -136,7 +136,7 @@ class Attachment extends BaseFactory
$url = $this->baseUrl . '/photo/' . $photo['resource-id'] . '-0.' . $ext; $url = $this->baseUrl . '/photo/' . $photo['resource-id'] . '-0.' . $ext;
$preview = Photo::selectFirst(['scale'], ["`resource-id` = ? AND `uid` = ? AND `scale` > ?", $photo['resource-id'], $photo['uid'], 0], ['order' => ['scale']]); $preview = Photo::selectFirst(['scale'], ["`resource-id` = ? AND `uid` = ? AND `scale` > ?", $photo['resource-id'], $photo['uid'], 0], ['order' => ['scale']]);
if (empty($scale)) { if (!empty($preview)) {
$preview_url = $this->baseUrl . '/photo/' . $photo['resource-id'] . '-' . $preview['scale'] . '.' . $ext; $preview_url = $this->baseUrl . '/photo/' . $photo['resource-id'] . '-' . $preview['scale'] . '.' . $ext;
} else { } else {
$preview_url = ''; $preview_url = '';

2
src/Navigation/Notifications/Repository/Notify.php
View file

@ -785,7 +785,7 @@ class Notify extends BaseRepository
$params['type'] = Model\Notification\Type::COMMENT; $params['type'] = Model\Notification\Type::COMMENT;
$subject = $l10n->t('%1$s Comment to conversation #%2$d by %3$s', $subjectPrefix, $item['parent'], $contact['name']); $subject = $l10n->t('%1$s Comment to conversation #%2$d by %3$s', $subjectPrefix, $item['parent'], $contact['name']);
if ($params['verb'] = Activity::LIKE) { if ($params['verb'] == Activity::LIKE) {
switch ($Notification->type) { switch ($Notification->type) {
case Model\Post\UserNotification::TYPE_DIRECT_COMMENT: case Model\Post\UserNotification::TYPE_DIRECT_COMMENT:
$subject = $l10n->t('%1$s %2$s liked your post #%3$d', $subjectPrefix, $contact['name'], $item['parent']); $subject = $l10n->t('%1$s %2$s liked your post #%3$d', $subjectPrefix, $contact['name'], $item['parent']);