Patch ContributionScores for newer tables

Change-Id: Ia8f9b33e935bf4f6f2ede29eeabf9acb10c15cb9

.eslintrc.json

@@ -1,10 +1,8 @@
 {
 	"root": true,
 	"extends": [
-		"wikimedia/client",
-		"wikimedia/jquery"
-	],
-	"globals": {
-		"mw": false
-	}
+		"wikimedia/client-es5",
+		"wikimedia/jquery",
+		"wikimedia/mediawiki"
+	]
 }

.phpcs.xml

@@ -1,12 +1,12 @@
 <?xml version="1.0"?>
 <ruleset>
 	<rule ref="./vendor/mediawiki/mediawiki-codesniffer/MediaWiki">
-		<exclude name="MediaWiki.Files.ClassMatchesFilename.NotMatch" />
-		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationProtected" />
 		<exclude name="MediaWiki.Commenting.FunctionComment.MissingDocumentationPublic" />
+		<exclude name="MediaWiki.Usage.ExtendClassUsage.FunctionConfigUsage" />
+		<exclude name="PSR12.Properties.ConstantVisibility.NotFound" />
 		<exclude name="Squiz.Scope.MethodScope.Missing" />
 	</rule>
 	<file>.</file>
-	<arg name="extensions" value="php,php5,inc" />
+	<arg name="extensions" value="php" />
 	<arg name="encoding" value="UTF-8" />
 </ruleset>

ContributionScores.alias.php

@@ -233,6 +233,16 @@ $specialPageAliases['sk'] = [
 	'ContributionScores' => [ 'SkórePríspevkov' ],
 ];
 
