From 4dc3f4fc3e1926eefb860bb66aea03532d116328 Mon Sep 17 00:00:00 2001
From: Func <Funcer@outlook.com>
Date: Sun, 14 Mar 2021 03:29:49 +0000
Subject: [PATCH] Update ContributionScores for expiring user groups

Bug: T160020
Change-Id: I66c9108133d2bdd5dc29336a525480764c95f5c2
---
 src/ContributionScores.php | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/ContributionScores.php b/src/ContributionScores.php
index 1c37fab..46e7170 100644
--- a/src/ContributionScores.php
+++ b/src/ContributionScores.php
@@ -121,8 +121,10 @@ class ContributionScores extends IncludableSpecialPage {
 
 		if ( $wgContribScoreIgnoreBots ) {
 			$sqlWhere[] = "{$revUser} NOT IN " .
-				$dbr->buildSelectSubquery( 'user_groups', 'ug_user', [ 'ug_group' => 'bot' ], __METHOD__ );
-
+				$dbr->buildSelectSubquery( 'user_groups', 'ug_user', [
+					'ug_group' => 'bot',
+					'ug_expiry IS NULL OR ug_expiry >= ' . $dbr->addQuotes( $dbr->timestamp() )
+				], __METHOD__ );
 		}
 
 		if ( $dbr->unionSupportsOrderAndLimit() ) {