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

Merge branch 'develop' into fix-blocks-listing

Browse source
This commit is contained in:
Hank Grabowski 2023-02-20 13:25:05 -05:00
commit dd664f632f
1 changed files with 28 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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