Add 'to' keyword support for currency conversions (oliverschwendener#615

) * Add 'to' keyword support for currency conversions * Fix whitespace in currency conversions
wangerry · Feb 14, 2021 · c104ecb · c104ecb
1 parent 689d8b7
commit c104ecb
Showing 1 changed file with 4 additions and 3 deletions.
diff --git a/src/main/plugins/currency-converter-plugin/currency-converter-plugin.ts b/src/main/plugins/currency-converter-plugin/currency-converter-plugin.ts
@@ -25,12 +25,13 @@ export class CurrencyConverterPlugin implements ExecutionPlugin {
     }
 
     public isValidUserInput(userInput: string, fallback?: boolean | undefined): boolean {
+        const keywords = ["in", "to"];
         const words = userInput.trim().split(" ");
         if (words.length === 4) {
             try {
-                return !isNaN(this.getNumber(words[0]))
+                return keywords.includes(words[2].toLowerCase())
+                    && !isNaN(this.getNumber(words[0]))
                     && this.isCurrencyCode(words[1])
-                    && words[2] === "in"
                     && this.isCurrencyCode(words[3]);
             } catch (err) {
                 return false;
@@ -99,7 +100,7 @@ export class CurrencyConverterPlugin implements ExecutionPlugin {
     }
 
     private buildCurrencyConversion(userInput: string): CurrencyConversion {
-        const words = userInput.split(" ");
+        const words = userInput.trim().split(" ");
         return {
             base: Object.values(CurrencyCode).find((c: CurrencyCode) => c.toLowerCase() === words[1].toLowerCase()) || CurrencyCode.EUR,
             target: Object.values(CurrencyCode).find((c: CurrencyCode) => c.toLowerCase() === words[3].toLowerCase()) || CurrencyCode.USD,