From 7f4007241644d1642d389aa76a34b05f420e35cc Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sat, 2 Nov 2024 01:14:32 +0000
Subject: [PATCH 1/3] build: Updating mediawiki/mediawiki-codesniffer to 45.0.0

Change-Id: Ia8f9b33e935bf4f6f2ede29eeabf9acb10c15cb9
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 975fd9a..3216c41 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "44.0.0",
+		"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"

From 6370730e6cec3ccff17d2ea988dd414fa87f1e16 Mon Sep 17 00:00:00 2001
From: libraryupgrader <tools.libraryupgrader@tools.wmflabs.org>
Date: Sun, 10 Nov 2024 03:24:03 +0000
Subject: [PATCH 2/3] build: Updating mediawiki/mediawiki-codesniffer to 45.0.0

Change-Id: I9004a0c891afd125fa3872387f28c05aab674aed
---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 975fd9a..3216c41 100644
--- a/composer.json
+++ b/composer.json
@@ -1,6 +1,6 @@
 {
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "44.0.0",
+		"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"

From 384fdfa2bf638454e74867c567ed01c1e59ba089 Mon Sep 17 00:00:00 2001
From: 0d0 <0d0acre@esiliati.org>
Date: Thu, 23 Jan 2025 20:21:52 +0100
Subject: [PATCH 3/3] Patch ContributionScores for newer tables

---
 src/ContributionScores.php | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/src/ContributionScores.php b/src/ContributionScores.php
index 6d5683f..1c618b1 100644
--- a/src/ContributionScores.php
+++ b/src/ContributionScores.php
@@ -121,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 ) {
@@ -187,7 +201,6 @@ class ContributionScores extends IncludableSpecialPage {
 			__METHOD__,
 			[
 				'ORDER BY' => 'wiki_rank DESC',
-				'GROUP BY' => 'user_name',
 				'LIMIT' => $limit,
 			],
 			[