.github/workflows/ci.yaml

@@ -15,7 +15,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v4
         with:
-          go-version: '1.23.5'
+          go-version: '1.23.4'
 
       - name: Install golint
         run: go install golang.org/x/lint/golint@latest

.github/workflows/release.yaml

@@ -15,7 +15,7 @@ jobs:
 
       - uses: actions/setup-go@v4
         with:
-          go-version: "1.23.5"
+          go-version: "1.23.4"
 
       - run: bash .cross_compile.sh
 

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.23.5 AS builder
+FROM golang:1.23.4 AS builder
 WORKDIR /go/src/github.com/OwO-Network/DeepLX
 COPY . .
 RUN go get -d -v ./

go.mod

@@ -1,6 +1,6 @@
 module github.com/OwO-Network/DeepLX
 
-go 1.23.5
+go 1.23.4
 
 require (
 	github.com/abadojack/whatlanggo v1.0.1
@@ -48,7 +48,7 @@ require (
 	golang.org/x/crypto v0.31.0 // indirect
 	golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 // indirect
 	golang.org/x/mod v0.21.0 // indirect
-	golang.org/x/net v0.33.0 // indirect
+	golang.org/x/net v0.29.0 // indirect
 	golang.org/x/sync v0.10.0 // indirect
 	golang.org/x/sys v0.28.0 // indirect
 	golang.org/x/text v0.21.0 // indirect

go.sum

@@ -122,8 +122,8 @@ golang.org/x/exp v0.0.0-20240909161429-701f63a606c0 h1:e66Fs6Z+fZTbFBAxKfP3PALWB
 golang.org/x/exp v0.0.0-20240909161429-701f63a606c0/go.mod h1:2TbTHSBQa924w8M6Xs1QcRcFwyucIwBGpK1p2f1YFFY=
 golang.org/x/mod v0.21.0 h1:vvrHzRwRfVKSiLrG+d4FMl/Qi4ukBCE6kZlTUkDYRT0=
 golang.org/x/mod v0.21.0/go.mod h1:6SkKJ3Xj0I0BrPOZoBy3bdMptDDU9oJrpohJ3eWZ1fY=
-golang.org/x/net v0.33.0 h1:74SYHlV8BIgHIFC/LrYkOGIwL19eTYXQ5wc6TBuO36I=
+golang.org/x/net v0.29.0 h1:5ORfpBpCs4HzDYoodCDBbwHzdR5UrLBZ3sOnUJmFoHo=
-golang.org/x/net v0.33.0/go.mod h1:HXLR5J+9DxmrqMwG9qjGCxZ+zKXxBru04zlTvWlWuN4=
+golang.org/x/net v0.29.0/go.mod h1:gLkgy8jTGERgjzMic6DS9+SP0ajcu6Xu3Orq/SpETg0=
 golang.org/x/sync v0.10.0 h1:3NQrjDixjgGwUOCaF8w2+VYHv0Ve/vGYSbdkTa98gmQ=
 golang.org/x/sync v0.10.0/go.mod h1:Czt+wKu1gCyEFDUtn0jG5QVvpJ6rzVqr5aXyt9drQfk=
 golang.org/x/sys v0.5.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=

translate/translate.go

@@ -2,7 +2,7 @@
  * @Author: Vincent Young
  * @Date: 2024-09-16 11:59:24
  * @LastEditors: Vincent Yang
- * @LastEditTime: 2025-01-20 17:09:59
+ * @LastEditTime: 2024-12-03 11:23:23
  * @FilePath: /DeepLX/translate/translate.go
  * @Telegram: https://t.me/missuo
  * @GitHub: https://github.com/missuo
@@ -126,20 +126,8 @@ func TranslateByDeepLX(sourceLang, targetLang, text string, tagHandling string,
 		}, nil
 	}
 
-	// Split text by newlines and store them for later reconstruction
-	textParts := strings.Split(text, "\n")
-	var translatedParts []string
-	var allAlternatives [][]string // Store alternatives for each part
-
-	for _, part := range textParts {
-		if strings.TrimSpace(part) == "" {
-			translatedParts = append(translatedParts, "")
-			allAlternatives = append(allAlternatives, []string{""})
-			continue
-		}
-
 	// Split text first
-		splitResult, err := splitText(part, tagHandling == "html" || tagHandling == "xml", proxyURL, dlSession)
+	splitResult, err := splitText(text, tagHandling == "html" || tagHandling == "xml", proxyURL, dlSession)
 	if err != nil {
 		return DeepLXTranslationResult{
 			Code:    http.StatusServiceUnavailable,
@@ -149,7 +137,7 @@ func TranslateByDeepLX(sourceLang, targetLang, text string, tagHandling string,
 
 	// Get detected language if source language is auto
 	if sourceLang == "auto" || sourceLang == "" {
-			sourceLang = strings.ToUpper(whatlanggo.DetectLang(part).Iso6391())
+		sourceLang = strings.ToUpper(whatlanggo.DetectLang(text).Iso6391())
 	}
 
 	// Prepare jobs from split result
@@ -206,7 +194,7 @@ func TranslateByDeepLX(sourceLang, targetLang, text string, tagHandling string,
 			},
 			Jobs:      jobs,
 			Priority:  1,
-				Timestamp: getTimeStamp(getICount(part)),
+			Timestamp: getTimeStamp(getICount(text)),
 		},
 	}
 
@@ -226,7 +214,7 @@ func TranslateByDeepLX(sourceLang, targetLang, text string, tagHandling string,
 				},
 				Jobs:      jobs,
 				Priority:  1,
-					Timestamp: getTimeStamp(getICount(part)),
+				Timestamp: getTimeStamp(getICount(text)),
 			},
 		}
 	}