+/** Serbian Cyrillic (српски (ћирилица)) */
+$specialPageAliases['sr-ec'] = [
+	'ContributionScores' => [ 'ОценеДоприноса' ],
+];
+
+/** Serbian Latin (srpski (latinica)) */
+$specialPageAliases['sr-el'] = [
+	'ContributionScores' => [ 'OceneDoprinosa' ],
+];
+
 /** Swedish (svenska) */
 $specialPageAliases['sv'] = [
 	'ContributionScores' => [ 'Bidragspoäng' ],

ContributionScores.php

@@ -1,109 +0,0 @@
-<?php
-/** \file
- * \brief Contains setup code for the Contribution Scores Extension.
- */
-
-# Not a valid entry point, skip unless MEDIAWIKI is defined
-if ( !defined( 'MEDIAWIKI' ) ) {
-	echo 'Contribution Scores extension';
-	exit( 1 );
-}
-
-$wgExtensionCredits['specialpage'][] = [
-	'path' => __FILE__,
-	'name' => 'Contribution Scores',
-	'url' => 'https://www.mediawiki.org/wiki/Extension:Contribution_Scores',
-	'author' => 'Tim Laqua',
-	'descriptionmsg' => 'contributionscores-desc',
-	'version' => '1.25.0'
-];
-
-define( 'CONTRIBUTIONSCORES_MAXINCLUDELIMIT', 50 );
-$wgContribScoreReports = null;
-
-// These settings can be overridden in LocalSettings.php.
-
-// Set to true to exclude bots from the reporting.
-$wgContribScoreIgnoreBlockedUsers = false;
-
-// Set to true to exclude blocked users from the reporting.
-$wgContribScoreIgnoreBots = false;
-
-// Set to true to use real user names when available. Only for MediaWiki 1.19 and later.
-$wgContribScoresUseRealName = false;
-
-// Set to true to disable cache for parser function and inclusion of table.
-$wgContribScoreDisableCache = false;
-
-$wgAutoloadClasses['ContributionScores'] = __DIR__ . '/ContributionScores_body.php';
-$wgSpecialPages['ContributionScores'] = 'ContributionScores';
-
-$wgMessagesDirs['ContributionScores'] = __DIR__ . '/i18n';
-$wgExtensionMessagesFiles['ContributionScoresAlias'] = __DIR__ . '/ContributionScores.alias.php';
-$wgExtensionMessagesFiles['ContributionScoresMagic'] =
-	__DIR__ . '/ContributionScores.i18n.magic.php';
-
-$wgHooks['ParserFirstCallInit'][] = 'efContributionScores_Setup';
-
-function efContributionScores_Setup( &$parser ) {
-	$parser->setFunctionHook( 'cscore', 'efContributionScores_Render' );
-
-	return true;
-}
-
-function efContributionScores_Render( &$parser, $usertext, $metric = 'score' ) {
-	global $wgContribScoreDisableCache;
-
-	if ( $wgContribScoreDisableCache ) {
-		$parser->getOutput()->updateCacheExpiry( 0 );
-	}
-
-	$user = User::newFromName( $usertext );
-	$dbr = wfGetDB( DB_REPLICA );
-
-	if ( $user instanceof User && $user->isLoggedIn() ) {
-		global $wgLang;
-
-		$revWhere = ActorMigration::newMigration()->getWhere( $dbr, 'rev_user', $user );
-		if ( $metric == 'score' ) {
-			$res = $dbr->select(
-				[ 'revision' ] + $revWhere['tables'],
-				'COUNT(DISTINCT rev_page)+SQRT(COUNT(rev_id)-COUNT(DISTINCT rev_page))*2 AS wiki_rank',
-				$revWhere['conds'],
-				__METHOD__,
-				[],
-				$revWhere['joins']
-			);
-			$row = $dbr->fetchObject( $res );
-			$output = $wgLang->formatNum( round( $row->wiki_rank, 0 ) );
-		} elseif ( $metric == 'changes' ) {
-			$res = $dbr->select(
-				[ 'revision' ] + $revWhere['tables'],
-				'COUNT(rev_id) AS rev_count',
-				$revWhere['conds'],
-				__METHOD__,
-				[],
-				$revWhere['joins']
-			);
-			$row = $dbr->fetchObject( $res );
-			$output = $wgLang->formatNum( $row->rev_count );
-		} elseif ( $metric == 'pages' ) {
-			$res = $dbr->select(
-				[ 'revision' ] + $revWhere['tables'],
-				'COUNT(DISTINCT rev_page) AS page_count',
-				$revWhere['conds'],
-				__METHOD__,
-				[],
-				$revWhere['joins']
-			);
-			$row = $dbr->fetchObject( $res );
-			$output = $wgLang->formatNum( $row->page_count );
-		} else {
-			$output = wfMessage( 'contributionscores-invalidmetric' )->text();
-		}
-	} else {
-		$output = wfMessage( 'contributionscores-invalidusername' )->text();
-	}
-
-	return $parser->insertStripItem( $output, $parser->mStripState );
-}

Gruntfile.js

@@ -11,7 +11,6 @@ module.exports = function ( grunt ) {
 		},
 		eslint: {
 			options: {
-				extensions: [ '.js', '.json' ],
 				cache: true
 			},
 			all: [

composer.json

@@ -1,9 +1,9 @@
 {
 	"require-dev": {
-		"mediawiki/mediawiki-codesniffer": "31.0.0",
-		"mediawiki/minus-x": "1.1.0",
-		"php-parallel-lint/php-console-highlighter": "0.5.0",
-		"php-parallel-lint/php-parallel-lint": "1.2.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"
 	},
 	"scripts": {
 		"fix": [
@@ -12,8 +12,14 @@
 		],
 		"test": [
 			"parallel-lint . --exclude vendor --exclude node_modules",
-			"phpcs -p -s",
+			"@phpcs",
 			"minus-x check ."
-		]
+		],
+		"phpcs": "phpcs -sp --cache"
+	},
+	"config": {
+		"allow-plugins": {
+			"dealerdirect/phpcodesniffer-composer-installer": true
+		}
 	}
 }

extension.json

@@ -0,0 +1,64 @@
+{
+	"name": "ContributionScores",
+	"author": "Tim Laqua",
+	"url": "https://www.mediawiki.org/wiki/Extension:Contribution_Scores",
+	"descriptionmsg": "contributionscores-desc",
+	"version": "1.26.1",
+	"type": "specialpage",
+	"requires": {
+		"MediaWiki": ">= 1.34.0"
+	},
+	"SpecialPages": {
+		"ContributionScores": "ContributionScores"
+	},
+	"AutoloadClasses": {
+		"ContributionScores": "src/ContributionScores.php"
+	},
+	"Hooks": {
+		"ParserFirstCallInit": "ContributionScores::onParserFirstCallInit"
+	},
+	"MessagesDirs": {
+		"ContributionScores": [
+			"i18n"
+		]
+	},
+	"ExtensionMessagesFiles": {
+		"ContribScoreAlias": "ContributionScores.alias.php",
+		"ContribScoreMagic": "ContributionScores.i18n.magic.php"
+	},
+	"config": {
+		"ContribScoreReports": {
+			"value": null,
+			"description": "Each array defines a report - 7,50 is \"past 7 days \" and \"LIMIT 50 \" - Can be omitted."
+		},
+		"ContribScoreIgnoreBlockedUsers": {
+			"value": false,
+			"description": "Set to true to exclude blocked users from the reporting."
+		},
+		"ContribScoreIgnoreBots": {
+			"value": false,
+			"description": "Set to true to exclude bots users from the reporting."
+		},
+		"ContribScoreIgnoreUsernames": {
+			"value": [],
+			"description": "Array of usernames to exclude from the reporting."
+		},
+		"ContribScoresUseRealName": {
+			"value": false,
+			"description": "Set to true to use real user names when available."
+		},
+		"ContribScoreDisableCache": {
+			"value": false,
+			"description": "Set to true to disable cache for parser function and inclusion of table."
+		},
+		"ContribScoreUseRoughEditCount": {
+			"value": false,
+			"description": "Set to true to use the rough number of edits in user table, for performance issue."
+		},
+		"ContribScoreCacheTTL": {
+			"value": 30,
+			"description": "Cache the contribution scores data, in minutes."
+		}
+	},
+	"manifest_version": 2
+}

i18n/bs.json

@@ -3,7 +3,8 @@
 		"authors": [
 			"CERminator",
 			"KWiki",
-			"Srdjan m"
+			"Srdjan m",
+			"Srđan"
 		]
 	},
 	"contributionscores": "Rezultat doprinosa",

i18n/da.json

@@ -4,7 +4,8 @@
 			"Byrial",
 			"Christian List",
 			"Kaare",
-			"Peter Alberti"
+			"Peter Alberti",
+			"Saederup92"
 		]
 	},
 	"contributionscores": "Bidragspoint",
