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

fix SendGroupMessage panic.

Browse Source
This commit is contained in:
Mrs4s 2021-01-16 05:54:46 +08:00
parent c6cb5c7fe2
commit 8ee19f6051
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/group_file.go
View File

@ -7,7 +7,6 @@ import (
"github.com/Mrs4s/MiraiGo/utils" "github.com/Mrs4s/MiraiGo/utils"
"io" "io"
"os" "os"
"path"
"runtime/debug" "runtime/debug"
"github.com/Mrs4s/MiraiGo/client/pb/oidb" "github.com/Mrs4s/MiraiGo/client/pb/oidb"
@ -152,7 +151,7 @@ func (fs *GroupFileSystem) GetFilesByFolder(folderId string) ([]*GroupFile, []*G
return files, folders, nil return files, folders, nil
} }
func (fs *GroupFileSystem) UploadFile(p, folderId string) error { func (fs *GroupFileSystem) UploadFile(p, name, folderId string) error {
file, err := os.OpenFile(p, os.O_RDONLY, 0666) file, err := os.OpenFile(p, os.O_RDONLY, 0666)
if err != nil { if err != nil {
return err return err
@ -163,7 +162,7 @@ func (fs *GroupFileSystem) UploadFile(p, folderId string) error {
sha1H := sha1.New() sha1H := sha1.New()
_, _ = io.Copy(sha1H, file) _, _ = io.Copy(sha1H, file)
sha1Hash := sha1H.Sum(nil) sha1Hash := sha1H.Sum(nil)
fs.client.sendAndWait(fs.client.buildGroupFileUploadReqPacket(folderId, path.Ext(p), fs.GroupCode, size, md5Hash, sha1Hash)) fs.client.sendAndWait(fs.client.buildGroupFileUploadReqPacket(folderId, name, fs.GroupCode, size, md5Hash, sha1Hash))
return nil return nil
} }

4
client/group_msg.go
View File

@ -355,7 +355,9 @@ func decodeGetGroupMsgResponse(c *QQClient, _ uint16, payload []byte) (interface
if m.Head.FromUin == nil { if m.Head.FromUin == nil {
continue continue
} }
ret = append(ret, c.parseGroupMessage(m)) if elem := c.parseGroupMessage(m); elem != nil {
ret = append(ret, elem)
}
} }
return ret, nil return ret, nil
} }