friendica/friendica
6
0
Fork 1
mirror of https://github.com/friendica/friendica synced 2024-05-12 06:19:39 +02:00
Code Issues Packages Projects Releases 1 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
parent efc4e5668a ae3afaad94
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 Notifications\Entity\Notification $Notification
* @param bool $display_quote Display quoted posts
* *
* @return MstdnNotification * @return MstdnNotification
* @throws UnexpectedNotificationTypeException * @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); $type = self::getType($Notification);
if (empty($type)) { if (empty($type)) {
@ -62,7 +63,7 @@ class Notification extends BaseFactory
if ($Notification->targetUriId) { if ($Notification->targetUriId) {
try { try {
$status = $this->mstdnStatusFactory->createFromUriId($Notification->targetUriId, $Notification->uid); $status = $this->mstdnStatusFactory->createFromUriId($Notification->targetUriId, $Notification->uid, $display_quotes);
} catch (\Throwable $th) { } catch (\Throwable $th) {
$status = null; $status = null;
} }

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

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