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 3cf60b870cabf700cde5a8f363db6c9efb587339..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;
 
@@ -59,11 +58,12 @@ class Notifications extends BaseApi
                        '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)
+                       '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
+                       'include_all'   => false,  // Include dismissed and undismissed
+                       'summary'       => false,
                ], $request);
 
                $params = ['order' => ['id' => true]];
@@ -87,8 +87,8 @@ class Notifications extends BaseApi
                        $condition = DBA::mergeConditions(
                                $condition,
                                ["(`vid` != ? OR `type` != ? OR NOT `actor-id` IN (SELECT `id` FROM `contact` WHERE `pending`))",
-                               Verb::getID(Activity::FOLLOW),
-                               Post\UserNotification::TYPE_NONE]
+                                       Verb::getID(Activity::FOLLOW),
+                                       Post\UserNotification::TYPE_NONE]
                        );
                }
 
@@ -96,8 +96,8 @@ class Notifications extends BaseApi
                        $condition = DBA::mergeConditions(
                                $condition,
                                ["(`vid` != ? OR `type` != ? OR NOT `actor-id` IN (SELECT `id` FROM `contact` WHERE NOT `pending`))",
-                               Verb::getID(Activity::FOLLOW),
-                               Post\UserNotification::TYPE_NONE]
+                                       Verb::getID(Activity::FOLLOW),
+                                       Post\UserNotification::TYPE_NONE]
                        );
                }
 
@@ -130,26 +130,31 @@ class Notifications extends BaseApi
                                Verb::getID(Activity::POST), Post\UserNotification::TYPE_SHARED]);
                }
 
-               $mstdnNotifications = [];
+               if ($request['summary']) {
+                       $count = DI::notification()->countForUser($uid, $condition);
+                       System::jsonExit(['count' => $count]);
+               } else {
+                       $mstdnNotifications = [];
 
-               $Notifications = DI::notification()->selectByBoundaries(
-                       $condition,
-                       $params,
-                       $request['min_id'] ?: $request['since_id'],
-                       $request['max_id'],
-                       $request['limit']
-               );
+                       $Notifications = DI::notification()->selectByBoundaries(
+                               $condition,
+                               $params,
+                               $request['min_id'] ?: $request['since_id'],
+                               $request['max_id'],
+                               min($request['limit'], 30)
+                       );
 
-               foreach ($Notifications as $Notification) {
-                       try {
-                               $mstdnNotifications[] = DI::mstdnNotification()->createFromNotification($Notification, self::appSupportsQuotes());
-                               self::setBoundaries($Notification->id);
-                       } catch (\Exception $e) {
-                               // Skip this notification
+                       foreach ($Notifications as $Notification) {
+                               try {
+                                       $mstdnNotifications[] = DI::mstdnNotification()->createFromNotification($Notification, self::appSupportsQuotes());
+                                       self::setBoundaries($Notification->id);
+                               } catch (\Exception $e) {
+                                       // Skip this notification
+                               }
                        }
-               }
 
-               self::setLinkHeader();
-               System::jsonExit($mstdnNotifications);
+                       self::setLinkHeader();
+                       System::jsonExit($mstdnNotifications);
+               }
        }
 }