From 8ee19f60514b06ea46f18175636ad90f9cf00292 Mon Sep 17 00:00:00 2001
From: Mrs4s <1844812067@qq.com>
Date: Sat, 16 Jan 2021 05:54:46 +0800
Subject: [PATCH] fix SendGroupMessage panic.

---
 client/group_file.go | 5 ++---
 client/group_msg.go  | 4 +++-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/client/group_file.go b/client/group_file.go
index 55588844..05c5360b 100644
--- a/client/group_file.go
+++ b/client/group_file.go
@@ -7,7 +7,6 @@ import (
 	"github.com/Mrs4s/MiraiGo/utils"
 	"io"
 	"os"
-	"path"
 	"runtime/debug"
 
 	"github.com/Mrs4s/MiraiGo/client/pb/oidb"
@@ -152,7 +151,7 @@ func (fs *GroupFileSystem) GetFilesByFolder(folderId string) ([]*GroupFile, []*G
 	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)
 	if err != nil {
 		return err
@@ -163,7 +162,7 @@ func (fs *GroupFileSystem) UploadFile(p, folderId string) error {
 	sha1H := sha1.New()
 	_, _ = io.Copy(sha1H, file)
 	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
 }
 
diff --git a/client/group_msg.go b/client/group_msg.go
index a1b96237..96a9ab8f 100644
--- a/client/group_msg.go
+++ b/client/group_msg.go
@@ -355,7 +355,9 @@ func decodeGetGroupMsgResponse(c *QQClient, _ uint16, payload []byte) (interface
 		if m.Head.FromUin == nil {
 			continue
 		}
-		ret = append(ret, c.parseGroupMessage(m))
+		if elem := c.parseGroupMessage(m); elem != nil {
+			ret = append(ret, elem)
+		}
 	}
 	return ret, nil
 }