@@ -14,6 +15,7 @@
 	"contributionscores-days": "Sidste {{PLURAL:$1|dag|$1 dage}}",
 	"contributionscores-allrevisions": "Gennem tiden",
 	"contributionscores-score": "Point",
+	"contributionscores-rank": "Rang",
 	"contributionscores-pages": "Sider",
 	"contributionscores-changes": "Ændringer",
 	"contributionscores-username": "Brugernavn",

i18n/diq.json

@@ -11,7 +11,7 @@
 	"contributionscores-info": "Ebe pawıtışê hecmê tedqiqê berzi ra, puwan raveri pelanê bêemsalanê vurniyayeyan senceno.",
 	"contributionscores-top": "(Tewr Gırde $1)",
 	"contributionscores-days": "{{PLURAL:$1|Roca peyêne|$1 Rocê peyêni}}",
-	"contributionscores-allrevisions": "Çaxan de hemi",
+	"contributionscores-allrevisions": "Her dem",
 	"contributionscores-score": "Puwan",
 	"contributionscores-rank": "Rêze",
 	"contributionscores-pages": "Peli",

i18n/en.json

@@ -15,4 +15,4 @@
 	"contributionscores-username": "Username",
 	"contributionscores-invalidusername": "Invalid username",
 	"contributionscores-invalidmetric": "Invalid metric"
