fix local image

Author: lz1998

service/bot/api_handler.go

@@ -41,8 +41,8 @@ func splitText(content string, limit int) []string {
 func preProcessPrivateSendingMessage(cli *client.QQClient, target int64, m *message.SendingMessage) {
 	newElements := make([]message.IMessageElement, 0, len(m.Elements))
 	for _, element := range m.Elements {
-		if i, ok := element.(*message.ImageElement); ok {
-			gm, err := cli.UploadPrivateImage(target, bytes.NewReader(i.Data))
+		if i, ok := element.(*clz.LocalImageElement); ok {
+			gm, err := cli.UploadPrivateImage(target, i.Stream)
 			if err != nil {
 				log.Errorf("failed to upload private image, %+v", err)
 				continue
@@ -76,8 +76,8 @@ func preProcessGroupSendingMessage(cli *client.QQClient, groupCode int64, m *mes
 			}
 			continue
 		}
-		if i, ok := element.(*message.ImageElement); ok {
-			gm, err := cli.UploadGroupImage(groupCode, bytes.NewReader(i.Data))
+		if i, ok := element.(*clz.LocalImageElement); ok {
+			gm, err := cli.UploadGroupImage(groupCode, i.Stream)
 			if err != nil {
 				log.Errorf("failed to upload group image, %+v", err)
 				continue

service/bot/proto2mirai.go

@@ -82,6 +82,7 @@ func ProtoTextToMiraiText(data map[string]string) message.IMessageElement {
 }
 
 func ProtoImageToMiraiImage(data map[string]string) message.IMessageElement {
+	elem := &clz.LocalImageElement{}
 	url, ok := data["url"]
 	if !ok {
 		url, ok = data["src"] // TODO 为了兼容我的旧代码偷偷加的
@@ -93,20 +94,23 @@ func ProtoImageToMiraiImage(data map[string]string) message.IMessageElement {
 		log.Warnf("imageUrl不存在")
 		return EmptyText()
 	}
+	elem.Url = url
 	if strings.Contains(url, "http://") || strings.Contains(url, "https://") {
 		b, err := util.GetBytes(url)
 		if err != nil {
 			log.Errorf("failed to download image")
 			return EmptyText()
 		}
-		return &clz.LocalImageElement{Stream: bytes.NewReader(b)}
+		elem.Stream = bytes.NewReader(b)
+		return elem
 	} else {
 		imageFile, err := os.Open(url)
 		if err != nil {
 			log.Errorf("failed to open local image")
 			return EmptyText()
 		}
-		return &clz.LocalImageElement{Stream: imageFile}
+		elem.Stream = imageFile
+		return elem
 	}
 }