shkong/MiraiGo
1
0
Fork 0
mirror of https://github.com/Mrs4s/MiraiGo.git synced 2025-05-04 11:07:40 +08:00
Code Issues Projects Releases Wiki Activity

client: remove deprecated image upload api

Browse Source
This commit is contained in:
wdvxdr 2023-02-10 22:14:17 +08:00
parent a8d1e40a27
commit 3bfc20fd2e
1 changed files with 3 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
client/image.go
View File

@ -1,9 +1,9 @@
package client package client
import ( import (
"crypto/rand"
"fmt" "fmt"
"io" "io"
"math/rand"
"strings" "strings"
"time" "time"
@ -48,31 +48,12 @@ func (c *QQClient) UploadImage(target message.Source, img io.ReadSeeker, thread
case message.SourceGroup, message.SourceGuildChannel, message.SourceGuildDirect: case message.SourceGroup, message.SourceGuildChannel, message.SourceGuildDirect:
return c.uploadGroupOrGuildImage(target, img, thread...) return c.uploadGroupOrGuildImage(target, img, thread...)
case message.SourcePrivate: case message.SourcePrivate:
img, err := c.uploadPrivateImage(target.PrimaryID, img, 0) return c.uploadPrivateImage(target.PrimaryID, img, 0)
// Note: we need this check, we should return untyped nil instead of (*FriendImageElement)(nil)
// TODO: change c.uploadPrivateImage signature after delete c.UploadPrivateImage
if err != nil {
return nil, err
}
return img, nil
default: default:
return nil, errors.New("unsupported target type") return nil, errors.New("unsupported target type")
} }
} }
// Deprecated: use UploadImage instead
func (c *QQClient) UploadGroupImage(groupCode int64, img io.ReadSeeker, thread ...int) (*message.GroupImageElement, error) {
source := message.Source{
SourceType: message.SourceGroup,
PrimaryID: groupCode,
}
x, err := c.UploadImage(source, img, thread...)
if err != nil {
return nil, err
}
return x.(*message.GroupImageElement), nil
}
func (c *QQClient) uploadGroupOrGuildImage(target message.Source, img io.ReadSeeker, thread ...int) (message.IMessageElement, error) { func (c *QQClient) uploadGroupOrGuildImage(target message.Source, img io.ReadSeeker, thread ...int) (message.IMessageElement, error) {
_, _ = img.Seek(0, io.SeekStart) // safe _, _ = img.Seek(0, io.SeekStart) // safe
fh, length := utils.ComputeMd5AndLength(img) fh, length := utils.ComputeMd5AndLength(img)
@ -172,11 +153,6 @@ ok:
}, nil }, nil
} }
// Deprecated: use UploadImage instead
func (c *QQClient) UploadPrivateImage(target int64, img io.ReadSeeker) (*message.FriendImageElement, error) {
return c.uploadPrivateImage(target, img, 0)
}
func (c *QQClient) GetGroupImageDownloadUrl(fileId, groupCode int64, fileMd5 []byte) (string, error) { func (c *QQClient) GetGroupImageDownloadUrl(fileId, groupCode int64, fileMd5 []byte) (string, error) {
i, err := c.sendAndWait(c.buildGroupImageDownloadPacket(fileId, groupCode, fileMd5)) i, err := c.sendAndWait(c.buildGroupImageDownloadPacket(fileId, groupCode, fileMd5))
if err != nil { if err != nil {
@ -185,7 +161,7 @@ func (c *QQClient) GetGroupImageDownloadUrl(fileId, groupCode int64, fileMd5 []b
return i.(string), nil return i.(string), nil
} }
func (c *QQClient) uploadPrivateImage(target int64, img io.ReadSeeker, count int) (*message.FriendImageElement, error) { func (c *QQClient) uploadPrivateImage(target int64, img io.ReadSeeker, count int) (message.IMessageElement, error) {
_, _ = img.Seek(0, io.SeekStart) _, _ = img.Seek(0, io.SeekStart)
count++ count++
fh, length := utils.ComputeMd5AndLength(img) fh, length := utils.ComputeMd5AndLength(img)