wikimedia/mediawiki-skins-MinervaNeue
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/skins/MinervaNeue synced 2024-11-24 06:13:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

Display correct numbers on the combined notification badge

Browse source 
Bug: T310559
Bug: T324690
Change-Id: If7568da5d34840853de43cd50a477a2aa9a18d0f
This commit is contained in:
Bartosz Dziewoński 2022-12-12 23:13:05 +01:00
parent 46620392bf
commit f8240fea6e
1 changed files with 33 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

42
includes/Skins/SkinMinerva.php
View file

@ -23,6 +23,7 @@ namespace MediaWiki\Minerva\Skins;
use ExtensionRegistry;
use Html;
use Language;
use MediaWiki\Extension\Notifications\Controller\NotificationController;
use MediaWiki\Linker\LinkTarget;
use MediaWiki\MediaWikiServices;
use MediaWiki\Minerva\Menu\Main\MainMenuDirector;
@ -157,6 +158,30 @@ class SkinMinerva extends SkinMustache {
];
}
/**
* @param array $alert
* @param array $notice
* @return array
*/
private function getCombinedNotificationButton( array $alert, array $notice ) {
// Sum the notifications from the two original buttons
$notifCount = ( $alert['data']['counter-num'] ?? 0 ) + ( $notice['data']['counter-num'] ?? 0 );
$alert['data']['counter-num'] = $notifCount;
// @phan-suppress-next-line PhanUndeclaredClassReference
if ( class_exists( NotificationController::class ) ) {
// @phan-suppress-next-line PhanUndeclaredClassMethod
$alert['data']['counter-text'] = NotificationController::formatNotificationCount( $notifCount );
} else {
$alert['data']['counter-text'] = $notifCount;
}
if ( $notifCount > 0 ) {
return $this->getNotificationCircleButton( $alert );
} else {
return $this->getNotificationButton( $alert );
}
}
/**
* Minerva differs from other skins in that for users with unread notifications
* instead of a bell with a small square indicating the number of notifications
@ -223,19 +248,18 @@ class SkinMinerva extends SkinMustache {
}
$this->contentNavigationUrls = $contentNavigationUrls;
if ( $this->getUser()->isRegistered() ) {
// Unset notice icon. Minerva only shows one entry point to notifications.
// This can be reconsidered with a solution to https://phabricator.wikimedia.org/T142981
unset( $contentNavigationUrls['notifications']['notifications-notice'] );
// Shown to logged in users when Echo is not installed:
if ( count( $contentNavigationUrls['notifications'] ) === 0 ) {
// Shown to logged in users when Echo is not installed:
$contentNavigationUrls['notifications']['mytalks'] = $this->getNotificationFallbackButton();
} else {
// Combine notification icons. Minerva only shows one entry point to notifications.
// This can be reconsidered with a solution to https://phabricator.wikimedia.org/T142981
$alert = $contentNavigationUrls['notifications']['notifications-alert'] ?? null;
if ( $alert ) {
// @phan-suppress-next-line PhanTypeMismatchDimFetch False positive
$alertCount = $alert['data']['counter-num'] ?? 0;
$contentNavigationUrls['notifications']['notifications-alert'] = $alertCount > 0 ?
$this->getNotificationCircleButton( $alert ) : $this->getNotificationButton( $alert );
$notice = $contentNavigationUrls['notifications']['notifications-notice'] ?? null;
if ( $alert && $notice ) {
unset( $contentNavigationUrls['notifications']['notifications-notice'] );
$contentNavigationUrls['notifications']['notifications-alert'] =
$this->getCombinedNotificationButton( $alert, $notice );
}
}
}