+ add more lang

src/bot-hooks.ts

@@ -23,6 +23,9 @@ bot.on('inline_query', async (query: InlineQuery) => {
         queryText.endsWith(eol + 'en') ||
         queryText.endsWith(eol + 'ua') ||
         queryText.endsWith(eol + 'uk') ||
+        queryText.endsWith(eol + 'es') ||
+        queryText.endsWith(eol + 'fr') ||
+        queryText.endsWith(eol + 'it') ||
         queryText.endsWith(eol + 'ru');
     let lang: string;
     let text: string;
@@ -31,20 +34,17 @@ bot.on('inline_query', async (query: InlineQuery) => {
         text = queryText.slice(0, length - 2);
     } else if (customQuery) {
         lang = queryText.slice(length - 2, length);
-        lang = lang === 'en' ? 'en-US' : lang;
         lang = lang === 'ua' || lang === 'ru' ? 'uk' : lang;
         text = queryText.slice(0, length - 4);
     } else {
         return;
     }
     let translated: string;
-    detectGoogle(text).then((reslt: string) => console.log(reslt));
+    const srcLang: string = await detectGoogle(text);
-    const srcLang: string = 'en';
-
     if (srcLang === 'uk' || lang === 'uk') {
         translated = await translateGoogle(text, lang);
     } else {
-        translated = await translateDeepL(text, lang);
+        translated = await translateDeepL(text, srcLang, lang);
     }
 
     const results: Array<TelegramBot.InlineQueryResult> = [

src/deepl-translate-adapter.ts

@@ -1,8 +1,10 @@
-import { Translator, TargetLanguageCode } from 'deepl-node';
+import { Translator} from 'deepl-node';
 
 const translator = new Translator(require('../keys.json').DEEPL);
 
-export async function translate(text: string, lang: TargetLanguageCode): Promise<string> {
+export async function translate(text: string, srcLang:any, targetLang: any): Promise<string> {
-    return translator.translateText(text, null, lang)
+    srcLang = srcLang === 'en' ? 'en-US' : srcLang;
+    targetLang = targetLang === 'en' ? 'en-US' : targetLang;
+    return translator.translateText(text, srcLang, targetLang)
         .then((textResult => textResult.text));
 }

src/google-translate-adapter.ts

@@ -4,8 +4,8 @@ const projectId = 'translate-reebot';
 const translator = new Translate({projectId});
 translator.key = require('../keys.json').GOOGLE;
 
-export async function translate(text: string, lang: string): Promise<string> {
+export async function translate(text: string, targetLang: string): Promise<string> {
-    return translator.translate(text, lang)
+    return translator.translate(text, targetLang)
         .then(([result] : any) => result);
 }