mediawiki-projects-list 2.3.3 → 2.3.5

package/index.js

@@ -100,19 +100,21 @@ function inputToWikiProject(input) {
 		let scriptPath = ( wikiProject.regexPaths ? '/' : wikiProject.scriptPath ).replace(/[.*+?^${}()|\[\]\\]/g, '\\$&');
 		let regex = input.match( new RegExp( wikiProject.regex + `(?:${articlePath}|${scriptPath}|/?$)` ) );
 		if ( regex ) {
+			scriptPath = wikiProject.scriptPath;
+			articlePath = wikiProject.articlePath;
 			if ( wikiProject.regexPaths ) {
-				scriptPath = wikiProject.scriptPath.replace( /\$(\d)/g, (match, n) => regex[n] );
-				articlePath = wikiProject.articlePath.replace( /\$(\d)/g, (match, n) => regex[n] );
+				scriptPath = scriptPath.replace( /\$(\d)/g, (match, n) => regex[n] );
+				articlePath = articlePath.replace( /\$(\d)/g, (match, n) => regex[n] );
 			}
+			if ( articlePath.includes('?') && !articlePath.endsWith('=') ) {
+				articlePath = articlePath.replace( '?', '$1?' );
+			}
+			else articlePath += '$1';
 			result = {
 				fullArticlePath: 'https://' + regex[1] + articlePath,
 				fullScriptPath: 'https://' + regex[1] + scriptPath,
 				wikiProject: wikiProject
 			};
-			if ( result.fullArticlePath.includes('?') && !result.fullArticlePath.endsWith('=') ) {
-				result.fullArticlePath = result.fullArticlePath.replace( '?', '$1?' );
-			}
-			else result.fullArticlePath += '$1';
 		}
 	}
 	functionCache.inputToWikiProject.set(input, result);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mediawiki-projects-list",
-  "version": "2.3.3",
+  "version": "2.3.5",
   "type": "commonjs",
   "description": "List of MediaWiki projects for use in discord-wiki-bot",
   "main": "index.js",

package/projects.json

@@ -393,6 +393,13 @@
 				]
 			}
 		},
+		{
+			"name": "fallout.wiki",
+			"regex": "(fallout\\.wiki)",
+			"articlePath": "/wiki/",
+			"scriptPath": "/",
+			"fullScriptPath": "https://fallout.wiki/"
+		},
 		{
 			"name": "fallout-wiki.com",
 			"regex": "((?:www\\.)?fallout-wiki\\.com)",
@@ -1257,13 +1264,6 @@
 			"scriptPath": "/",
 			"fullScriptPath": "https://wiki.halo.fr/"
 		},
-		{
-			"name": "glitchtale.com",
-			"regex": "((?:www\\.)?glitchtale\\.com)",
-			"articlePath": "/wiki/index.php/",
-			"scriptPath": "/wiki/",
-			"fullScriptPath": "https://glitchtale.com/wiki/"
-		},
 		{
 			"name": "wiki.therofl98.co",
 			"regex": "(wiki\\.therofl98\\.co)",