feat(search): ✨ search template namespace when template syntax {{}} i…

…s used
StarCitizenTools · Aug 26, 2023 · 2f2dc33 · 2f2dc33
1 parent 96f6361
commit 2f2dc33
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/resources/skins.citizen.search/searchQuery.js b/resources/skins.citizen.search/searchQuery.js
@@ -11,8 +11,11 @@ function searchQuery() {
 		checkValid: function ( s ) {
 			return s.length > 0;
 		},
-		removeCommand: function ( s ) {
-			this.setValue( this.value.replace( `/${s} `, '' ) );
+		replace: function ( pattern, s ) {
+			this.setValue( this.value.replace( pattern, s ) );
+		},
+		remove: function ( pattern ) {
+			this.replace( pattern, '' );
 		}
 	};
 }

diff --git a/resources/skins.citizen.search/typeahead.js b/resources/skins.citizen.search/typeahead.js
@@ -227,7 +227,7 @@ const typeahead = {
 				// Multi-search clients experiment
 				if ( searchClientData ) {
 					searchClient.setActive( searchClientData.id );
-					searchQuery.removeCommand( command );
+					searchQuery.remove( `/${command} ` );
 				}
 			}
 		}
@@ -237,7 +237,15 @@ const typeahead = {
 		if ( searchQuery.value === typeahead.input.element.value ) {
 			return Promise.reject( `Search query has not changed: ${searchQuery.value}.` );
 		}
+
 		searchQuery.setValue( typeahead.input.element.value );
+
+		// Template syntax should trigger template search
+		// TODO: Perhaps this should be integrated into the searchQuery module
+		if ( searchQuery.value.startsWith( '{{' ) ) {
+			searchQuery.replace( /{{(.[^}]*)}?}?/, 'Template:$1' );
+		}
+
 		return Promise.resolve( `Search query updated to ${searchQuery.value}.` );
 	},
 	afterSeachQueryInput: function () {