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

Merge pull request #12731 from annando/api-quotes

Browse source 
Quote for notifications
This commit is contained in:
Hypolite Petovan 2023-01-25 17:49:51 -05:00 committed by GitHub
commit 4e98f5a1df
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Factory/Api/Mastodon/Notification.php
View file

@ -47,11 +47,12 @@ class Notification extends BaseFactory
/**
* @param Notifications\Entity\Notification $Notification
* @param bool $display_quote Display quoted posts
*
* @return MstdnNotification
* @throws UnexpectedNotificationTypeException
*/
public function createFromNotification(Notifications\Entity\Notification $Notification): MstdnNotification
public function createFromNotification(Notifications\Entity\Notification $Notification, bool $display_quotes): MstdnNotification
{
$type = self::getType($Notification);
if (empty($type)) {
@ -62,7 +63,7 @@ class Notification extends BaseFactory
if ($Notification->targetUriId) {
try {
$status = $this->mstdnStatusFactory->createFromUriId($Notification->targetUriId, $Notification->uid);
$status = $this->mstdnStatusFactory->createFromUriId($Notification->targetUriId, $Notification->uid, $display_quotes);
} catch (\Throwable $th) {
$status = null;
}

4
src/Module/Api/Mastodon/Notifications.php
View file

@ -49,7 +49,7 @@ class Notifications extends BaseApi
$id = $this->parameters['id'];
try {
$notification = DI::notification()->selectOneForUser($uid, ['id' => $id]);
System::jsonExit(DI::mstdnNotification()->createFromNotification($notification));
System::jsonExit(DI::mstdnNotification()->createFromNotification($notification, self::appSupportsQuotes()));
} catch (\Exception $e) {
DI::mstdnError()->RecordNotFound();
}
@ -134,7 +134,7 @@ class Notifications extends BaseApi
foreach($Notifications as $Notification) {
try {
$mstdnNotifications[] = DI::mstdnNotification()->createFromNotification($Notification);
$mstdnNotifications[] = DI::mstdnNotification()->createFromNotification($Notification, self::appSupportsQuotes());
self::setBoundaries($Notification->id);
} catch (\Exception $e) {
// Skip this notification