Merge branch 'dev' of https://github.com/Mrs4s/go-cqhttp into dev

Author: fumiama

.github/workflows/ci.yml

@@ -28,7 +28,7 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.18
+          go-version: 1.19
       - name: Cache downloaded module
         uses: actions/cache@v2
         with:

.github/workflows/golint.yml

@@ -12,19 +12,13 @@ jobs:
       - name: Setup Go environment
         uses: actions/setup-go@v2.1.3
         with:
-          go-version: 1.18
+          go-version: 1.19
 
       - name: golangci-lint
         uses: golangci/golangci-lint-action@v2
         with:
           version: latest
 
-      - name: Static Check
-        uses: dominikh/staticcheck-action@v1.2.0
-        with:
-          install-go: false
-          version: "2022.1"
-
       - name: Tests
         run: |
           go test $(go list ./...)

.github/workflows/release.yml

@@ -17,7 +17,7 @@ jobs:
       - name: Set up Go
         uses: actions/setup-go@v2
         with:
-          go-version: '1.18'
+          go-version: '1.19'
 
       - name: Run GoReleaser
         uses: goreleaser/goreleaser-action@v2

.golangci.yml

@@ -21,29 +21,25 @@ linters:
   disable-all: true
   fast: false
   enable:
-    #- bodyclose
-    #- deadcode
-    #- depguard
-    #- dogsled
+    - bodyclose
+    - durationcheck
     - gofmt
     - goimports
     - errcheck
     - exportloopref
     - exhaustive
     - bidichk
     - gocritic
-    #- gosimple
+    - gosimple
     - govet
     - ineffassign
     #- nolintlint
-    #- rowserrcheck
-    #- staticcheck
-    - structcheck
-    #- stylecheck
+    - staticcheck
+    - stylecheck
     - unconvert
-    #- unparam
-    #- unused
-    - varcheck
+    - usestdlibvars
+    - unparam
+    - unused
     - whitespace
     - prealloc
     - predeclared

Dockerfile

@@ -1,4 +1,4 @@
-FROM golang:1.18-alpine AS builder
+FROM golang:1.19-alpine AS builder
 
 RUN go env -w GO111MODULE=auto \
   && go env -w CGO_ENABLED=0 \

cmd/gocq/login.go

@@ -151,7 +151,7 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 			log.Warn("请输入(1 - 2) (将在10秒后自动选择1)：")
 			text = readLineTimeout(time.Second*10, "1")
 			if strings.Contains(text, "1") {
-				ticket := sliderCaptchaProcessor(res.VerifyUrl)
+				ticket := getTicket(res.VerifyUrl)
 				if ticket == "" {
 					os.Exit(0)
 				}
@@ -218,22 +218,39 @@ func loginResponseProcessor(res *client.LoginResponse) error {
 	}
 }
 
