diff --git a/message/image.go b/message/image.go index bdc0321..848a151 100644 --- a/message/image.go +++ b/message/image.go @@ -3,7 +3,6 @@ package message import ( "encoding/json" "fmt" - "log" "net/url" "regexp" "strings" @@ -49,7 +48,7 @@ func (msg *ImageMessage) ToCQString() string { return "" } // URL 转义 - escapedURL := url.QueryEscape(msg.Data.URL) + escapedURL, _ := url.QueryUnescape(msg.Data.URL) escapedURL = strings.ReplaceAll(escapedURL, ",", ",") escapedURL = strings.ReplaceAll(escapedURL, "[", "[") @@ -64,7 +63,6 @@ func (msg *ImageMessage) ToCQString() string { } func (msg *ImageMessage) ParseMessage(data string) error { - log.Println("ParseMessage", data) // 使用正则表达式提取各个字段 re := regexp.MustCompile(`\[CQ:image,(.*?)\]`) matches := re.FindStringSubmatch(data) @@ -81,7 +79,7 @@ func (msg *ImageMessage) ParseMessage(data string) error { } msg.Data.URL = attrs["url"] - msg.Data.URL = url.QueryEscape(msg.Data.URL) + msg.Data.URL, _ = url.QueryUnescape(msg.Data.URL) msg.Data.URL = strings.ReplaceAll(msg.Data.URL, ",", ",") msg.Data.URL = strings.ReplaceAll(msg.Data.URL, "[", "[") msg.Data.URL = strings.ReplaceAll(msg.Data.URL, "]", "]") diff --git a/service/xibao/image_gen.go b/service/xibao/image_gen.go index fba76a0..0f8d773 100644 --- a/service/xibao/image_gen.go +++ b/service/xibao/image_gen.go @@ -94,13 +94,13 @@ func GenerateCongratulationImage(text string, inputFile, outputFile string, isGo // } fontBytes, err := os.ReadFile("./resource/emoji.ttf") if err != nil { - log.Print("failed to load font: %v", err) + log.Printf("failed to load font: %v", err) } // 解析字体 font, err := opentype.Parse(fontBytes) if err != nil { - log.Print("failed to parse font: %v", err) + log.Printf("failed to parse font: %v", err) } // 设置字体大小和 DPI @@ -114,7 +114,7 @@ func GenerateCongratulationImage(text string, inputFile, outputFile string, isGo Hinting: 0, }) if err != nil { - log.Print("failed to create font face: %v", err) + log.Printf("failed to create font face: %v", err) return } @@ -154,7 +154,6 @@ func GenerateCongratulationImage(text string, inputFile, outputFile string, isGo } func isImageCQ(text string) (string, bool) { - log.Println("isImageCQ ", text) imgMsg := message.ImageMessage{} if err := imgMsg.ParseMessage(text); err == nil { return imgMsg.Data.URL, true diff --git a/util/url.go b/util/url.go index a8b35d0..4ddb502 100644 --- a/util/url.go +++ b/util/url.go @@ -65,11 +65,6 @@ func normalizeURL(rawURL string) string { // DownloadFile 下载文件到指定目录,返回带有正确扩展名的完整文件路径 func DownloadFile(url string, dirPath string) (filepath string, err error) { - - url = strings.ReplaceAll(url, ",", ",") - url = strings.ReplaceAll(url, "[", "[") - url = strings.ReplaceAll(url, "]", "]") - url = strings.ReplaceAll(url, "&", "&") // 发送 HTTP GET 请求 var resp *http.Response var maxRetry = 100