-}
+}

i18n/ext.json

@@ -1,8 +0,0 @@
-{
-	"@metadata": {
-		"authors": [
-			"Better"
-		]
-	},
-	"contributionscores-days": "Úrtimus $1 dias"
-}

i18n/fi.json

@@ -1,6 +1,7 @@
 {
 	"@metadata": {
 		"authors": [
+			"01miki10",
 			"Crt",
 			"Nike",
 			"Pxos",
@@ -18,7 +19,7 @@
 	"contributionscores-rank": "Sija",
 	"contributionscores-pages": "Sivuja",
 	"contributionscores-changes": "Muutoksia",
-	"contributionscores-username": "Käyttäjätunnus",
-	"contributionscores-invalidusername": "Virheellinen käyttäjätunnus",
+	"contributionscores-username": "Käyttäjänimi",
+	"contributionscores-invalidusername": "Virheellinen käyttäjänimi",
 	"contributionscores-invalidmetric": "Virheellinen muuttuja"
 }

i18n/fr.json

@@ -21,6 +21,6 @@
 	"contributionscores-pages": "Pages",
 	"contributionscores-changes": "Changements",
 	"contributionscores-username": "Nom d’utilisateur",
-	"contributionscores-invalidusername": "Nom d’utilisateur invalide",
+	"contributionscores-invalidusername": "Nom d’utilisateur incorrect",
 	"contributionscores-invalidmetric": "Métrique incorrecte"
 }

i18n/ie.json

@@ -6,11 +6,12 @@
 	},
 	"contributionscores": "Contes de contribution",
 	"contributionscores-desc": "Calcula li funde de data del wiki por max alt [[Special:ContributionScores|volúmine de contribution de usator]]",
-	"contributionscores-info": "Contes es calculat quam seque:\n*Un (1) punctu por chascun págine unic redactet\n*Fonte de quadrat de (total de redactiones fat) - (total unique pages) * 2\nContes calculat in ti diversitá de redaction in pesa maniere súper de volúmine de redaction.\nBasicmen, ti conte mesura primarimen págines unic redactet, che consideration por alt volúmine de redaction - suposit esser un págine de alt qualitá.",
+	"contributionscores-info": "Li calcul primarimen mesura págines unic redactet, considerant li alt volume de redactiones.",
 	"contributionscores-top": "(Prim $1)",
 	"contributionscores-days": "Ultim {{PLURAL:$1|die|$1 dies}}",
 	"contributionscores-allrevisions": "Omni témpor",
 	"contributionscores-score": "Conte",
+	"contributionscores-rank": "Classification",
 	"contributionscores-pages": "Págines",
 	"contributionscores-changes": "Changes",
 	"contributionscores-username": "Nómine de usator",

i18n/io.json

@@ -5,6 +5,8 @@
 		]
 	},
 	"contributionscores-days": "Lasta {{PLURAL:$1|dio|$1 dii}}",
+	"contributionscores-score": "Nombro di punti",
 	"contributionscores-pages": "Pagini",
+	"contributionscores-changes": "Modifikuri",
 	"contributionscores-username": "Uzeronomo"
 }

i18n/ku-latn.json

@@ -1,10 +1,12 @@
 {
 	"@metadata": {
 		"authors": [
+			"Balyozxane",
 			"George Animal"
 		]
 	},
 	"contributionscores-allrevisions": "Hemû dem",
 	"contributionscores-pages": "Rûpel",
+	"contributionscores-changes": "Guhartin",
 	"contributionscores-username": "Navê bikarhêner"
 }

i18n/pnb.json

@@ -1,9 +1,11 @@
 {
 	"@metadata": {
 		"authors": [
+			"Abbas dhothar",
 			"BukhariSaeed"
 		]
 	},
+	"contributionscores-days": "پچھلے{{PLURAL:$1|دن|$1 دناں}}",
 	"contributionscores-changes": "تبدیلیاں",
 	"contributionscores-username": "ورتن آلے دا ناں"
 }

