wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-09-24 02:39:33 +00:00
Code Issues Packages Projects Releases Wiki Activity

Loading notifications starting with one big local bundle

Browse source 
Redo of cc86387f80 but
trying not to break the special page this time.

Bug: T143813
Change-Id: Id39d18a2ba4efa2b49ed42d10aa9aeef0e4672f0
This commit is contained in:
Stephane Bisson 2016-08-26 06:45:48 -04:00
parent 9dd0e12733
commit 405b8ce084
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
includes/api/ApiEchoNotifications.php
View file

@ -258,9 +258,9 @@ class ApiEchoNotifications extends ApiCrossWikiBase {
$notifs = $notifMapper->fetchUnreadByUser( $user, $limit + 1, $continue, $eventTypes, $titles );
}
// compute $canContinue before bundling and rendering so the count
// is not affected by filtering
$canContinue = count( $notifs ) > $limit;
// get $overfetchedItem before bundling and rendering so that it is not affected by filtering
/** @var EchoNotification $overfetchedItem */
$overfetchedItem = count( $notifs ) > $limit ? array_pop( $notifs ) : null;
if ( $bundle ) {
$bundler = new Bundler();
@ -281,10 +281,11 @@ class ApiEchoNotifications extends ApiCrossWikiBase {
}
// Generate offset if necessary
if ( $canContinue ) {
$lastItem = array_pop( $result['list'] );
if ( $overfetchedItem ) {
// @todo: what to do with this when fetching from multiple wikis?
$result['continue'] = $lastItem['timestamp']['utcunix'] . '|' . $lastItem['id'];
$timestamp = wfTimestamp( TS_UNIX, $overfetchedItem->getTimestamp() );
$id = $overfetchedItem->getEvent()->getId();
$result['continue'] = $timestamp . '|' . $id;
}
return $result;