From 6e1792c6b1ae9eec8eda05594747dcad2ed38799 Mon Sep 17 00:00:00 2001 From: wdvxdr Date: Sat, 18 Jun 2022 23:12:10 +0800 Subject: [PATCH] client: don't return typed nil in UploadImage --- client/image.go | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/client/image.go b/client/image.go index 65c08a31..bd9d1648 100644 --- a/client/image.go +++ b/client/image.go @@ -48,7 +48,13 @@ func (c *QQClient) UploadImage(target message.Source, img io.ReadSeeker, thread case message.SourceGroup, message.SourceGuildChannel, message.SourceGuildDirect: return c.uploadGroupOrGuildImage(target, img, thread...) case message.SourcePrivate: - return c.uploadPrivateImage(target.PrimaryID, img, 0) + img, err := 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: return nil, errors.New("unsupported target type") }