wikimedia/mediawiki-extensions-Echo
1
0
Fork 0
mirror of https://gerrit.wikimedia.org/r/mediawiki/extensions/Echo synced 2024-11-28 09:40:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "NotifUser: Make resetNotificationCount() default to DB_MASTER"

Browse source
This commit is contained in:
jenkins-bot 2018-05-30 21:55:06 +00:00 committed by Gerrit Code Review
parent e03f04be89 32b82fa1fe
commit 0aef7d8d94
5 changed files with 18 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
includes/EchoHooks.php
View file

@ -1417,9 +1417,9 @@ class EchoHooks {
public static function onMergeAccountFromTo( User &$oldUser, User &$newUser ) { public static function onMergeAccountFromTo( User &$oldUser, User &$newUser ) {
DeferredUpdates::addCallableUpdate( function () use ( $oldUser, $newUser ) { DeferredUpdates::addCallableUpdate( function () use ( $oldUser, $newUser ) {
MWEchoNotifUser::newFromUser( $oldUser )->resetNotificationCount( DB_MASTER ); MWEchoNotifUser::newFromUser( $oldUser )->resetNotificationCount();
if ( !$newUser->isAnon() ) { if ( !$newUser->isAnon() ) {
MWEchoNotifUser::newFromUser( $newUser )->resetNotificationCount( DB_MASTER ); MWEchoNotifUser::newFromUser( $newUser )->resetNotificationCount();
} }
} ); } );

18
includes/NotifUser.php
View file

@ -362,7 +362,7 @@ class MWEchoNotifUser {
$updated = $this->userNotifGateway->markRead( $eventIds ); $updated = $this->userNotifGateway->markRead( $eventIds );
if ( $updated ) { if ( $updated ) {
// Update notification count in cache // Update notification count in cache
$this->resetNotificationCount( DB_MASTER ); $this->resetNotificationCount();
// After this 'mark read', is there any unread edit-user-talk // After this 'mark read', is there any unread edit-user-talk
// remaining? If not, we should clear the newtalk flag. // remaining? If not, we should clear the newtalk flag.
@ -395,7 +395,7 @@ class MWEchoNotifUser {
$updated = $this->userNotifGateway->markUnRead( $eventIds ); $updated = $this->userNotifGateway->markUnRead( $eventIds );
if ( $updated ) { if ( $updated ) {
// Update notification count in cache // Update notification count in cache
$this->resetNotificationCount( DB_MASTER ); $this->resetNotificationCount();
// After this 'mark unread', is there any unread edit-user-talk? // After this 'mark unread', is there any unread edit-user-talk?
// If so, we should add the edit-user-talk flag // If so, we should add the edit-user-talk flag
@ -468,12 +468,18 @@ class MWEchoNotifUser {
} }
/** /**
* Invalidate cache and update echo_unread_wikis if x-wiki notifications is enabled * Invalidate cache and update echo_unread_wikis if x-wiki notifications is enabled.
* NOTE: Consider calling this function from a deferred update since it may access the db
* *
* @param int $dbSource Use master or replica database to pull count * This updates the user's touched timestamp, as well as the value returned by getGlobalUpdateTime().
*
* NOTE: Consider calling this function from a deferred update, since it will read from and write to
* the master DB if cross-wiki notifications are enabled.
*
* @param int $dbSource Use master or replica database to pull count.
* Only used if $wgEchoCrossWikiNotifications is enabled.
* Do not set this to DB_REPLICA unless you know what you're doing.
*/ */
public function resetNotificationCount( $dbSource = DB_REPLICA ) { public function resetNotificationCount( $dbSource = DB_MASTER ) {
global $wgEchoCrossWikiNotifications; global $wgEchoCrossWikiNotifications;
if ( $wgEchoCrossWikiNotifications ) { if ( $wgEchoCrossWikiNotifications ) {
// Schedule an update to the echo_unread_wikis table // Schedule an update to the echo_unread_wikis table

2
includes/controller/ModerationController.php
View file

@ -34,6 +34,8 @@ class EchoModerationController {
// users whose notifications have been moderated. // users whose notifications have been moderated.
foreach ( $affectedUserIds as $userId ) { foreach ( $affectedUserIds as $userId ) {
$user = User::newFromId( $userId ); $user = User::newFromId( $userId );
// TODO this looks like it's still susceptible to a race condition, if the notification count
// was reset from the master just before
MWEchoNotifUser::newFromUser( $user )->resetNotificationCount( DB_REPLICA ); MWEchoNotifUser::newFromUser( $user )->resetNotificationCount( DB_REPLICA );
} }
} ); } );

2
includes/jobs/NotificationDeleteJob.php
View file

@ -59,7 +59,7 @@ class EchoNotificationDeleteJob extends Job {
); );
if ( $res ) { if ( $res ) {
$notifUser = MWEchoNotifUser::newFromUser( $user ); $notifUser = MWEchoNotifUser::newFromUser( $user );
$notifUser->resetNotificationCount( DB_MASTER ); $notifUser->resetNotificationCount();
} }
} }

2
includes/model/Notification.php
View file

@ -136,7 +136,7 @@ class EchoNotification extends EchoAbstractEntity implements Bundleable {
// Add listener to refresh notification count upon insert // Add listener to refresh notification count upon insert
$notifMapper->attachListener( 'insert', 'refresh-notif-count', $notifMapper->attachListener( 'insert', 'refresh-notif-count',
function () use ( $notifUser, $section ) { function () use ( $notifUser, $section ) {
$notifUser->resetNotificationCount( DB_MASTER ); $notifUser->resetNotificationCount();
} }
); );