-func sliderCaptchaProcessor(u string) string {
+func getTicket(u string) (str string) {
 	id := utils.RandomString(8)
-	log.Warnf("请前往该地址验证 -> %v", strings.ReplaceAll(u, "https://ssl.captcha.qq.com/template/wireless_mqq_captcha.html?", fmt.Sprintf("https://captcha.go-cqhttp.org/captcha?id=%v&", id)))
-	start := time.Now()
-	for time.Since(start).Minutes() < 2 {
-		time.Sleep(time.Second)
-		data, err := global.GetBytes("https://captcha.go-cqhttp.org/captcha/ticket?id=" + id)
-		if err != nil {
-			log.Warnf("获取 Ticket 时出现错误: %v", err)
-			return ""
-		}
-		g := gjson.ParseBytes(data)
-		if g.Get("ticket").Exists() {
-			return g.Get("ticket").String()
+	log.Warnf("请前往该地址验证 -> %v <- 或输入手动抓取的 ticket：（Enter 提交）", strings.ReplaceAll(u, "https://ssl.captcha.qq.com/template/wireless_mqq_captcha.html?", fmt.Sprintf("https://captcha.go-cqhttp.org/captcha?id=%v&", id)))
+	manual := make(chan string, 1)
+	go func() {
+		manual <- readLine()
+	}()
+	ticker := time.NewTicker(time.Second)
+	defer ticker.Stop()
+	for count := 120; count > 0; count-- {
+		select {
+		case <-ticker.C:
+			str = fetchCaptcha(id)
+			if str != "" {
+				return
+			}
+		case str = <-manual:
+			return
 		}
 	}
 	log.Warnf("验证超时")
 	return ""
 }
+
+func fetchCaptcha(id string) string {
+	data, err := global.GetBytes("https://captcha.go-cqhttp.org/captcha/ticket?id=" + id)
+	if err != nil {
+		log.Warnf("获取 Ticket 时出现错误: %v", err)
+		return ""
+	}
+	g := gjson.ParseBytes(data)
+	if g.Get("ticket").Exists() {
+		return g.Get("ticket").String()
+	}
+	return ""
+}

coolq/api.go

@@ -765,9 +765,9 @@ func (bot *CQBot) CQSendGroupMessage(groupID int64, m gjson.Result, autoEscape b
 		}
 	}
 	fixAt(elem)
-	mid := bot.SendGroupMessage(groupID, &message.SendingMessage{Elements: elem})
-	if mid == -1 {
-		return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
+	mid, err := bot.SendGroupMessage(groupID, &message.SendingMessage{Elements: elem})
+	if err != nil {
+		return Failed(100, "SEND_MSG_API_ERROR", err.Error())
 	}
 	log.Infof("发送群 %v(%v) 的消息: %v (%v)", group.Name, groupID, limitedString(m.String()), mid)
 	return OK(global.MSG{"message_id": mid})
@@ -836,7 +836,7 @@ func (bot *CQBot) uploadForwardElement(m gjson.Result, target int64, sourceType
 		if len(bot.Client.GroupList) == 0 {
 			groupID = 1
 		} else {
-			groupID = bot.Client.GroupList[1].Uin
+			groupID = bot.Client.GroupList[0].Uin
 		}
 	}
 	builder := bot.Client.NewForwardMessageBuilder(groupID)
@@ -977,8 +977,11 @@ func (bot *CQBot) CQSendGroupForwardMessage(groupID int64, m gjson.Result) globa
 		log.Warnf("合并转发(群)消息发送失败: 账号可能被风控.")
 		return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
 	}
+	mid := bot.InsertGroupMessage(ret)
+	log.Infof("发送群 %v(%v)  的合并转发消息: %v (%v)", groupID, groupID, limitedString(m.String()), mid)
 	return OK(global.MSG{
-		"message_id": bot.InsertGroupMessage(ret),
+		"message_id": mid,
+		"forward_id": fe.ResId,
 	})
 }
 
@@ -1000,7 +1003,11 @@ func (bot *CQBot) CQSendPrivateForwardMessage(userID int64, m gjson.Result) glob
 		log.Warnf("合并转发(好友)消息发送失败: 账号可能被风控.")
 		return Failed(100, "SEND_MSG_API_ERROR", "请参考 go-cqhttp 端输出")
 	}
-	return OK(global.MSG{"message_id": mid})
+	log.Infof("发送好友 %v(%v)  的合并转发消息: %v (%v)", userID, userID, limitedString(m.String()), mid)
+	return OK(global.MSG{
+		"message_id": mid,
+		"forward_id": fe.ResId,
+	})
 }
 
 // CQSendPrivateMessage 发送私聊消息
@@ -1114,6 +1121,23 @@ func (bot *CQBot) CQSetGroupMemo(groupID int64, msg, img string) global.MSG {
 	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
 }
 
+// CQDelGroupMemo 扩展API-删除群公告
+// @route(_del_group_notice)
+// @rename(fid->notice_id)
+func (bot *CQBot) CQDelGroupMemo(groupID int64, fid string) global.MSG {
+	if g := bot.Client.FindGroup(groupID); g != nil {
+		if g.SelfPermission() == client.Member {
+			return Failed(100, "PERMISSION_DENIED", "权限不足")
+		}
+		err := bot.Client.DelGroupNotice(groupID, fid)
+		if err != nil {
+			return Failed(100, "DELETE_NOTICE_ERROR", err.Error())
+		}
+		return OK(nil)
+	}
+	return Failed(100, "GROUP_NOT_FOUND", "群聊不存在")
+}
+
 // CQSetGroupKick 群组踢人
 //
 // https://git.io/Jtz1V

coolq/bot.go

@@ -23,6 +23,7 @@ import (
 	"github.com/Mrs4s/go-cqhttp/db"
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
+	"github.com/Mrs4s/go-cqhttp/internal/mime"
 )
 
 // CQBot CQBot结构体,存储Bot实例相关配置
@@ -152,10 +153,9 @@ func (bot *CQBot) uploadLocalImage(target message.Source, img *LocalImageElement
 		defer func() { _ = f.Close() }()
 		img.Stream = f
 	}
