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

Merge pull request #13067 from annando/issue-13052

Browse source 
Issue 13052: The limit parameter now behaves like the Mastodon counterpart
This commit is contained in:
Tobias Diekershoff 2023-05-01 07:08:18 +02:00 committed by GitHub
commit 8a37492ae6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,7 +28,6 @@ use Friendica\Model\Contact;
use Friendica\Model\Post; use Friendica\Model\Post;
use Friendica\Model\Verb; use Friendica\Model\Verb;
use Friendica\Module\BaseApi; use Friendica\Module\BaseApi;
use Friendica\Navigation\Notifications\Entity;
use Friendica\Object\Api\Mastodon\Notification; use Friendica\Object\Api\Mastodon\Notification;
use Friendica\Protocol\Activity; use Friendica\Protocol\Activity;
@ -59,7 +58,7 @@ class Notifications extends BaseApi
'max_id' => 0, // Return results older than this ID 'max_id' => 0, // Return results older than this ID
'since_id' => 0, // Return results newer than this ID 'since_id' => 0, // Return results newer than this ID
'min_id' => 0, // Return results immediately newer than this ID 'min_id' => 0, // Return results immediately newer than this ID
'limit' => 20, // Maximum number of results to return (default 20) 'limit' => 15, // Maximum number of results to return. Defaults to 15 notifications. Max 30 notifications.
'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.
@ -142,7 +141,7 @@ class Notifications extends BaseApi
$params, $params,
$request['min_id'] ?: $request['since_id'], $request['min_id'] ?: $request['since_id'],
$request['max_id'], $request['max_id'],
$request['limit'] min($request['limit'], 30)
); );
foreach ($Notifications as $Notification) { foreach ($Notifications as $Notification) {