bitPickups/friendica_2019-12_sharedHosting_hotFix
1
1
Fork 0
Code Pull requests Activity

Merge branch 'develop' into fix-blocks-listing

Browse source
This commit is contained in:
Hank Grabowski 2023-02-20 13:25:05 -05:00
commit dd664f632f
1 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -63,7 +63,8 @@ class Notifications extends BaseApi
'exclude_types' => [], // Array of types to exclude (follow, favourite, reblog, mention, poll, follow_request) 'exclude_types' => [], // Array of types to exclude (follow, favourite, reblog, mention, poll, follow_request)
'account_id' => 0, // Return only notifications received from this account 'account_id' => 0, // Return only notifications received from this account
'with_muted' => false, // Pleroma extension: return activities by muted (not by blocked!) users. 'with_muted' => false, // Pleroma extension: return activities by muted (not by blocked!) users.
'include_all' => false // Include dismissed and undismissed 'include_all' => false, // Include dismissed and undismissed
'summary' => false,
], $request); ], $request);
$params = ['order' => ['id' => true]]; $params = ['order' => ['id' => true]];
@ -130,6 +131,10 @@ class Notifications extends BaseApi
Verb::getID(Activity::POST), Post\UserNotification::TYPE_SHARED]); Verb::getID(Activity::POST), Post\UserNotification::TYPE_SHARED]);
} }
if ($request['summary']) {
$count = DI::notification()->countForUser($uid, $condition);
System::jsonExit(['count' => $count]);
} else {
$mstdnNotifications = []; $mstdnNotifications = [];
$Notifications = DI::notification()->selectByBoundaries( $Notifications = DI::notification()->selectByBoundaries(
@ -152,4 +157,5 @@ class Notifications extends BaseApi
self::setLinkHeader(); self::setLinkHeader();
System::jsonExit($mstdnNotifications); System::jsonExit($mstdnNotifications);
} }
}
} }