v0.5.1 Added limit to usedby query

Designburo · Designburo · commit 6f212c765a44 · 2024-02-01T19:52:24.000+01:00
diff --git a/README.md b/README.md
@@ -79,6 +79,7 @@ It takes two arguments :
 
 **type** ( Query type, **version**, **documentation** or **usedby** )
 
+**limit** ( only used with **usedby** )
 Example :
 ```wikitext
 {{#w8y:action=extension
diff --git a/extension.json b/extension.json
@@ -1,6 +1,6 @@
 {
 	"name": "WikiApiary",
-	"version": "0.5.0",
+	"version": "0.5.1",
 	"author": [
 		"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy Cicalese]"
 	],
diff --git a/includes/Scribunto/ScribuntoLuaLibrary.php b/includes/Scribunto/ScribuntoLuaLibrary.php
@@ -43,11 +43,17 @@ public function w8y( ?array $arguments ): array {
 			case "extension":
 				$eName = Utils::getOptionSetting( 'Extension name', true, $arguments );
 				$eType = Utils::getOptionSetting( 'type', true, $arguments );
+				$limit = Utils::getOptionSetting( 'limit', true, $arguments );
 				if ( $eName === null || $eType === null ) {
 					return [];
 				}
+				if ( $limit === null ) {
+					$limit = 10;
+				} else {
+					$limit = intval( trim( $limit ) );
+				}
 				$query = new Extensions();
-				$result = $query->doQuery( $eName, $eType, 'lua' );
+				$result = $query->doQuery( $eName, $eType, $limit, 'lua' );
 				return [ $this->convertToLuaTable( $result ) ];
 			case "wiki":
 				$id = Utils::getOptionSetting( 'id', true, $arguments );
@@ -65,6 +71,8 @@ public function w8y( ?array $arguments ): array {
 				$limit = Utils::getOptionSetting( 'limit', true, $arguments );
 				if ( $limit === null ) {
 					$limit = 10;
+				} else {
+					$limit = intval( trim( $limit ) );
 				}
 				$where = Utils::getOptionSetting( 'where', true, $arguments );
 				if ( $where === null ) {
diff --git a/includes/TagHooks.php b/includes/TagHooks.php
@@ -51,11 +51,17 @@ public function w8y( Parser &$parser ): mixed {
 			case "extension":
 				$eName = Utils::getOptionSetting( 'Extension name' );
 				$eType = Utils::getOptionSetting( 'type' );
+				$limit = Utils::getOptionSetting( 'limit' );
 				if ( $eName === null || $eType === null ) {
 					break;
 				}
+				if ( $limit === null ) {
+					$limit = 10;
+				} else {
+					$limit = intval( trim( $limit ) );
+				}
 				$extension = new Extensions();
-				$result = $extension->doQuery( $eName, $eType );
+				$result = $extension->doQuery( $eName, $eType, $limit );
 				break;
 			case "query":
 				$query = new Query();
diff --git a/includes/data/query/Extensions.php b/includes/data/query/Extensions.php
@@ -117,11 +117,12 @@ private function getExtensionDocumentation( string $extensionName, DBConnRef $db
 
 	/**
 	 * @param string $extensionName
+	 * @param int $limit
 	 * @param DBConnRef $dbr
 	 *
 	 * @return array
 	 */
-	private function getExtensionWiki( string $extensionName, DBConnRef $dbr ) {
+	private function getExtensionWiki( string $extensionName, int $limit, DBConnRef $dbr ) {
 		$select = [ Structure::WIKI_PAGEID ];
 		$from = Structure::DBTABLE_WIKIS;
 		$where = Structure::EXTENSION_NAME . ' LIKE "' . $extensionName . '"';
@@ -139,6 +140,7 @@ private function getExtensionWiki( string $extensionName, DBConnRef $dbr ) {
 			leftJoin( Structure::DBTABLE_EXTENSIONS_LINK, null, Structure::DBTABLE_SCRAPE . '.' . Structure::SCRAPE_VR_ID . '=' . Structure::DBTABLE_EXTENSIONS_LINK . '.' . Structure::EXTENSION_LINK_VID )->
 			leftJoin( Structure::DBTABLE_EXTENSIONS, null, Structure::DBTABLE_EXTENSIONS_LINK . '.' . Structure::EXTENSION_LINK_ID . '=' . Structure::DBTABLE_EXTENSIONS . '.' . Structure::EXTENSION_ID )->
 			where( $where )->
+			limit( $limit )->
 			caller( __METHOD__ )->
 			fetchResultSet();
 		} catch ( \Exception $e ) {
@@ -174,11 +176,12 @@ private function getPageTitleFromId( int $id ): string {
 	/**
 	 * @param string $extensionName
 	 * @param string $queryType
+	 * @param int $limit
 	 * @param string $export
 	 *
 	 * @return mixed
 	 */
-	public function doQuery( string $extensionName, string $queryType, string $export = "table" ): mixed {
+	public function doQuery( string $extensionName, string $queryType, int $limit, string $export = "table" ): mixed {
 		$lb = MediaWikiServices::getInstance()->getDBLoadBalancer();
 		$dbr = $lb->getConnectionRef( DB_REPLICA );
 		$result = [];
@@ -198,7 +201,7 @@ public function doQuery( string $extensionName, string $queryType, string $expor
 				];
 				break;
 			case "usedby":
-				$result = $this->getExtensionWiki( $extensionName, $dbr );
+				$result = $this->getExtensionWiki( $extensionName, $limit, $dbr );
 				$tables = [ Structure::w8yMessage( Structure::WIKI_PAGEID ),
 					Structure::w8yMessage( 'w8y_pageTitle' )
 				];

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "WikiApiary",`
`3`		`- "version": "0.5.0",`
	`3`	`+ "version": "0.5.1",`
`4`	`4`	`"author": [`
`5`	`5`	`"[https://www.mediawiki.org/wiki/User:Cindy.cicalese Cindy Cicalese]"`
`6`	`6`	`],`