i18n/sk.json

@@ -3,16 +3,18 @@
 		"authors": [
 			"Helix84",
 			"Luky001",
-			"Teslaton"
+			"Teslaton",
+			"Yardom78"
 		]
 	},
 	"contributionscores": "Skóre príspevkov",
-	"contributionscores-desc": "Zisťuje naväčší [[Special:ContributionScores|objem používateľských príspevkov]] z databázy wiki",
+	"contributionscores-desc": "Získava údaje z databázy wiki o [[Special:ContributionScores|množstve používateľských príspevkov]]",
 	"contributionscores-info": "Skóre primárne meria jedinečné editované stránky s ohľadom na veľké množstvo úprav.",
 	"contributionscores-top": "(Najlepších $1)",
 	"contributionscores-days": "{{PLURAL:$1|Posledný $1 deň|Posledné $1 dni|Posledných $1 dní}}",
-	"contributionscores-allrevisions": "Celá história",
+	"contributionscores-allrevisions": "Celkom",
 	"contributionscores-score": "Skóre",
+	"contributionscores-rank": "Poradie",
 	"contributionscores-pages": "Stránky",
 	"contributionscores-changes": "Zmeny",
 	"contributionscores-username": "Používateľské meno",

i18n/sr-ec.json

@@ -2,6 +2,7 @@
 	"@metadata": {
 		"authors": [
 			"Acamicamacaraca",
+			"Kizule",
 			"Milicevic01",
 			"Rancher",
 			"Sasa Stefanovic",

i18n/ti.json

@@ -6,5 +6,5 @@
 	},
 	"contributionscores-pages": "ገጻት",
 	"contributionscores-changes": "ለውጥታት",
-	"contributionscores-username": "ሽም ተጠቃሚ"
+	"contributionscores-username": "ስም ተጠቃሚ"
 }

i18n/yue.json