-	if lawful, mime := base.IsLawfulImage(img.Stream); !lawful {
-		return nil, errors.New("image type error: " + mime)
+	if mt, ok := mime.CheckImage(img.Stream); !ok {
+		return nil, errors.New("image type error: " + mt)
 	}
-	// todo: enable multi-thread upload, now got error code 81
 	i, err := bot.Client.UploadImage(target, img.Stream, 4)
 	if err != nil {
 		return nil, err
@@ -248,7 +248,7 @@ func (bot *CQBot) uploadMedia(target message.Source, elements []message.IMessage
 }
 
 // SendGroupMessage 发送群消息
-func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int32 {
+func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) (int32, error) {
 	newElem := make([]message.IMessageElement, 0, len(m.Elements))
 	group := bot.Client.FindGroup(groupID)
 	source := message.Source{
@@ -264,14 +264,14 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 					mem.Poke()
 				}
 			}
-			return 0
+			return 0, nil
 		case *message.MusicShareElement:
 			ret, err := bot.Client.SendGroupMusicShare(groupID, i)
 			if err != nil {
 				log.Warnf("警告: 群 %v 富文本消息发送失败: %v", groupID, err)
-				return -1
+				return -1, errors.Wrap(err, "send group music share error")
 			}
-			return bot.InsertGroupMessage(ret)
+			return bot.InsertGroupMessage(ret), nil
 		case *message.AtElement:
 			if i.Target == 0 && group.SelfPermission() == client.Member {
 				e = message.NewText("@全体成员")
@@ -281,16 +281,16 @@ func (bot *CQBot) SendGroupMessage(groupID int64, m *message.SendingMessage) int
 	}
 	if len(newElem) == 0 {
 		log.Warnf("群消息发送失败: 消息为空.")
-		return -1
+		return -1, errors.New("empty message")
 	}
 	m.Elements = newElem
 	bot.checkMedia(newElem, groupID)
 	ret := bot.Client.SendGroupMessage(groupID, m)
 	if ret == nil || ret.Id == -1 {
 		log.Warnf("群消息发送失败: 账号可能被风控.")
-		return -1
+		return -1, errors.New("send group message failed: blocked by server")
 	}
-	return bot.InsertGroupMessage(ret)
+	return bot.InsertGroupMessage(ret), nil
 }
 
 // SendPrivateMessage 发送私聊消息

coolq/cqcode.go

@@ -20,6 +20,7 @@ import (
 	"github.com/Mrs4s/MiraiGo/message"
 	"github.com/Mrs4s/MiraiGo/utils"
 	b14 "github.com/fumiama/go-base16384"
+	"github.com/segmentio/asm/base64"
 	log "github.com/sirupsen/logrus"
 	"github.com/tidwall/gjson"
 
@@ -28,6 +29,7 @@ import (
 	"github.com/Mrs4s/go-cqhttp/global"
 	"github.com/Mrs4s/go-cqhttp/internal/base"
 	"github.com/Mrs4s/go-cqhttp/internal/cache"
+	"github.com/Mrs4s/go-cqhttp/internal/mime"
 	"github.com/Mrs4s/go-cqhttp/internal/param"
 )
 
@@ -82,14 +84,16 @@ func (e *PokeElement) Type() message.ElementType {
 func replyID(r *message.ReplyElement, source message.Source) int32 {
 	id := source.PrimaryID
 	seq := r.ReplySeq
-	if source.SourceType == message.SourcePrivate {
+	if r.GroupID != 0 {
+		id = r.GroupID
+	}
+	// 私聊时，部分（不确定）的账号会在 ReplyElement 中带有 GroupID 字段。
+	// 这里需要判断是由于 “直接回复” 功能，GroupID 为触发直接回复的来源那个群。
+	if source.SourceType == message.SourcePrivate && (r.Sender == source.PrimaryID || r.GroupID == source.PrimaryID) {
 		// 私聊似乎腾讯服务器有bug?
 		seq = int32(uint16(seq))
 		id = r.Sender
 	}
-	if r.GroupID != 0 {
-		id = r.GroupID
-	}
 	return db.ToGlobalID(id, seq)
 }
 
@@ -733,7 +737,12 @@ func (bot *CQBot) ConvertContentMessage(content []global.MSG, sourceType message
 			case *message.GroupImageElement:
 				img.Flash = flash
 				img.EffectID = id
-				img.ImageBizType = message.ImageBizType(data["subType"].(uint32))
+				switch sub := data["subType"].(type) {
+				case int64:
+					img.ImageBizType = message.ImageBizType(sub)
+				case uint32:
+					img.ImageBizType = message.ImageBizType(sub)
+				}
 			case *message.FriendImageElement:
 				img.Flash = flash
 			}
@@ -839,8 +848,8 @@ func (bot *CQBot) ToElement(t string, d map[string]string, sourceType message.So
 			return nil, err
 		}
 		if !global.IsAMRorSILK(data) {
-			lawful, mt := base.IsLawfulAudio(bytes.NewReader(data))
-			if !lawful {
+			mt, ok := mime.CheckAudio(bytes.NewReader(data))
+			if !ok {
 				return nil, errors.New("audio type error: " + mt)
 			}
 			data, err = global.EncoderSilk(data)
@@ -1116,7 +1125,7 @@ func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video bool, sourceTy
 		return &LocalImageElement{File: fu.Path, URL: f}, nil
 	}
 	if !video && strings.HasPrefix(f, "base64") {
-		b, err := param.Base64DecodeString(strings.TrimPrefix(f, "base64://"))
+		b, err := base64.StdEncoding.DecodeString(strings.TrimPrefix(f, "base64://"))
 		if err != nil {
 			return nil, err
 		}