Patch ContributionScores for newer tables

build: Updating mediawiki/mediawiki-codesniffer to 45.0.0
Change-Id: Ia8f9b33e935bf4f6f2ede29eeabf9acb10c15cb9
2025-01-23 20:21:52 +01:00 · 2024-11-02 05:55:26 +00:00 · 2024-09-29 02:48:39 +00:00 · 2024-09-28 22:24:05 +00:00 · 2024-07-03 22:17:33 +00:00 · 2024-05-18 05:11:57 +00:00
4 changed files with 2589 additions and 2833 deletions
--- a/composer.json
+++ b/composer.json
@ -1,9 +1,9 @@
 {
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "38.0.0",
-		"mediawiki/minus-x": "1.1.1",
-		"php-parallel-lint/php-console-highlighter": "0.5.0",
-		"php-parallel-lint/php-parallel-lint": "1.3.1"
+		"mediawiki/mediawiki-codesniffer": "45.0.0",
+		"mediawiki/minus-x": "1.1.3",
+		"php-parallel-lint/php-console-highlighter": "1.0.0",
+		"php-parallel-lint/php-parallel-lint": "1.4.0"
 	},
 	"scripts": {
 		"fix": [
@ -16,5 +16,10 @@
 			"minus-x check ."
 		],
 		"phpcs": "phpcs -sp --cache"
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@ -5,9 +5,9 @@
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.21.0",
-		"grunt": "1.4.1",
-		"grunt-banana-checker": "0.9.0",
-		"grunt-eslint": "23.0.0"
+		"eslint-config-wikimedia": "0.28.2",
+		"grunt": "1.6.1",
+		"grunt-banana-checker": "0.13.0",
+		"grunt-eslint": "24.3.0"
 	}
 }
--- a/src/ContributionScores.php
+++ b/src/ContributionScores.php
@ -33,7 +33,8 @@ class ContributionScores extends IncludableSpecialPage {
 		}

 		$user = User::newFromName( $usertext );
-		$dbr = wfGetDB( DB_REPLICA );
+		$loadBalancer = MediaWikiServices::getInstance()->getDBLoadBalancer();
+		$dbr = $loadBalancer->getConnection( DB_REPLICA );

 		if ( $user instanceof User && $user->isRegistered() ) {
 			global $wgLang;
@ -76,7 +77,7 @@ class ContributionScores extends IncludableSpecialPage {
 		} else {
 			$output = wfMessage( 'contributionscores-invalidusername' )->text();
 		}
-		return $parser->insertStripItem( $output, $parser->mStripState );
+		return $parser->insertStripItem( $output, $parser->getStripState() );
 	}

 	/**
@ -90,7 +91,8 @@ class ContributionScores extends IncludableSpecialPage {
 		global $wgContribScoreIgnoreBots, $wgContribScoreIgnoreBlockedUsers, $wgContribScoreIgnoreUsernames,
 			$wgContribScoreUseRoughEditCount;

-		$dbr = wfGetDB( DB_REPLICA );
+		$loadBalancer = MediaWikiServices::getInstance()->getDBLoadBalancer();
+		$dbr = $loadBalancer->getConnection( DB_REPLICA );

 		$revQuery = ActorMigration::newMigration()->getJoin( 'rev_user' );
 		$revQuery['tables'] = array_merge( [ 'revision' ], $revQuery['tables'] );
@ -119,7 +121,21 @@ class ContributionScores extends IncludableSpecialPage {

 		if ( $wgContribScoreIgnoreBlockedUsers ) {
 			$sqlWhere[] = "{$revUser} NOT IN " .
-				$dbr->buildSelectSubquery( 'ipblocks', 'ipb_user', 'ipb_user <> 0', __METHOD__ );
+				$dbr->buildSelectSubquery( 				[
+						'block',
+						'block_target'
+					],
+					'bt_user',
+					'bt_user <> 0',
+					__METHOD__,
+					[],
+					[
+						'block_target' => [ 'JOIN', [
+							'bl_target=bt_id'
+						] ]
+					]
+				);
+
 		}

 		if ( $wgContribScoreIgnoreBots ) {
@ -185,7 +201,6 @@ class ContributionScores extends IncludableSpecialPage {
 			__METHOD__,
 			[
 				'ORDER BY' => 'wiki_rank DESC',
-				'GROUP BY' => 'user_name',
 				'LIMIT' => $limit,
 			],
 			[
@ -391,7 +406,7 @@ class ContributionScores extends IncludableSpecialPage {
 		$out->addWikiMsg( 'contributionscores-info' );

 		foreach ( $wgContribScoreReports as $scoreReport ) {
-			list( $days, $revs ) = $scoreReport;
+			[ $days, $revs ] = $scoreReport;
 			if ( $days > 0 ) {
 				$reportTitle = $this->msg( 'contributionscores-days' )->numParams( $days )->text();
 			} else {
@ -407,6 +422,11 @@ class ContributionScores extends IncludableSpecialPage {
 		}
 	}

+	public function maxIncludeCacheTime() {
+		global $wgContribScoreDisableCache, $wgContribScoreCacheTTL;
+		return $wgContribScoreDisableCache ? 0 : $wgContribScoreCacheTTL;
+	}
+
 	/**
 	 * @inheritDoc
 	 */
