mirror of
https://github.com/friendica/friendica
synced 2024-11-10 03:42:53 +00:00
Merge branch 'develop' into mastodon-instance-v2-implementation
This commit is contained in:
commit
5c3bd4acd1
1 changed files with 28 additions and 22 deletions
|
@ -63,7 +63,8 @@ class Notifications extends BaseApi
|
|||
'exclude_types' => [], // Array of types to exclude (follow, favourite, reblog, mention, poll, follow_request)
|
||||
'account_id' => 0, // Return only notifications received from this account
|
||||
'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);
|
||||
|
||||
$params = ['order' => ['id' => true]];
|
||||
|
@ -130,6 +131,10 @@ class Notifications extends BaseApi
|
|||
Verb::getID(Activity::POST), Post\UserNotification::TYPE_SHARED]);
|
||||
}
|
||||
|
||||
if ($request['summary']) {
|
||||
$count = DI::notification()->countForUser($uid, $condition);
|
||||
System::jsonExit(['count' => $count]);
|
||||
} else {
|
||||
$mstdnNotifications = [];
|
||||
|
||||
$Notifications = DI::notification()->selectByBoundaries(
|
||||
|
@ -152,4 +157,5 @@ class Notifications extends BaseApi
|
|||
self::setLinkHeader();
|
||||
System::jsonExit($mstdnNotifications);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue