Merge pull request #44 from sysnapse/master

extend timeout seconds of voice genshin; add backup longtu url

Author: eric2788

aivoice/genshin_voice.go

@@ -5,6 +5,7 @@ import (
 	"io"
 	"net/http"
 	"net/url"
+	"strings"
 	"time"
 )
 
@@ -70,20 +71,24 @@ const (
 	VoiceAPI = "https://genshin.azurewebsites.net/api/speak?format=wav&text=%s&id=%d"
 )
 
-var client = &http.Client{Timeout: time.Second * 30}
+var client = &http.Client{Timeout: time.Second * 300}
 
 func GetGenshinVoice(msg, actor string) ([]byte, error) {
 	if id, ok := actors[actor]; !ok {
 		return nil, fmt.Errorf("未知的角色: %s", actor)
 	} else {
-		req, err := http.NewRequest(http.MethodGet, fmt.Sprintf(VoiceAPI, url.QueryEscape(msg), id), nil)
+		api := fmt.Sprintf(VoiceAPI, url.QueryEscape(msg), id)
+		req, err := http.NewRequest(http.MethodGet, api, nil)
 		if err != nil {
 			return nil, fmt.Errorf("http_error: %v", err)
 		}
 		req.Header.Set("User-Agent", "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.124 Safari/537.36")
 		res, err := client.Do(req)
 		if err != nil {
-			return nil, fmt.Errorf("http_error: %v", err)
+			if strings.Contains(err.Error(), "context deadline exceeded") {
+				return nil, fmt.Errorf("http_error: %s", "API请求逾时")
+			}
+			return nil, fmt.Errorf("http_error: %v", err.Error())
 		}
 		defer res.Body.Close()
 		if res.StatusCode != 200 {

cmd/cmd_test.go

@@ -0,0 +1,20 @@
+package cmd
+
+import (
+	"fmt"
+	"math/rand"
+	"testing"
+	"time"
+)
+
+func TestLongTu(t *testing.T) {
+	backup := "https://phqghume.github.io/img/"
+	rand.Seed(time.Now().UnixMicro())
+	random := rand.Intn(58) + 1
+	ext := ".jpg"
+	if random > 48 {
+		ext = ".gif"
+	}
+	imgLink := fmt.Sprintf("%slong%%20(%d)%s", backup, random, ext)
+	t.Log(imgLink)
+}

cmd/random.go

@@ -36,7 +36,19 @@ func randomLong(args []string, source *command.MessageSource) error {
 	msg := qq.CreateReply(source.Message)
 	img, err := qq.NewImageByUrl("http://106.13.17.214:23856/dragon")
 	if err != nil {
-		return err
+		logger.Errorf("尝试获取随机龙图时出现错误: %v, 将使用备份图片", err)
+		backup := "https://phqghume.github.io/img/"
+		rand.Seed(time.Now().UnixMicro())
+		random := rand.Intn(58) + 1
+		ext := ".jpg"
+		if random > 48 {
+			ext = ".gif"
+		}
+		imgLink := fmt.Sprintf("%slong%%20(%d)%s", backup, random, ext)
+		img, err = qq.NewImageByUrl(imgLink)
+		if err != nil {
+			return err
+		}
 	}
 	msg.Append(img)
 	return qq.SendGroupMessage(msg)

cmd/voice.go

@@ -37,6 +37,10 @@ func voiceQQ(args []string, source *command.MessageSource) error {
 
 func voiceGenshin(args []string, source *command.MessageSource) error {
 	actor, content := args[0], strings.Join(args[1:], "，")
+
+	reply := qq.CreateReply(source.Message).Append(qq.NewTextf("正在尝试生成 %s 的语音...", actor))
+	_ = qq.SendGroupMessage(reply)
+
 	data, err := aivoice.GetGenshinVoice(content, actor)
 	if err != nil {
 		return err