style: Declare string only once in Translate & PlayTTS

eeeXun · Feb 12, 2023 · 0239561 · 0239561
1 parent 3480526
commit 0239561
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 18 deletions.
diff --git a/internal/translate/argostranslate/translator.go b/internal/translate/argostranslate/translator.go
@@ -50,11 +50,7 @@ func (t *ArgosTranslate) SwapLang() {
 	t.srcLang, t.dstLang = t.dstLang, t.srcLang
 }
 
-func (t *ArgosTranslate) Translate(message string) (
-	translation string,
-	definition string,
-	partOfSpeech string,
-	err error) {
+func (t *ArgosTranslate) Translate(message string) (translation, definition, partOfSpeech string, err error) {
 	var data interface{}
 
 	res, err := http.PostForm(textURL,

diff --git a/internal/translate/argostranslate/tts.go b/internal/translate/argostranslate/tts.go
@@ -16,7 +16,7 @@ func (t *ArgosTranslate) StopTTS() {
 	t.SoundLock.Stop = true
 }
 
-func (t *ArgosTranslate) PlayTTS(lang string, message string) error {
+func (t *ArgosTranslate) PlayTTS(lang, message string) error {
 	t.SoundLock.Release()
 	return errors.New(t.EngineName + " does not support text to speech")
 }
diff --git a/internal/translate/googletranslate/translator.go b/internal/translate/googletranslate/translator.go
@@ -50,11 +50,7 @@ func (t *GoogleTranslate) SwapLang() {
 	t.srcLang, t.dstLang = t.dstLang, t.srcLang
 }
 
-func (t *GoogleTranslate) Translate(message string) (
-	translation string,
-	definition string,
-	partOfSpeech string,
-	err error) {
+func (t *GoogleTranslate) Translate(message string) (translation, definition, partOfSpeech string, err error) {
 	var data []interface{}
 
 	urlStr := fmt.Sprintf(

diff --git a/internal/translate/googletranslate/tts.go b/internal/translate/googletranslate/tts.go
@@ -26,7 +26,7 @@ func (t *GoogleTranslate) StopTTS() {
 	t.SoundLock.Stop = true
 }
 
-func (t *GoogleTranslate) PlayTTS(lang string, message string) error {
+func (t *GoogleTranslate) PlayTTS(lang, message string) error {
 	urlStr := fmt.Sprintf(
 		ttsURL,
 		url.QueryEscape(message),

diff --git a/internal/translate/translator.go b/internal/translate/translator.go
@@ -20,16 +20,12 @@ type Translator interface {
 	SetSrcLang(srcLang string)
 	SetDstLang(dstLang string)
 	SwapLang()
-	Translate(message string) (
-		translation string,
-		definition string,
-		partOfSpeech string,
-		err error)
+	Translate(message string) (translation, definition, partOfSpeech string, err error)
 	// text to speech
 	LockAvailable() bool
 	LockAcquire()
 	StopTTS()
-	PlayTTS(lang string, message string) error
+	PlayTTS(lang, message string) error
 }
 
 func NewTranslator(name string) Translator {