Merge pull request #13176 from MrPetovan/bug/warnings

[friendica.git] / src / Module / Api / Mastodon / Notifications.php

diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php
index ab94fee55c4e50020ec2b90ab06756fb43615cf1..70ef068982e10e489b034bc47858cdbd997b8dfe 100644 (file)
--- a/src/Module/Api/Mastodon/Notifications.php
+++ b/src/Module/Api/Mastodon/Notifications.php
@@ -28,7 +28,6 @@ use Friendica\Model\Contact;
 use Friendica\Model\Post;
 use Friendica\Model\Verb;
 use Friendica\Module\BaseApi;
-use Friendica\Navigation\Notifications\Entity;
 use Friendica\Object\Api\Mastodon\Notification;
 use Friendica\Protocol\Activity;
 
@@ -56,15 +55,15 @@ class Notifications extends BaseApi
                }
 
                $request = $this->getRequest([
-                       'max_id' => 0,     // Return results older than this ID
-                       'since_id' => 0,     // Return results newer than this ID
-                       'min_id' => 0,     // Return results immediately newer than this ID
-                       'limit' => 20,    // Maximum number of results to return (default 20)
+                       'max_id'        => 0,     // Return results older than this ID
+                       'since_id'      => 0,     // Return results newer than this ID
+                       'min_id'        => 0,     // Return results immediately newer than this ID
+                       '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)
-                       '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
-                       'summary' => false,
+                       '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
+                       'summary'       => false,
                ], $request);
 
                $params = ['order' => ['id' => true]];
@@ -142,7 +141,7 @@ class Notifications extends BaseApi
                                $params,
                                $request['min_id'] ?: $request['since_id'],
                                $request['max_id'],
-                               $request['limit']
+                               min($request['limit'], 30)
                        );
 
                        foreach ($Notifications as $Notification) {