Improvement: Allow translate commands w/o feature on (#1141)

1 files changed, 8 insertions, 20 deletions

diff --git a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt b/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt
index 01d893467..54e724dd9 100644
--- a/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt
+++ b/src/main/java/at/hannibal2/skyhanni/features/chat/Translator.kt
@@ -43,7 +43,7 @@ class Translator {
         style.setChatClickEvent(
             ClickEvent(
                 ClickEvent.Action.RUN_COMMAND,
-                "/shsendtranslation ${messageContentRegex.find(message)!!.groupValues[1]}"
+                "/shtranslate ${messageContentRegex.find(message)!!.groupValues[1]}"
             )
         )
         style.setChatHoverEvent(
@@ -82,10 +82,8 @@ class Translator {
 
         private fun getTranslationToEnglish(message: String): String {
             val url =
-                "https://translate.googleapis.com/translate_a/single?client=gtx&sl=auto&tl=en&dt=t&q=" + URLEncoder.encode(
-                    message,
-                    "UTF-8"
-                )
+                "https://translate.googleapis.com/translate_a/single?client=gtx&sl=auto&tl=en&dt=t&q=" +
+                    URLEncoder.encode(message, "UTF-8")
 
             var messageToSend = ""
             val layer1 = getJSONResponse(url).asJsonArray
@@ -114,10 +112,8 @@ class Translator {
 
         private fun getTranslationFromEnglish(message: String, lang: String): String {
             val url =
-                "https://translate.googleapis.com/translate_a/single?client=gtx&sl=en&tl=$lang&dt=t&q=" + URLEncoder.encode(
-                    message,
-                    "UTF-8"
-                )
+                "https://translate.googleapis.com/translate_a/single?client=gtx&sl=en&tl=$lang&dt=t&q=" +
+                    URLEncoder.encode(message, "UTF-8")
 
             val layer1 = getJSONResponse(url).asJsonArray
             if (layer1.size() < 1) return "Error!"
@@ -137,11 +133,7 @@ class Translator {
         }
 
         fun toEnglish(args: Array<String>) {
-            if (!isEnabled()) return
-            var message = ""
-            for (i in args) {
-                message = "$message$i "
-            }
+            val message = args.joinToString(" ")
 
             coroutineScope.launch {
                 val translation = getTranslationToEnglish(message)
@@ -151,20 +143,16 @@ class Translator {
         }
 
         fun fromEnglish(args: Array<String>) {
-            if (!isEnabled()) return
             if (args.size < 2 || args[0].length != 2) { // args[0] is the language code
                 ChatUtils.userError("Usage: /shcopytranslation <two letter language code (at the end of a translation)> <message>")
                 return
             }
             val language = args[0]
-            var message = ""
-            for (i in 1..<args.size) {
-                message = "$message${args[i]} "
-            }
+            val message = args.drop(1).joinToString(" ")
 
             coroutineScope.launch {
                 val translation = getTranslationFromEnglish(message, language)
-                ChatUtils.chat("Copied translation to clipboard: $translation")
+                ChatUtils.chat("Copied translation to clipboard: §f$translation")
                 OSUtils.copyToClipboard(translation)
             }
         }