From e594bb72dd871fe1036617f519ea0fb8417643cc Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Mon, 20 Feb 2023 08:53:28 -0500 Subject: [PATCH 1/2] Add notifications summary (count only for now) to Mastodon API --- src/Module/Api/Mastodon/Notifications.php | 62 +++++++++++++---------- 1 file changed, 34 insertions(+), 28 deletions(-) diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php index 3cf60b870c..ab94fee55c 100644 --- a/src/Module/Api/Mastodon/Notifications.php +++ b/src/Module/Api/Mastodon/Notifications.php @@ -56,14 +56,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' => 20, // Maximum number of results to return (default 20) '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 + '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]]; @@ -87,8 +88,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 +97,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 +131,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'], + $request['limit'] + ); - 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); + } } } From 4abb7ed746c12147bdb3b9c185e7a50cb32fd6ef Mon Sep 17 00:00:00 2001 From: Hank Grabowski Date: Mon, 20 Feb 2023 09:07:50 -0500 Subject: [PATCH 2/2] Fix whitespace issue on assignment alignment --- src/Module/Api/Mastodon/Notifications.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/Module/Api/Mastodon/Notifications.php b/src/Module/Api/Mastodon/Notifications.php index ab94fee55c..31fe7a57fb 100644 --- a/src/Module/Api/Mastodon/Notifications.php +++ b/src/Module/Api/Mastodon/Notifications.php @@ -56,15 +56,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' => 20, // Maximum number of results to return (default 20) '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]];