From 00a4f0939c92bd355ecdac49b9e12250646ac869 Mon Sep 17 00:00:00 2001 From: Amir Sarabadani Date: Wed, 11 Apr 2018 22:20:55 +0200 Subject: [PATCH] Replace rc_patrolled values with contants, part I This constants has been recently introduced and it's good to use them Change-Id: I8ce56dc95de3e49610dca71c00965ca1ac74bcf0 --- includes/api/ApiQueryRecentChanges.php | 18 ++++++++++++------ includes/api/ApiQueryUserContributions.php | 20 ++++++++++++++++---- includes/api/ApiQueryWatchlist.php | 4 ++-- includes/changes/RecentChange.php | 6 +++--- includes/diff/DifferenceEngine.php | 2 +- includes/logging/LogEntry.php | 2 +- includes/page/WikiPage.php | 2 +- 7 files changed, 36 insertions(+), 18 deletions(-) diff --git a/includes/api/ApiQueryRecentChanges.php b/includes/api/ApiQueryRecentChanges.php index 9ff41498a9..326debc0e0 100644 --- a/includes/api/ApiQueryRecentChanges.php +++ b/includes/api/ApiQueryRecentChanges.php @@ -235,15 +235,21 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase { if ( isset( $show['unpatrolled'] ) ) { // See ChangesList::isUnpatrolled if ( $user->useRCPatrol() ) { - $this->addWhere( 'rc_patrolled = 0' ); + $this->addWhere( 'rc_patrolled = ' . RecentChange::PRC_UNPATROLLED ); } elseif ( $user->useNPPatrol() ) { - $this->addWhere( 'rc_patrolled = 0' ); + $this->addWhere( 'rc_patrolled = ' . RecentChange::PRC_UNPATROLLED ); $this->addWhereFld( 'rc_type', RC_NEW ); } } - $this->addWhereIf( 'rc_patrolled != 2', isset( $show['!autopatrolled'] ) ); - $this->addWhereIf( 'rc_patrolled = 2', isset( $show['autopatrolled'] ) ); + $this->addWhereIf( + 'rc_patrolled != ' . RecentChange::PRC_AUTOPATROLLED, + isset( $show['!autopatrolled'] ) + ); + $this->addWhereIf( + 'rc_patrolled = ' . RecentChange::PRC_AUTOPATROLLED, + isset( $show['autopatrolled'] ) + ); // Don't throw log entries out the window here $this->addWhereIf( @@ -552,9 +558,9 @@ class ApiQueryRecentChanges extends ApiQueryGeneratorBase { /* Add the patrolled flag */ if ( $this->fld_patrolled ) { - $vals['patrolled'] = $row->rc_patrolled != 0; + $vals['patrolled'] = $row->rc_patrolled != RecentChange::PRC_UNPATROLLED; $vals['unpatrolled'] = ChangesList::isUnpatrolled( $row, $user ); - $vals['autopatrolled'] = $row->rc_patrolled == 2; + $vals['autopatrolled'] = $row->rc_patrolled == RecentChange::PRC_AUTOPATROLLED; } if ( $this->fld_loginfo && $row->rc_type == RC_LOG ) { diff --git a/includes/api/ApiQueryUserContributions.php b/includes/api/ApiQueryUserContributions.php index f6bc8cb6b9..12f42edc48 100644 --- a/includes/api/ApiQueryUserContributions.php +++ b/includes/api/ApiQueryUserContributions.php @@ -540,10 +540,22 @@ class ApiQueryContributions extends ApiQueryBase { $this->addWhereIf( 'rev_minor_edit = 0', isset( $show['!minor'] ) ); $this->addWhereIf( 'rev_minor_edit != 0', isset( $show['minor'] ) ); - $this->addWhereIf( 'rc_patrolled = 0', isset( $show['!patrolled'] ) ); - $this->addWhereIf( 'rc_patrolled != 0', isset( $show['patrolled'] ) ); - $this->addWhereIf( 'rc_patrolled != 2', isset( $show['!autopatrolled'] ) ); - $this->addWhereIf( 'rc_patrolled = 2', isset( $show['autopatrolled'] ) ); + $this->addWhereIf( + 'rc_patrolled = ' . RecentChange::PRC_UNPATROLLED, + isset( $show['!patrolled'] ) + ); + $this->addWhereIf( + 'rc_patrolled != ' . RecentChange::PRC_UNPATROLLED, + isset( $show['patrolled'] ) + ); + $this->addWhereIf( + 'rc_patrolled != ' . RecentChange::PRC_AUTOPATROLLED, + isset( $show['!autopatrolled'] ) + ); + $this->addWhereIf( + 'rc_patrolled = ' . RecentChange::PRC_AUTOPATROLLED, + isset( $show['autopatrolled'] ) + ); $this->addWhereIf( $idField . ' != page_latest', isset( $show['!top'] ) ); $this->addWhereIf( $idField . ' = page_latest', isset( $show['top'] ) ); $this->addWhereIf( 'rev_parent_id != 0', isset( $show['!new'] ) ); diff --git a/includes/api/ApiQueryWatchlist.php b/includes/api/ApiQueryWatchlist.php index 52ad26cdcb..bb09838efc 100644 --- a/includes/api/ApiQueryWatchlist.php +++ b/includes/api/ApiQueryWatchlist.php @@ -375,9 +375,9 @@ class ApiQueryWatchlist extends ApiQueryGeneratorBase { /* Add the patrolled flag */ if ( $this->fld_patrol ) { - $vals['patrolled'] = $recentChangeInfo['rc_patrolled'] != 0; + $vals['patrolled'] = $recentChangeInfo['rc_patrolled'] != RecentChange::PRC_UNPATROLLED; $vals['unpatrolled'] = ChangesList::isUnpatrolled( (object)$recentChangeInfo, $user ); - $vals['autopatrolled'] = $recentChangeInfo['rc_patrolled'] == 2; + $vals['autopatrolled'] = $recentChangeInfo['rc_patrolled'] == RecentChange::PRC_AUTOPATROLLED; } if ( $this->fld_loginfo && $recentChangeInfo['rc_type'] == RC_LOG ) { diff --git a/includes/changes/RecentChange.php b/includes/changes/RecentChange.php index b0511209db..2f419056a5 100644 --- a/includes/changes/RecentChange.php +++ b/includes/changes/RecentChange.php @@ -622,7 +622,7 @@ class RecentChange { $dbw->update( 'recentchanges', [ - 'rc_patrolled' => 1 + 'rc_patrolled' => self::PRC_PATROLLED ], [ 'rc_id' => $this->getAttribute( 'rc_id' ) @@ -890,7 +890,7 @@ class RecentChange { 'rc_last_oldid' => 0, 'rc_bot' => $user->isAllowed( 'bot' ) ? (int)$wgRequest->getBool( 'bot', true ) : 0, 'rc_ip' => self::checkIPAddress( $ip ), - 'rc_patrolled' => $markPatrolled ? 1 : 0, + 'rc_patrolled' => $markPatrolled ? self::PRC_PATROLLED : self::PRC_UNPATROLLED, 'rc_new' => 0, # obsolete 'rc_old_len' => null, 'rc_new_len' => null, @@ -976,7 +976,7 @@ class RecentChange { 'rc_last_oldid' => $oldRevId, 'rc_bot' => $bot ? 1 : 0, 'rc_ip' => self::checkIPAddress( $ip ), - 'rc_patrolled' => 1, // Always patrolled, just like log entries + 'rc_patrolled' => self::PRC_PATROLLED, // Always patrolled, just like log entries 'rc_new' => 0, # obsolete 'rc_old_len' => null, 'rc_new_len' => null, diff --git a/includes/diff/DifferenceEngine.php b/includes/diff/DifferenceEngine.php index 037a80fbc7..8f57c578eb 100644 --- a/includes/diff/DifferenceEngine.php +++ b/includes/diff/DifferenceEngine.php @@ -542,7 +542,7 @@ class DifferenceEngine extends ContextSource { [ 'rc_timestamp' => $db->timestamp( $this->mNewRev->getTimestamp() ), 'rc_this_oldid' => $this->mNewid, - 'rc_patrolled' => 0 + 'rc_patrolled' => RecentChange::PRC_UNPATROLLED ], __METHOD__ ); diff --git a/includes/logging/LogEntry.php b/includes/logging/LogEntry.php index c672ef7fc9..97dadba8a5 100644 --- a/includes/logging/LogEntry.php +++ b/includes/logging/LogEntry.php @@ -785,7 +785,7 @@ class ManualLogEntry extends LogEntryBase { // Log the autopatrol if the log entry is patrollable if ( $this->getIsPatrollable() && - $rc->getAttribute( 'rc_patrolled' ) === 2 + $rc->getAttribute( 'rc_patrolled' ) === RecentChange::PRC_AUTOPATROLLED ) { PatrolLog::record( $rc, true, $this->getPerformer() ); } diff --git a/includes/page/WikiPage.php b/includes/page/WikiPage.php index f45036c1db..e5232d3f23 100644 --- a/includes/page/WikiPage.php +++ b/includes/page/WikiPage.php @@ -3269,7 +3269,7 @@ class WikiPage implements Page, IDBAccessObject { if ( $wgUseRCPatrol ) { // Mark all reverted edits as patrolled - $set['rc_patrolled'] = 1; + $set['rc_patrolled'] = RecentChange::PRC_PATROLLED; } if ( count( $set ) ) { -- 2.20.1