diff --git a/client/http_api.go b/client/http_api.go index 35ae0b63..98a18afb 100644 --- a/client/http_api.go +++ b/client/http_api.go @@ -5,7 +5,6 @@ import ( "encoding/json" "fmt" "html" - "io" "mime/multipart" "net/http" "net/textproto" @@ -158,7 +157,6 @@ type noticeImage struct { } func (c *QQClient) GetGroupNotice(groupCode int64) (l []*GroupNoticeMessage, err error) { - v := url.Values{} v.Set("bkn", strconv.Itoa(c.getCSRFToken())) v.Set("qid", strconv.FormatInt(groupCode, 10)) @@ -220,33 +218,15 @@ func (c *QQClient) parseGroupNoticeJson(s *groupNoticeRsp) []*GroupNoticeMessage func (c *QQClient) uploadGroupNoticePic(img []byte) (*noticeImage, error) { buf := new(bytes.Buffer) w := multipart.NewWriter(buf) - err := w.WriteField("bkn", strconv.Itoa(c.getCSRFToken())) - if err != nil { - return nil, errors.Wrap(err, "write multipart failed") - } - err = w.WriteField("source", "troopNotice") - if err != nil { - return nil, errors.Wrap(err, "write multipart failed") - } - err = w.WriteField("m", "0") - if err != nil { - return nil, errors.Wrap(err, "write multipart failed") - } + _ = w.WriteField("bkn", strconv.Itoa(c.getCSRFToken())) + _ = w.WriteField("source", "troopNotice") + _ = w.WriteField("m", "0") h := make(textproto.MIMEHeader) h.Set("Content-Disposition", `form-data; name="pic_up"; filename="temp_uploadFile.png"`) h.Set("Content-Type", "image/png") - fw, err := w.CreatePart(h) - if err != nil { - return nil, errors.Wrap(err, "create multipart field failed") - } - _, err = fw.Write(img) - if err != nil { - return nil, errors.Wrap(err, "write multipart failed") - } - err = w.Close() - if err != nil { - return nil, errors.Wrap(err, "close multipart failed") - } + fw, _ := w.CreatePart(h) + _, _ = fw.Write(img) + _ = w.Close() req, err := http.NewRequest("POST", "https://web.qun.qq.com/cgi-bin/announce/upload_img", buf) if err != nil { return nil, errors.Wrap(err, "new request error") @@ -258,12 +238,8 @@ func (c *QQClient) uploadGroupNoticePic(img []byte) (*noticeImage, error) { return nil, errors.Wrap(err, "post error") } defer resp.Body.Close() - body, err := io.ReadAll(resp.Body) - if err != nil { - return nil, errors.Wrap(err, "read body error") - } - res := noticePicUpResponse{} - err = json.Unmarshal(body, &res) + var res noticePicUpResponse + err = json.NewDecoder(resp.Body).Decode(&res) if err != nil { return nil, errors.Wrap(err, "failed to unmarshal json") } diff --git a/client/image.go b/client/image.go index d0d97186..a4e2a3eb 100644 --- a/client/image.go +++ b/client/image.go @@ -329,7 +329,6 @@ func (c *QQClient) uploadOcrImage(img io.Reader, size int32, sum []byte) (string Sum: sum, Ticket: c.highwaySession.SigSession, Ext: ext, - Encrypt: false, }) if err != nil { return "", errors.Wrap(err, "upload ocr image error") diff --git a/client/private_msg.go b/client/private_msg.go index 13afd518..a899089f 100644 --- a/client/private_msg.go +++ b/client/private_msg.go @@ -192,7 +192,6 @@ func (c *QQClient) buildGroupTempSendingPacket(groupUin, target int64, msgSeq, r } func (c *QQClient) buildWPATempSendingPacket(uin int64, sig []byte, msgSeq, r int32, time int64, m *message.SendingMessage) (uint16, []byte) { - req := &msg.SendMessageRequest{ RoutingHead: &msg.RoutingHead{WpaTmp: &msg.WPATmp{ ToUin: proto.Uint64(uint64(uin)), diff --git a/client/ptt.go b/client/ptt.go index f53e5ac8..7ed1ea93 100644 --- a/client/ptt.go +++ b/client/ptt.go @@ -79,7 +79,6 @@ func (c *QQClient) UploadVoice(target message.Source, voice io.ReadSeeker) (*mes Size: length, Ticket: c.highwaySession.SigSession, Ext: ext, - Encrypt: false, }) if err != nil { return nil, err diff --git a/message/elements.go b/message/elements.go index c1d02ee0..c90e6015 100644 --- a/message/elements.go +++ b/message/elements.go @@ -103,8 +103,10 @@ type AnimatedSticker struct { Name string } -type RedBagMessageType int -type AtType int +type ( + RedBagMessageType int + AtType int +) // /com/tencent/mobileqq/data/MessageForQQWalletMsg.java const ( diff --git a/message/message.go b/message/message.go index 201fd169..2cb9673b 100644 --- a/message/message.go +++ b/message/message.go @@ -778,7 +778,7 @@ func splitPlainMessage(content string) []IMessageElement { } } if last != len(content) { - splittedMessage = append(splittedMessage, NewText(content[last:len(content)])) + splittedMessage = append(splittedMessage, NewText(content[last:])) } return splittedMessage