@@ -1,7 +1,9 @@
 {
 	"@metadata": {
 		"authors": [
+			"Moon0319",
 			"PhiLiP",
+			"Roy17",
 			"Shinjiman",
 			"Shirayuki",
 			"Yueman"
@@ -12,7 +14,7 @@
 	"contributionscores-info": "呢個分數係會依主要嘅唯一編輯過嘅頁，同埋考慮高編輯量。",
 	"contributionscores-top": "(最高$1名)",
 	"contributionscores-days": "最近$1日",
-	"contributionscores-allrevisions": "全部時間",
+	"contributionscores-allrevisions": "有史以來",
 	"contributionscores-score": "分數",
 	"contributionscores-rank": "等級",
 	"contributionscores-pages": "版",

package.json

@@ -1,12 +1,13 @@
 {
+	"name": "ContributionScores",
 	"private": true,
 	"scripts": {
 		"test": "grunt test"
 	},
 	"devDependencies": {
-		"eslint-config-wikimedia": "0.15.3",
-		"grunt": "1.1.0",
-		"grunt-banana-checker": "0.9.0",
-		"grunt-eslint": "22.0.0"
+		"eslint-config-wikimedia": "0.28.2",
+		"grunt": "1.6.1",
+		"grunt-banana-checker": "0.13.0",
+		"grunt-eslint": "24.3.0"
 	}
 }

src/ContributionScores.php

@@ -15,71 +15,155 @@ use MediaWiki\MediaWikiServices;
  * @author Tim Laqua <t.laqua@gmail.com>
  */
 class ContributionScores extends IncludableSpecialPage {
+	const CONTRIBUTIONSCORES_MAXINCLUDELIMIT = 50;
+
 	public function __construct() {
 		parent::__construct( 'ContributionScores' );
 	}
 
-	/// Generates a "Contribution Scores" table for a given LIMIT and date range
+	public static function onParserFirstCallInit( Parser $parser ) {
+		$parser->setFunctionHook( 'cscore', [ self::class, 'efContributionScoresRender' ] );
+	}
+
+	public static function efContributionScoresRender( $parser, $usertext, $metric = 'score' ) {
+		global $wgContribScoreDisableCache, $wgContribScoreUseRoughEditCount;
+
+		if ( $wgContribScoreDisableCache ) {
+			$parser->getOutput()->updateCacheExpiry( 0 );
+		}
+
+		$user = User::newFromName( $usertext );
+		$loadBalancer = MediaWikiServices::getInstance()->getDBLoadBalancer();
+		$dbr = $loadBalancer->getConnection( DB_REPLICA );
+
+		if ( $user instanceof User && $user->isRegistered() ) {
+			global $wgLang;
+			$revVar = $wgContribScoreUseRoughEditCount ? 'user_editcount' : 'COUNT(rev_id)';
+
+			$revWhere = ActorMigration::newMigration()->getWhere( $dbr, 'rev_user', $user );
+			if ( $metric == 'score' ) {
+				$row = $dbr->selectRow(
+					[ 'revision' ] + $revWhere['tables'],
+					[ 'wiki_rank' => "COUNT(DISTINCT rev_page)+SQRT($revVar-COUNT(DISTINCT rev_page))*2" ],
+					$revWhere['conds'],
+					__METHOD__,
+					[],
+					$revWhere['joins']
+				);
+				$output = $wgLang->formatNum( round( $row->wiki_rank, 0 ) );
+			} elseif ( $metric == 'changes' ) {
+				$row = $dbr->selectRow(
+					[ 'revision' ] + $revWhere['tables'],
+					[ 'rev_count' => $revVar ],
+					$revWhere['conds'],
+					__METHOD__,
+					[],
+					$revWhere['joins']
+				);
+				$output = $wgLang->formatNum( $row->rev_count );
+			} elseif ( $metric == 'pages' ) {
+				$row = $dbr->selectRow(
+					[ 'revision' ] + $revWhere['tables'],
+					[ 'page_count' => 'COUNT(DISTINCT rev_page)' ],
+					$revWhere['conds'],
+					__METHOD__,
+					[],
+					$revWhere['joins']
+				);
+				$output = $wgLang->formatNum( $row->page_count );
+			} else {
+				$output = wfMessage( 'contributionscores-invalidmetric' )->text();
+			}
+		} else {
+			$output = wfMessage( 'contributionscores-invalidusername' )->text();
+		}
+		return $parser->insertStripItem( $output, $parser->getStripState() );
+	}
 
 	/**
-	 * Function generates Contribution Scores tables in HTML format (not wikiText)
+	 * Function fetch Contribution Scores data from database
 	 *
 	 * @param int $days Days in the past to run report for
 	 * @param int $limit Maximum number of users to return (default 50)
-	 * @param string|null $title The title of the table
-	 * @param array $options array of options (default none; nosort/notools)
-	 * @return string Html Table representing the requested Contribution Scores.
+	 * @return array Data including the requested Contribution Scores.
 	 */
-	function genContributionScoreTable( $days, $limit, $title = null, $options = 'none' ) {
-		global $wgContribScoreIgnoreBots, $wgContribScoreIgnoreBlockedUsers, $wgContribScoresUseRealName;
+	public static function getContributionScoreData( $days, $limit ) {
+		global $wgContribScoreIgnoreBots, $wgContribScoreIgnoreBlockedUsers, $wgContribScoreIgnoreUsernames,
+			$wgContribScoreUseRoughEditCount;
 
-		$opts = explode( ',', strtolower( $options ) );
+		$loadBalancer = MediaWikiServices::getInstance()->getDBLoadBalancer();
+		$dbr = $loadBalancer->getConnection( DB_REPLICA );
 
-		$dbr = wfGetDB( DB_REPLICA );
-
-		$store = MediaWikiServices::getInstance()
-			->getRevisionStoreFactory()
-			->getRevisionStore();
-		$revQuery = $store->getQueryInfo();
+		$revQuery = ActorMigration::newMigration()->getJoin( 'rev_user' );
+		$revQuery['tables'] = array_merge( [ 'revision' ], $revQuery['tables'] );
 
 		$revUser = $revQuery['fields']['rev_user'];
+		$revUsername = $revQuery['fields']['rev_user_text'];
 
 		$sqlWhere = [];
 
 		if ( $days > 0 ) {
 			$date = time() - ( 60 * 60 * 24 * $days );
-			$dateString = $dbr->timestamp( $date );
-			$sqlWhere[] = "rev_timestamp > '$dateString'";
+			$sqlWhere[] = 'rev_timestamp > ' . $dbr->addQuotes( $dbr->timestamp( $date ) );
+		}
+
+		$sqlVars = [
+			'rev_user'   => $revUser,
+			'page_count' => 'COUNT(DISTINCT rev_page)'
+		];
+		if ( $wgContribScoreUseRoughEditCount ) {
+			$revQuery['tables'][] = 'user';
+			$revQuery['joins']['user'] = [ 'LEFT JOIN', [ "$revUser != 0", "user_id = $revUser" ] ];
+			$sqlVars['rev_count'] = 'user_editcount';
+		} else {
+			$sqlVars['rev_count'] = 'COUNT(rev_id)';
 		}
 
 		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 ) {
 			$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 ( count( $wgContribScoreIgnoreUsernames ) ) {
+			$listIgnoredUsernames = $dbr->makeList( $wgContribScoreIgnoreUsernames );
+			$sqlWhere[] = "{$revUsername} NOT IN ($listIgnoredUsernames)";
 		}
 
 		if ( $dbr->unionSupportsOrderAndLimit() ) {
 			$order = [
-				'GROUP BY' => $revUser,
+				'GROUP BY' => 'rev_user',
 				'ORDER BY' => 'page_count DESC',
 				'LIMIT' => $limit
 			];
 		} else {
-			$order = [ 'GROUP BY' => $revUser ];
+			$order = [ 'GROUP BY' => 'rev_user' ];
 		}
 
 		$sqlMostPages = $dbr->selectSQLText(
 			$revQuery['tables'],
-			[
-				'rev_user'   => $revUser,
-				'page_count' => 'COUNT(DISTINCT rev_page)',
-				'rev_count'  => 'COUNT(rev_id)',
-			],
+			$sqlVars,
 			$sqlWhere,
 			__METHOD__,
 			$order,
@@ -87,22 +171,12 @@ class ContributionScores extends IncludableSpecialPage {
 		);
 
 		if ( $dbr->unionSupportsOrderAndLimit() ) {
-			$order = [
-				'GROUP BY' => 'rev_user',
-				'ORDER BY' => 'rev_count DESC',
-				'LIMIT' => $limit
-			];
-		} else {
-			$order = [ 'GROUP BY' => 'rev_user' ];
+			$order['ORDER BY'] = 'rev_count DESC';
 		}
 
 		$sqlMostRevs = $dbr->selectSQLText(
 			$revQuery['tables'],
-			[
-				'rev_user' => $revUser,
-				'page_count' => 'COUNT(DISTINCT rev_page)',
-				'rev_count' => 'COUNT(rev_id)',
-			],
+			$sqlVars,
 			$sqlWhere,
 			__METHOD__,
 			$order,
@@ -127,7 +201,6 @@ class ContributionScores extends IncludableSpecialPage {
 			__METHOD__,
 			[
 				'ORDER BY' => 'wiki_rank DESC',
-				'GROUP BY' => 'user_name',
 				'LIMIT' => $limit,
 			],
 			[
@@ -137,6 +210,25 @@ class ContributionScores extends IncludableSpecialPage {
 				]
 			]
 		);
+		$ret = iterator_to_array( $res );
+		return $ret;
+	}
+
+	/// Generates a "Contribution Scores" table for a given LIMIT and date range
+
+	/**
+	 * Function generates Contribution Scores tables in HTML format (not wikiText)
+	 *
+	 * @param int $days Days in the past to run report for
+	 * @param int $limit Maximum number of users to return (default 50)
+	 * @param string|null $title The title of the table
+	 * @param array $options array of options (default none; nosort/notools)
+	 * @return string Html Table representing the requested Contribution Scores.
+	 */
+	function genContributionScoreTable( $days, $limit, $title = null, $options = 'none' ) {
+		global $wgContribScoresUseRealName, $wgContribScoreCacheTTL;
+
+		$opts = explode( ',', strtolower( $options ) );
 
 		$sortable = in_array( 'nosort', $opts ) ? '' : ' sortable';
 
@@ -148,11 +240,26 @@ class ContributionScores extends IncludableSpecialPage {
 			Html::element( 'th', [], $this->msg( 'contributionscores-changes' )->text() ) .
 			Html::element( 'th', [], $this->msg( 'contributionscores-username' )->text() );
 
+		$cache = MediaWikiServices::getInstance()->getMainWANObjectCache();
+		$data = $cache->getWithSetCallback(
+			$cache->makeKey( 'contributionscores', 'data-' . (string)$days ),
+			$wgContribScoreCacheTTL * 60,
+			function () use ( $days ) {
+				// Use max limit, as limit doesn't matter with performance.
+				// Avoid purge multiple times since limit on transclusion can be vary.
+				return self::getContributionScoreData( $days, self::CONTRIBUTIONSCORES_MAXINCLUDELIMIT );
+			} );
+
+		$lang = $this->getLanguage();
+
 		$altrow = '';
 		$user_rank = 1;
 
-		$lang = $this->getLanguage();
-		foreach ( $res as $row ) {
+		foreach ( $data as $row ) {
+			if ( $user_rank > $limit ) {
+				break;
+			}
+
 			// Use real name if option used and real name present.
 			if ( $wgContribScoresUseRealName && $row->user_real_name !== '' ) {
 				$userLink = Linker::userLink(
@@ -170,7 +277,7 @@ class ContributionScores extends IncludableSpecialPage {
 			$output .= Html::closeElement( 'tr' );
 			$output .= "<tr class='{$altrow}'>\n" .
 				"<td class='content' style='padding-right:10px;text-align:right;'>" .
-				$lang->formatNum( round( $user_rank, 0 ) ) .
+				$lang->formatNum( $user_rank ) .
 				"\n</td><td class='content' style='padding-right:10px;text-align:right;'>" .
 				$lang->formatNum( round( $row->wiki_rank, 0 ) ) .
 				"\n</td><td class='content' style='padding-right:10px;text-align:right;'>" .
@@ -198,8 +305,7 @@ class ContributionScores extends IncludableSpecialPage {
 		$output .= Html::closeElement( 'tr' );
 		$output .= Html::closeElement( 'table' );
 
-		$dbr->freeResult( $res );
-
+		// Transcluded on a normal wiki page.
 		if ( !empty( $title ) ) {
 			$output = Html::rawElement( 'table',
 				[
@@ -257,7 +363,7 @@ class ContributionScores extends IncludableSpecialPage {
 			}
 		}
 
-		if ( empty( $limit ) || $limit < 1 || $limit > CONTRIBUTIONSCORES_MAXINCLUDELIMIT ) {
+		if ( empty( $limit ) || $limit < 1 || $limit > self::CONTRIBUTIONSCORES_MAXINCLUDELIMIT ) {
 			$limit = 10;
 		}
 		if ( $days === null || $days < 0 ) {
@@ -300,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 {
@@ -316,6 +422,14 @@ class ContributionScores extends IncludableSpecialPage {
 		}
 	}
 
+	public function maxIncludeCacheTime() {
+		global $wgContribScoreDisableCache, $wgContribScoreCacheTTL;
+		return $wgContribScoreDisableCache ? 0 : $wgContribScoreCacheTTL;
+	}
+
+	/**
+	 * @inheritDoc
+	 */
 	protected function getGroupName() {
 		return 'wiki';
 	}