Author	SHA1	Message	Date
0d0	384fdfa2bf	Patch ContributionScores for newer tables	2025-01-23 20:21:52 +01:00
libraryupgrader	7f40072416	build: Updating mediawiki/mediawiki-codesniffer to 45.0.0 Change-Id: Ia8f9b33e935bf4f6f2ede29eeabf9acb10c15cb9	2024-11-02 05:55:26 +00:00
libraryupgrader	e00a3b1c57	build: Updating dependencies composer: * mediawiki/mediawiki-codesniffer: 43.0.0 → 44.0.0 npm: * eslint-config-wikimedia: 0.27.0 → 0.28.2 * braces: 3.0.2 → 3.0.3 * https://github.com/advisories/GHSA-grv7-fg5c-xmjg * micromatch: 4.0.5 → 4.0.8 * https://github.com/advisories/GHSA-952p-6rrq-rcjv Change-Id: I039053dadabb9bc16cdf7c40cd523745d3e4116f	2024-09-29 02:48:39 +00:00
Umherirrender	95976e0082	Merge "build: Updating grunt-banana-checker to 0.13.0"	2024-09-28 22:24:05 +00:00
ZoruaFox	00af3f2598	Fix wfGetDB deprecated on 1.39 and later versions. The global function wfGetDB() has been deprecated since 1.39, use LoadBalancer::getConnection() instead of old function. Bug: T369145 Change-Id: Ided5ed8d1e54428541f067c75fbe7fdfeefc460f	2024-07-03 22:17:33 +00:00
libraryupgrader	2b415b36b5	build: Updating grunt-banana-checker to 0.13.0 Change-Id: Ibbdc718ea757b24ed4585f5f6e8a77bbb4f5f24f	2024-05-18 05:11:57 +00:00
libraryupgrader	1cf9ae8247	build: Updating dependencies composer: * mediawiki/minus-x: 1.1.1 → 1.1.3 npm: * grunt-banana-checker: 0.11.1 → 0.12.0 Change-Id: I7c6aa5e4e1c0c2c7c6410a0745febb443eceebe7	2024-05-10 03:07:37 +00:00
libraryupgrader	548a1f177c	build: Updating dependencies composer: * mediawiki/mediawiki-codesniffer: 41.0.0 → 43.0.0 * php-parallel-lint/php-parallel-lint: 1.3.2 → 1.4.0 npm: * eslint-config-wikimedia: 0.25.0 → 0.27.0 * grunt-banana-checker: 0.10.0 → 0.11.1 * grunt-eslint: 24.0.1 → 24.3.0 Change-Id: Iee9ef20b4984ad7459d77cc77c59394667954370	2024-04-22 02:10:29 +00:00
Umherirrender	645c945994	Merge "Fix "Cannot access non-public property Parser::$mStripState""	2023-09-03 18:06:37 +00:00
Luca Mauri	4212d24b49	Fix "Cannot access non-public property Parser::$mStripState" Discussed under https://www.mediawiki.org/wiki/Topic:Xc6c9apmxydt7817 Bug: T333675 Change-Id: Ifd38878edfd6481de85efd716e4f954cd1e449bb	2023-09-03 18:04:04 +00:00
libraryupgrader	7d145662fa	build: Updating npm dependencies * eslint-config-wikimedia: 0.24.0 → 0.25.0 * grunt-eslint: 24.0.0 → 24.0.1 Change-Id: I3a7cc1836a78f282f900b3405a9e7215803d6e38	2023-05-04 01:44:08 +00:00
libraryupgrader	7cc5575eaa	build: Updating dependencies composer: * mediawiki/mediawiki-codesniffer: 40.0.1 → 41.0.0 npm: * eslint-config-wikimedia: 0.22.1 → 0.24.0 * grunt: 1.5.3 → 1.6.1 Change-Id: Ic11909141e1d3be2b5100878ff7bcec5acdf48e9	2023-03-15 04:15:54 +00:00
libraryupgrader	945f54a773	build: Updating dependencies composer: * mediawiki/mediawiki-codesniffer: 39.0.0 → 40.0.1 npm: * grunt-banana-checker: 0.9.0 → 0.10.0 * minimatch: 3.0.4 → 3.0.8 * https://github.com/advisories/GHSA-f8q6-p94x-37v3 Change-Id: I55d1c7498aea0581127daa4c09cf44f846f34f7e	2022-12-30 01:11:43 +00:00
Vedmaka	d4dae78b27	Make `$wgContribScoreCacheTTL` affect caching of embedded `Special:ContributionScores` page Change-Id: I526362c422f611e3f8882be5575618f530b868b2	2022-12-11 10:43:17 +00:00
libraryupgrader	e307850555	build: Updating grunt to 1.5.3 Change-Id: I0fe9a27b6b821d9960553f487cd9bcf30ebd7a5b	2022-05-26 09:21:33 +00:00
libraryupgrader	790e23f9bb	build: Updating dependencies composer: * mediawiki/mediawiki-codesniffer: 38.0.0 → 39.0.0 * php-parallel-lint/php-console-highlighter: 0.5.0 → 1.0.0 * php-parallel-lint/php-parallel-lint: 1.3.1 → 1.3.2 npm: * grunt-eslint: 23.0.0 → 24.0.0 Change-Id: I426c1f103cbfce83d09ceefc71eb87c3691818eb	2022-05-21 02:08:18 +00:00
libraryupgrader	7fa71f5e78	build: Updating grunt to 1.5.2 Change-Id: I58cfa3b96a1c508aef987523df9bb2985dc0c6c0	2022-04-27 09:04:20 +00:00
libraryupgrader	6666f47f3b	build: Updating npm dependencies * eslint-config-wikimedia: 0.21.0 → 0.22.1 * async: 3.2.0 → 3.2.3 * https://github.com/advisories/GHSA-fwr7-v2mv-hh25 Change-Id: I10969887274d014e0273eda8828ec1c6b7b3f9af	2022-04-15 01:45:18 +00:00