mediawiki-projects-list 2.1.0 → 2.2.0

package/index.d.ts

@@ -47,6 +47,8 @@ declare module 'mediawiki-projects-list' {
 		articlePath: string;
 		/** Script path of the proxy */
 		scriptPath: string;
+		/** Regex to remove from the relative url */
+		relativeFix: string;
 		/** Note about the specific proxy */
 		note: string | null;
 	};

package/index.js

@@ -29,6 +29,7 @@ const PROJECTS = require('./projects.json');
  * @property {string} namePath - Name path of the proxy
  * @property {string} articlePath - Article path of the proxy
  * @property {string} scriptPath - Script path of the proxy
+ * @property {?string} relativeFix - Regex to remove from the relative url
  * @property {?string} note - Note about the specific proxy
  */
 
@@ -71,6 +72,7 @@ const wikiProjects = PROJECTS.wikiProjects.map( wikiProject => {
  * @type {FrontendProxy[]}
  */
 const frontendProxies = PROJECTS.frontendProxies.map( frontendProxy => {
+	frontendProxy.relativeFix ??= frontendProxySchema.relativeFix.default;
 	frontendProxy.note ??= frontendProxySchema.note.default;
 	return frontendProxy;
 } );
@@ -192,8 +194,19 @@ function urlToFix(url) {
 	let frontendProxy = frontendProxies.find( frontendProxy => hostname.endsWith( frontendProxy.name ) );
 	if ( frontendProxy ) {
 		let splitLength = frontendProxy.namePath.split('/').length;
-		let querykeys = frontendProxy.namePath.split('?').slice(1).join('?').split('&').flatMap( query => query.split('=', 1) );
-		if ( splitLength > 4 && querykeys.length ) {
+		let querykeys = frontendProxy.namePath.split('?').slice(1).join('?').split('&').flatMap( query => {
+			if ( !query ) return [];
+			return query.split('=', 1);
+		} );
+		if ( splitLength > 4 && querykeys.length && frontendProxy.relativeFix ) {
+			result = (href, pagelink) => {
+				let prepend = '/' + pagelink.split('/', splitLength).slice(3, -1).join('/');
+				let querystring = pagelink.split('?').slice(1).join('?').split('&').filter( query => querykeys.includes( query.split('=', 1)[0] ) );
+				let append = ( href.includes('?') ? '&' : '?' ) + querystring.join('&');
+				return prepend + href.replace( new RegExp( frontendProxy.relativeFix ), '' ) + append;
+			};
+		}
+		else if ( splitLength > 4 && querykeys.length ) {
 			result = (href, pagelink) => {
 				let prepend = '/' + pagelink.split('/', splitLength).slice(3, -1).join('/');
 				let querystring = pagelink.split('?').slice(1).join('?').split('&').filter( query => querykeys.includes( query.split('=', 1)[0] ) );
@@ -201,15 +214,30 @@ function urlToFix(url) {
 				return prepend + href + append;
 			};
 		}
+		else if ( splitLength > 4 && frontendProxy.relativeFix ) {
+			result = (href, pagelink) => {
+				let prepend = '/' + pagelink.split('/', splitLength).slice(3, -1).join('/');
+				return prepend + href.replace( new RegExp( frontendProxy.relativeFix ), '' );
+			}
+		}
 		else if ( splitLength > 4 ) {
 			result = (href, pagelink) => '/' + pagelink.split('/', splitLength).slice(3, -1).join('/') + href;
 		}
+		else if ( querykeys.length && frontendProxy.relativeFix ) {
+			result = (href, pagelink) => {
+				let querystring = pagelink.split('?').slice(1).join('?').split('&').filter( query => querykeys.includes( query.split('=', 1)[0] ) );
+				return href.replace( new RegExp( frontendProxy.relativeFix ), '' ) + ( href.includes('?') ? '&' : '?' ) + querystring.join('&');
+			}
+		}
 		else if ( querykeys.length ) {
 			result = (href, pagelink) => {
 				let querystring = pagelink.split('?').slice(1).join('?').split('&').filter( query => querykeys.includes( query.split('=', 1)[0] ) );
 				return href + ( href.includes('?') ? '&' : '?' ) + querystring.join('&');
 			}
 		}
+		else if ( frontendProxy.relativeFix ) {
+			result = (href, pagelink) => href.replace( new RegExp( frontendProxy.relativeFix ), '' );
+		}
 	}
 	functionCache.urlToFix.set(hostname, result);
 	return result;

package/package.json

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

package/projects-schema.json

@@ -36,6 +36,11 @@
 						"type": "string",
 						"description": "Script path of the proxy"
 					},
+					"relativeFix": {
+						"type": "string",
+						"description": "Regex to remove from the relative url",
+						"default": null
+					},
 					"note": {
 						"type": "string",
 						"description": "Note about the specific proxy",

package/projects.json

@@ -3,11 +3,19 @@
 	"frontendProxies": [
 		{
 			"name": "wikiless.org",
-			"regex": "wikiless\\.org/.*?\\?(?:.*?&)?lang=([a-z\\d-]{1,50})(?:&|$)",
+			"regex": "wikiless\\.org/.*?\\?(?:.*?&)?lang=([a-z\\d-]{1,50})(?:&|/?$)",
 			"namePath": "https://wikiless.org/?lang=$1",
 			"articlePath": "https://wikiless.org/wiki/?lang=$1",
 			"scriptPath": "https://$1.wikipedia.org/w/"
 		},
+		{
+			"name": "wikiwand.com",
+			"regex": "(?:www\\.)?wikiwand\\.com/([a-z\\d-]{1,50})/?",
+			"namePath": "https://www.wikiwand.com/$1/",
+			"articlePath": "https://www.wikiwand.com/$1/",
+			"scriptPath": "https://$1.wikipedia.org/w/",
+			"relativeFix": "^/wiki(?=/)"
+		},
 		{
 			"name": ".breezewiki.com",
 			"regex": "([a-z\\d-]{1,50})\\.breezewiki\\.com(?:/wiki/|/?$)",