@@ -241,76 +229,45 @@ func TranslateByDeepLX(sourceLang, targetLang, text string, tagHandling string,
 	}
 
 	// Process translation results
-		var partTranslation string
+	var alternatives []string
-		var partAlternatives []string
+	var translatedText string
 
 	translations := result.Get("result.translations").Array()
 	if len(translations) > 0 {
-			// Process main translation
+		// Get alternatives
-			for _, translation := range translations {
-				partTranslation += translation.Get("beams.0.sentences.0.text").String() + " "
-			}
-			partTranslation = strings.TrimSpace(partTranslation)
-
-			// Process alternatives
 		numBeams := len(translations[0].Get("beams").Array())
-			for i := 1; i < numBeams; i++ { // Start from 1 since 0 is the main translation
+		for i := 0; i < numBeams; i++ {
 			var altText string
 			for _, translation := range translations {
 				beams := translation.Get("beams").Array()
 				if i < len(beams) {
-						altText += beams[i].Get("sentences.0.text").String() + " "
+					altText += beams[i].Get("sentences.0.text").String()
 				}
 			}
 			if altText != "" {
-					partAlternatives = append(partAlternatives, strings.TrimSpace(altText))
+				alternatives = append(alternatives, altText)
-				}
 			}
 		}
 
-		if partTranslation == "" {
+		// Get main translation
+		for _, translation := range translations {
+			translatedText += translation.Get("beams.0.sentences.0.text").String() + " "
+		}
+		translatedText = strings.TrimSpace(translatedText)
+	}
+
+	if translatedText == "" {
 		return DeepLXTranslationResult{
 			Code:    http.StatusServiceUnavailable,
 			Message: "Translation failed",
 		}, nil
 	}
 
-		translatedParts = append(translatedParts, partTranslation)
-		allAlternatives = append(allAlternatives, partAlternatives)
-	}
-
-	// Join all translated parts with newlines
-	translatedText := strings.Join(translatedParts, "\n")
-
-	// Combine alternatives with proper newline handling
-	var combinedAlternatives []string
-	maxAlts := 0
-	for _, alts := range allAlternatives {
-		if len(alts) > maxAlts {
-			maxAlts = len(alts)
-		}
-	}
-
-	// Create combined alternatives preserving line structure
-	for i := 0; i < maxAlts; i++ {
-		var altParts []string
-		for j, alts := range allAlternatives {
-			if i < len(alts) {
-				altParts = append(altParts, alts[i])
-			} else if len(translatedParts[j]) == 0 {
-				altParts = append(altParts, "") // Keep empty lines
-			} else {
-				altParts = append(altParts, translatedParts[j]) // Use main translation if no alternative
-			}
-		}
-		combinedAlternatives = append(combinedAlternatives, strings.Join(altParts, "\n"))
-	}
-
 	return DeepLXTranslationResult{
 		Code:         http.StatusOK,
-		ID:           getRandomNumber(), // Using new ID for the complete translation
+		ID:           id,
 		Data:         translatedText,
-		Alternatives: combinedAlternatives,
+		Alternatives: alternatives,
 		SourceLang:   sourceLang,
 		TargetLang:   targetLang,
 		Method:       map[bool]string{true: "Pro", false: "Free"}[dlSession != ""],