diff --git a/coolq/bot.go b/coolq/bot.go
index cd9abca..9701a04 100644
--- a/coolq/bot.go
+++ b/coolq/bot.go
@@ -176,11 +176,18 @@ func (bot *CQBot) GetMessage(mid int32) MSG {
}
// UploadLocalImageAsGroup 上传本地图片至群聊
-func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (*message.GroupImageElement, error) {
+func (bot *CQBot) UploadLocalImageAsGroup(groupCode int64, img *LocalImageElement) (i *message.GroupImageElement, err error) {
if img.Stream != nil {
- return bot.Client.UploadGroupImage(groupCode, img.Stream)
+ i, err = bot.Client.UploadGroupImage(groupCode, img.Stream)
+ } else {
+ i, err = bot.Client.UploadGroupImageByFile(groupCode, img.File)
}
- return bot.Client.UploadGroupImageByFile(groupCode, img.File)
+
+ if i != nil {
+ i.Flash = img.Flash
+ i.EffectID = img.EffectID
+ }
+ return
}
// UploadLocalVideo 上传本地短视频至群聊
@@ -201,17 +208,23 @@ func (bot *CQBot) UploadLocalVideo(target int64, v *LocalVideoElement) (*message
}
// UploadLocalImageAsPrivate 上传本地图片至私聊
-func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (*message.FriendImageElement, error) {
+func (bot *CQBot) UploadLocalImageAsPrivate(userID int64, img *LocalImageElement) (i *message.FriendImageElement, err error) {
if img.Stream != nil {
- return bot.Client.UploadPrivateImage(userID, img.Stream)
+ i, err = bot.Client.UploadPrivateImage(userID, img.Stream)
+ } else {
+ // need update.
+ f, e := os.Open(img.File)
+ if e != nil {
+ return nil, e
+ }
+ defer f.Close()
+ i, err = bot.Client.UploadPrivateImage(userID, f)
}
- // need update.
- f, err := os.Open(img.File)
- if err != nil {
- return nil, err
+
+ if i != nil {
+ i.Flash = img.Flash
}
- defer f.Close()
- return bot.Client.UploadPrivateImage(userID, f)
+ return
}
// SendGroupMessage 发送群消息
diff --git a/coolq/cqcode.go b/coolq/cqcode.go
index d46461e..261b1dd 100644
--- a/coolq/cqcode.go
+++ b/coolq/cqcode.go
@@ -65,9 +65,11 @@ type GiftElement struct {
// LocalImageElement 本地图片
type LocalImageElement struct {
- message.ImageElement
Stream io.ReadSeeker
File string
+
+ Flash bool
+ EffectID int32
}
// LocalVoiceElement 本地语音
@@ -83,6 +85,11 @@ type LocalVideoElement struct {
thumb io.ReadSeeker
}
+// Type implements the message.IMessageElement.
+func (e *LocalImageElement) Type() message.ElementType {
+ return message.Image
+}
+
// Type 获取元素类型ID
func (e *GiftElement) Type() message.ElementType {
// Make message.IMessageElement Happy
@@ -202,31 +209,28 @@ func ToArrayMessage(e []message.IMessageElement, groupID int64) (r []MSG) {
"type": "video",
"data": map[string]string{"file": o.Name, "url": o.Url},
}
- case *message.ImageElement:
- m = MSG{
- "type": "image",
- "data": map[string]string{"file": o.Filename, "url": o.Url},
- }
case *message.GroupImageElement:
+ data := map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url}
+ switch {
+ case o.Flash:
+ data["type"] = "flash"
+ case o.EffectID != 0:
+ data["type"] = "show"
+ data["id"] = strconv.FormatInt(int64(o.EffectID), 10)
+ }
m = MSG{
"type": "image",
- "data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url},
+ "data": data,
}
case *message.FriendImageElement:
+ data := map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url}
+ if o.Flash {
+ data["type"] = "flash"
+ }
m = MSG{
"type": "image",
- "data": map[string]string{"file": hex.EncodeToString(o.Md5) + ".image", "url": o.Url},
+ "data": data,
}
- case *message.GroupFlashImgElement:
- return []MSG{{
- "type": "image",
- "data": map[string]string{"file": o.Filename, "type": "flash"},
- }}
- case *message.FriendFlashImgElement:
- return []MSG{{
- "type": "image",
- "data": map[string]string{"file": o.Filename, "type": "flash"},
- }}
case *message.ServiceElement:
if isOk := strings.Contains(o.Content, "= 40006 {
id = 40000
}
- if i, ok := img.(*message.GroupImageElement); ok {
- return &message.GroupShowPicElement{GroupImageElement: *i, EffectId: int32(id)}, nil
- }
- return img, nil
+ default:
+ return img, err
}
-
+ switch img := img.(type) {
+ case *LocalImageElement:
+ img.Flash = flash
+ img.EffectID = int32(id)
+ case *message.GroupImageElement:
+ img.Flash = flash
+ img.EffectID = int32(id)
+ case *message.FriendImageElement:
+ img.Flash = flash
+ }
+ return img, err
case "poke":
t, _ := strconv.ParseInt(d["qq"], 10, 64)
return &PokeElement{Target: t}, nil
@@ -935,7 +929,6 @@ func (bot *CQBot) ToElement(t string, d map[string]string, isGroup bool) (m inte
default:
return nil, errors.New("unsupported cq code: " + t)
}
- return nil, nil
}
// XMLEscape 将字符串c转义为XML字符串
@@ -1189,7 +1182,7 @@ func (bot *CQBot) makeShowPic(elem message.IMessageElement, source string, brief
return nil, err
}
suf = gm
- xml = fmt.Sprintf(`