shkong/go-cqhttp
1
0
Fork 0
mirror of https://github.com/Mrs4s/go-cqhttp.git synced 2025-05-05 11:33:48 +08:00
Code Issues Projects Releases Wiki Activity

Merge pull request #544 from wdvxdr1123/patch-2

Browse Source 
cq video
This commit is contained in:
Mrs4s 2021-01-08 17:38:30 +08:00 committed by GitHub
commit c58066e287
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
14 changed files with 409 additions and 69 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
.gitignore vendored
View File

@ -1,2 +1,7 @@
vendor/
.idea
config.hjson
device.json
codec/
data/
logs/

24
coolq/api.go
View File

@ -1,9 +1,12 @@
package coolq
import (
"crypto/md5"
"encoding/hex"
"io/ioutil"
"os"
"path"
"path/filepath"
"runtime"
"strconv"
"strings"
@ -741,6 +744,25 @@ func (bot *CQBot) CQGetImage(file string) MSG {
}
}
func (bot *CQBot) CQDownloadFile(url string, headers map[string]string, threadCount int) MSG {
hash := md5.Sum([]byte(url))
file := path.Join(global.CACHE_PATH, hex.EncodeToString(hash[:])+".cache")
if global.PathExists(file) {
if err := os.Remove(file); err != nil {
log.Warnf("删除缓存文件 %v 时出现错误: %v", file, err)
return Failed(100, "DELETE_FILE_ERROR", err.Error())
}
}
if err := global.DownloadFileMultiThreading(url, file, 0, threadCount, headers); err != nil {
log.Warnf("下载链接 %v 时出现错误: %v", url, err)
return Failed(100, "DOWNLOAD_FILE_ERROR", err.Error())
}
abs, _ := filepath.Abs(file)
return OK(MSG{
"file": abs,
})
}
func (bot *CQBot) CQGetForwardMessage(resId string) MSG {
m := bot.Client.GetForwardMessage(resId)
if m == nil {
@ -815,7 +837,7 @@ func (bot *CQBot) CQCanSendRecord() MSG {
}
func (bot *CQBot) CQOcrImage(imageId string) MSG {
img, err := bot.makeImageElem(map[string]string{"file": imageId}, true)
img, err := bot.makeImageOrVideoElem(map[string]string{"file": imageId}, false, true)
if err != nil {
log.Warnf("load image error: %v", err)
return Failed(100, "LOAD_FILE_ERROR", err.Error())

25
coolq/bot.go
View File

@ -5,7 +5,6 @@ import (
"encoding/gob"
"fmt"
"hash/crc32"
"io/ioutil"
"os"
"path"
"runtime/debug"
@ -150,8 +149,8 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
newElem = append(newElem, gm)
continue
}
if i, ok := elem.(*LocalVoiceElement); ok {
gv, err := bot.Client.UploadGroupPtt(groupId, i.Stream)
if i, ok := elem.(*message.VoiceElement); ok {
gv, err := bot.Client.UploadGroupPtt(groupId, bytes.NewReader(i.Data))
if err != nil {
log.Warnf("警告: 群 %v 消息语音上传失败: %v", groupId, err)
continue
@ -159,6 +158,15 @@ func (bot *CQBot) SendGroupMessage(groupId int64, m *message.SendingMessage) int
newElem = append(newElem, gv)
continue
}
if i, ok := elem.(*LocalVideoElement); ok { // todo:cache & multiThread
gv, err := bot.Client.UploadGroupShortVideo(groupId, i.video, i.thumb)
if err != nil {
log.Warnf("警告: 群 %v 消息短视频上传失败: %v", groupId, err)
continue
}
newElem = append(newElem, gv)
continue
}
if i, ok := elem.(*PokeElement); ok {
if group := bot.Client.FindGroup(groupId); group != nil {
if mem := group.FindMember(i.Target); mem != nil {
@ -270,15 +278,10 @@ func (bot *CQBot) SendPrivateMessage(target int64, m *message.SendingMessage) in
bot.Client.SendFriendPoke(i.Target)
return 0
}
if i, ok := elem.(*LocalVoiceElement); ok {
data, err := ioutil.ReadAll(i.Stream)
if i, ok := elem.(*message.VoiceElement); ok {
fv, err := bot.Client.UploadPrivatePtt(target, i.Data)
if err != nil {
log.Warnf("警告: 好友 %v 消息语音读取失败: %v", target, err)
continue
}
fv, err := bot.Client.UploadPrivatePtt(target, data)
if err != nil {
log.Warnf("警告: 好友 %v 消息语音上传失败: %v", target, err)
log.Warnf("警告: 群 %v 消息语音上传失败: %v", target, err)
continue
}
newElem = append(newElem, fv)

132
coolq/cqcode.go
View File

@ -21,6 +21,7 @@ import (
"github.com/Mrs4s/MiraiGo/binary"
"github.com/Mrs4s/MiraiGo/message"
"github.com/Mrs4s/MiraiGo/utils"
"github.com/Mrs4s/go-cqhttp/global"
log "github.com/sirupsen/logrus"
"github.com/tidwall/gjson"
@ -36,6 +37,7 @@ var IgnoreInvalidCQCode = false
var SplitUrl = false
const maxImageSize = 1024 * 1024 * 30 // 30MB
const maxVideoSize = 1024 * 1024 * 100 // 100MB
type PokeElement struct {
Target int64
@ -77,6 +79,13 @@ type LocalVoiceElement struct {
Stream io.ReadSeeker
}
type LocalVideoElement struct {
message.ShortVideoElement
File string
video io.ReadSeeker
thumb io.ReadSeeker
}
func (e *GiftElement) Type() message.ElementType {
return message.At
}
@ -426,7 +435,7 @@ func (bot *CQBot) ConvertStringMessage(msg string, group bool) (r []message.IMes
}
elem, err := bot.ToElement(t, params, group)
if err != nil {
org := "[" + string(cqCode) + "]"
org := "[CQ:" + string(cqCode) + "]"
if !IgnoreInvalidCQCode {
log.Warnf("转换CQ码 %v 时出现错误: %v 将原样发送.", org, err)
r = append(r, message.NewText(org))
@ -547,7 +556,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
}
return message.NewText(d["text"]), nil
case "image":
img, err := bot.makeImageElem(d, group)
img, err := bot.makeImageOrVideoElem(d, false, group)
if err != nil {
return nil, err
}
@ -605,7 +614,6 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
}
}()
data, err := bot.Client.GetTts(d["text"])
ioutil.WriteFile("tts.silk", data, 777)
if err != nil {
return nil, err
}
@ -620,7 +628,7 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
return nil, err
}
if !global.IsAMRorSILK(data) {
data, err = global.Encoder(data)
data, err = global.EncoderSilk(data)
if err != nil {
return nil, err
}
@ -770,11 +778,55 @@ func (bot *CQBot) ToElement(t string, d map[string]string, group bool) (m interf
if maxHeight == 0 {
maxHeight = 1000
}
img, err := bot.makeImageElem(d, group)
img, err := bot.makeImageOrVideoElem(d, false, group)
if err != nil {
return nil, errors.New("send cardimage faild")
}
return bot.makeShowPic(img, source, icon, minWidth, minHeight, maxWidth, maxHeight, group)
case "video":
if !group {
return nil, errors.New("unsupported private short video")
}
cache := d["cache"]
if cache == "" {
cache = "1"
}
file, err := bot.makeImageOrVideoElem(d, true, group)
if err != nil {
return nil, err
}
v := file.(*LocalVideoElement)
if cover, ok := d["cover"]; ok {
data, _ := global.FindFile(cover, cache, global.IMAGE_PATH)
v.thumb = bytes.NewReader(data)
}
if v.thumb == nil {
_ = global.ExtractCover(v.File, v.File+".jpg")
v.thumb, _ = os.Open(v.File + ".jpg")
}
v.video, _ = os.Open(v.File)
_, err = v.video.Seek(4, io.SeekStart)
if err != nil {
return nil, err
}
var header = make([]byte, 4)
_, err = v.video.Read(header)
if !bytes.Equal(header, []byte{0x66, 0x74, 0x79, 0x70}) { // ftyp
_, _ = v.video.Seek(0, io.SeekStart)
hash, _ := utils.GetMd5AndLength(v.video)
cacheFile := path.Join(global.CACHE_PATH, hex.EncodeToString(hash[:])+".mp4")
if global.PathExists(cacheFile) {
goto ok
}
err = global.EncodeMP4(v.File, cacheFile)
if err != nil {
return nil, err
}
ok:
v.video, _ = os.Open(cacheFile)
}
_, _ = v.video.Seek(0, io.SeekStart)
return v, nil
default:
return nil, errors.New("unsupported cq code: " + t)
}
@ -816,7 +868,7 @@ func CQCodeUnescapeValue(content string) string {
}
// 图片 elem 生成器，单独拎出来，用于公用
func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessageElement, error) {
func (bot *CQBot) makeImageOrVideoElem(d map[string]string, video, group bool) (message.IMessageElement, error) {
f := d["file"]
if strings.HasPrefix(f, "http") || strings.HasPrefix(f, "https") {
cache := d["cache"]
@ -833,18 +885,22 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
_ = os.Remove(cacheFile)
}
thread, _ := strconv.Atoi(c)
if err := global.DownloadFileMultiThreading(f, cacheFile, maxImageSize, thread); err != nil {
var maxSize = func() int64 {
if video {
return maxVideoSize
}
return maxImageSize
}()
if err := global.DownloadFileMultiThreading(f, cacheFile, maxSize, thread, nil); err != nil {
return nil, err
}
if video {
return &LocalVideoElement{
File: cacheFile,
}, nil
}
return &LocalImageElement{File: cacheFile}, nil
}
if strings.HasPrefix(f, "base64") {
b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
if err != nil {
return nil, err
}
return &LocalImageElement{Stream: bytes.NewReader(b)}, nil
}
if strings.HasPrefix(f, "file") {
fu, err := url.Parse(f)
if err != nil {
@ -857,10 +913,28 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
if err != nil {
return nil, err
}
if video {
goto videos
}
if info.Size() == 0 || info.Size() >= maxImageSize {
return nil, errors.New("invalid image size")
}
return &LocalImageElement{File: fu.Path}, nil
videos:
if info.Size() == 0 || info.Size() >= maxVideoSize {
return nil, errors.New("invalid video size")
}
return &LocalVideoElement{File: fu.Path}, nil
}
if video { // 短视频视频只支持以上两种
return nil, errors.New("invalid video")
}
if strings.HasPrefix(f, "base64") {
b, err := base64.StdEncoding.DecodeString(strings.ReplaceAll(f, "base64://", ""))
if err != nil {
return nil, err
}
return &LocalImageElement{Stream: bytes.NewReader(b)}, nil
}
rawPath := path.Join(global.IMAGE_PATH, f)
if !global.PathExists(rawPath) && global.PathExists(path.Join(global.IMAGE_PATH_OLD, f)) {
@ -870,7 +944,7 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
rawPath += ".cqimg"
}
if !global.PathExists(rawPath) && d["url"] != "" {
return bot.makeImageElem(map[string]string{"file": d["url"]}, group)
return bot.makeImageOrVideoElem(map[string]string{"file": d["url"]}, false, group)
}
if global.PathExists(rawPath) {
file, err := os.Open(rawPath)
@ -887,9 +961,11 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
if len(b) < 20 {
return nil, errors.New("invalid local file")
}
var size int32
var hash []byte
var url string
var (
size int32
hash []byte
url string
)
if path.Ext(rawPath) == ".cqimg" {
for _, line := range strings.Split(global.ReadAllText(rawPath), "\n") {
kv := strings.SplitN(line, "=", 2)
@ -910,27 +986,23 @@ func (bot *CQBot) makeImageElem(d map[string]string, group bool) (message.IMessa
}
if size == 0 {
if url != "" {
return bot.makeImageElem(map[string]string{"file": url}, group)
return bot.makeImageOrVideoElem(map[string]string{"file": url}, false, group)
}
return nil, errors.New("img size is 0")
}
if len(hash) != 16 {
return nil, errors.New("invalid hash")
}
var rsp message.IMessageElement
if group {
rsp, err := bot.Client.QueryGroupImage(int64(rand.Uint32()), hash, size)
rsp, err = bot.Client.QueryGroupImage(int64(rand.Uint32()), hash, size)
goto ok
}
rsp, err = bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size)
ok:
if err != nil {
if url != "" {
return bot.makeImageElem(map[string]string{"file": url}, group)
}
return nil, err
}
return rsp, nil
}
rsp, err := bot.Client.QueryFriendImage(int64(rand.Uint32()), hash, size)
if err != nil {
if url != "" {
return bot.makeImageElem(map[string]string{"file": url}, group)
return bot.makeImageOrVideoElem(map[string]string{"file": url}, false, group)
}
return nil, err
}

55
docs/cqhttp.md
View File

@ -71,6 +71,7 @@ Type : `image`
| `url` | - | 图片 URL |
| `cache` | `0` `1` | 只在通过网络 URL 发送时有效，表示是否使用已缓存的文件，默认 `1` |
| `id` | - | 发送秀图时的特效id，默认为40000 |
| `c` | `2` `3` | 通过网络下载图片时的线程数, 默认单线程. (在资源不支持并发时会自动处理)|
可用的特效ID:
@ -269,6 +270,20 @@ Type: `node`
}
]
````
### 短视频消息
Type: `video`
范围: **发送/接收**
参数:
| 参数名 | 类型 | 说明 |
| ------- | ------ | ------------------------------------------------|
| `file` | string | 支持http和file发送 |
| `cover` | string | 视频封面，支持http，file和base64发送，格式必须为jpg |
| `c` | `2` `3`| 通过网络下载视频时的线程数, 默认单线程. (在资源不支持并发时会自动处理)|
示例: `[CQ:image,file=file:///C:\\Users\Richard\Pictures\1.mp4]`
### XML 消息
@ -759,6 +774,46 @@ Type: `tts`
| `remain_at_all_count_for_group` | int16 | 群内所有管理当天剩余@全体成员次数 |
| `remain_at_all_count_for_uin` | int16 | BOT当天剩余@全体成员次数 |
### 下载文件到缓存目录
终结点: `/download_file`
**参数**
| 字段 | 类型 | 说明 |
| ---------- | ------ | ------------------------- |
| `url` | string | 链接地址 |
| `thread_count` | int32 | 下载线程数 |
| `headers` | string or array | 自定义请求头 |
**`headers`格式:**
字符串:
```
User-Agent=YOUR_UA[\r\n]Referer=https://www.baidu.com
```
> `[\r\n]` 为换行符, 使用http请求时请注意编码
JSON数组:
```
[
"User-Agent=YOUR_UA",
"Referer=https://www.baidu.com",
]
```
**响应数据**
| 字段 | 类型 | 说明 |
| ---------- | ---------- | ------------ |
| `file` | string | 下载文件的*绝对路径* |
> 通过这个API下载的文件能直接放入CQ码作为图片或语音发送
> 调用后会阻塞直到下载完成后才会返回数据，请注意下载大文件时的超时
### 获取用户VIP信息
终结点：`/_get_vip_info`

31
global/codec.go
View File

@ -4,31 +4,26 @@ import (
"crypto/md5"
"errors"
"fmt"
"io/ioutil"
"path"
"sync"
"github.com/Mrs4s/go-cqhttp/global/codec"
log "github.com/sirupsen/logrus"
"github.com/wdvxdr1123/go-silk/silk"
"io/ioutil"
"os/exec"
"path"
)
var codec silk.Encoder
var useCodec = true
var once sync.Once
var useSilkCodec = true
func InitCodec() {
once.Do(func() {
log.Info("正在加载silk编码器...")
err := codec.Init("data/cache", "codec")
if err != nil {
log.Error(err)
useCodec = false
useSilkCodec = false
}
})
}
func Encoder(data []byte) ([]byte, error) {
if useCodec == false {
func EncoderSilk(data []byte) ([]byte, error) {
if useSilkCodec == false {
return nil, errors.New("no silk encoder")
}
h := md5.New()
@ -43,3 +38,13 @@ func Encoder(data []byte) ([]byte, error) {
}
return slk, nil
}
func EncodeMP4(src string, dst string) error {
cmd := exec.Command("ffmpeg", "-i", src, "-y", "-c", "copy", "-map", "0", dst)
return cmd.Run()
}
func ExtractCover(src string, dst string) error {
cmd := exec.Command("ffmpeg", "-i", src, "-y", "-r", "1", "-f", "image2", dst)
return cmd.Run()
}

102
global/codec/codec.go Normal file
View File

@ -0,0 +1,102 @@
// +build linux windows darwin
// +build 386 amd64 arm
package codec
import (
"errors"
"io/ioutil"
"net/http"
"os"
"os/exec"
"path"
"runtime"
)
var (
codecDir string
encoderPath string
cachePath string
)
func downloadCodec(url string, path string) (err error) {
resp, err := http.Get(url)
if runtime.GOOS == "windows" {
path = path + ".exe"
}
if err != nil {
return
}
defer resp.Body.Close()
body, err := ioutil.ReadAll(resp.Body)
if err != nil {
return
}
err = ioutil.WriteFile(path, body, os.ModePerm)
return
}
func Init(cachePath, codecPath string) error {
appPath, err := os.Executable()
appPath = path.Dir(appPath)
if err != nil {
return err
}
cachePath = path.Join(appPath, cachePath)
codecDir = path.Join(appPath, codecPath)
if !fileExist(codecDir) {
_ = os.MkdirAll(codecDir, os.ModePerm)
}
if !fileExist(cachePath) {
_ = os.MkdirAll(cachePath, os.ModePerm)
}
encoderFile := runtime.GOOS + "-" + runtime.GOARCH + "-encoder"
encoderPath = path.Join(codecDir, encoderFile)
if !fileExist(encoderPath) {
if err = downloadCodec("https://cdn.jsdelivr.net/gh/wdvxdr1123/tosilk/codec/"+encoderFile, encoderPath); err != nil {
return errors.New("下载依赖失败")
}
}
if runtime.GOOS == "windows" {
encoderPath = encoderPath + ".exe"
}
return nil
}
func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
// 1. 写入缓存文件
rawPath := path.Join(cachePath, tempName+".wav")
err := ioutil.WriteFile(rawPath, record, os.ModePerm)
if err != nil {
return nil, err
}
defer os.Remove(rawPath)
// 2.转换pcm
pcmPath := path.Join(cachePath, tempName+".pcm")
cmd := exec.Command("ffmpeg", "-i", rawPath, "-f", "s16le", "-ar", "24000", "-ac", "1", pcmPath)
if err = cmd.Run(); err != nil {
return nil, err
}
defer os.Remove(pcmPath)
// 3. 转silk
silkPath := path.Join(cachePath, tempName+".silk")
cmd = exec.Command(encoderPath, pcmPath, silkPath, "-rate", "24000", "-quiet", "-tencent")
if err = cmd.Run(); err != nil {
return nil, err
}
if useCache == false {
defer os.Remove(silkPath)
}
return ioutil.ReadFile(silkPath)
}
// FileExist 检查文件是否存在
func fileExist(path string) bool {
if runtime.GOOS == "windows" {
path = path + ".exe"
}
_, err := os.Lstat(path)
return !os.IsNotExist(err)
}

14
global/codec/codec2.go Normal file
View File

@ -0,0 +1,14 @@
// +build !linux,!windows,!darwin
// +build !386,!amd64,!arm
package codec
import "errors"
func Init() error {
return errors.New("not support now")
}
func EncodeToSilk(record []byte, tempName string, useCache bool) ([]byte, error) {
return nil, errors.New("not support now")
}

12
global/net.go
View File

@ -99,7 +99,7 @@ func DownloadFile(url, path string, limit int64) error {
return nil
}
func DownloadFileMultiThreading(url, path string, limit int64, threadCount int) error {
func DownloadFileMultiThreading(url, path string, limit int64, threadCount int, headers map[string]string) error {
if threadCount < 2 {
return DownloadFile(url, path, limit)
}
@ -128,6 +128,11 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int)
if err != nil {
return err
}
if headers != nil {
for k, v := range headers {
req.Header.Set(k, v)
}
}
req.Header.Set("range", "bytes=0-")
resp, err := client.Do(req)
if err != nil {
@ -184,6 +189,11 @@ func DownloadFileMultiThreading(url, path string, limit int64, threadCount int)
_, _ = file.Seek(block.BeginOffset, io.SeekStart)
writer := bufio.NewWriter(file)
defer writer.Flush()
if headers != nil {
for k, v := range headers {
req.Header.Set(k, v)
}
}
req.Header.Set("range", "bytes="+strconv.FormatInt(block.BeginOffset, 10)+"-"+strconv.FormatInt(block.EndOffset, 10))
resp, err := client.Do(req)
if err != nil {

3
go.mod
View File

@ -3,7 +3,7 @@ module github.com/Mrs4s/go-cqhttp
go 1.15
require (
github.com/Mrs4s/MiraiGo v0.0.0-20210104171920-510924ba979c
github.com/Mrs4s/MiraiGo v0.0.0-20210107163750-ce4834c2ba71
github.com/dustin/go-humanize v1.0.0
github.com/gin-contrib/pprof v1.3.0
github.com/gin-gonic/gin v1.6.3
@ -20,7 +20,6 @@ require (
github.com/syndtr/goleveldb v1.0.0
github.com/t-tomalak/logrus-easy-formatter v0.0.0-20190827215021-c074f06c5816
github.com/tidwall/gjson v1.6.7
github.com/wdvxdr1123/go-silk v0.0.0-20201210140933-bcdbcb2f1093
github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189
golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad
golang.org/x/time v0.0.0-20201208040808-7e3f01d25324

10
go.sum
View File

@ -1,9 +1,9 @@
cloud.google.com/go v0.26.0/go.mod h1:aQUYkXzVsufM+DwF1aE+0xfcU+56JwCaLick0ClmMTw=
github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU=
github.com/Mrs4s/MiraiGo v0.0.0-20210104164708-e94ea61cc8e9 h1:jzaBgDPLKRuJxQO9UT/2vCFL0ScCO9IThRCa7ViMbGE=
github.com/Mrs4s/MiraiGo v0.0.0-20210104164708-e94ea61cc8e9/go.mod h1:HW2e375lCQiRwtuA/LV6ZVTsi7co1TRfBn+L5Ow77Bo=
github.com/Mrs4s/MiraiGo v0.0.0-20210104171920-510924ba979c h1:0O4TonUV7ZTawM+lwy0pNTYqngpbCrZGtYARGRvMQLw=
github.com/Mrs4s/MiraiGo v0.0.0-20210104171920-510924ba979c/go.mod h1:HW2e375lCQiRwtuA/LV6ZVTsi7co1TRfBn+L5Ow77Bo=
github.com/Mrs4s/MiraiGo v0.0.0-20210105173234-72521dec9b56 h1:U7kObHDk3RfaD81+1hA29gxHf3PfRGpX7dqR2UPNO0c=
github.com/Mrs4s/MiraiGo v0.0.0-20210105173234-72521dec9b56/go.mod h1:HW2e375lCQiRwtuA/LV6ZVTsi7co1TRfBn+L5Ow77Bo=
github.com/Mrs4s/MiraiGo v0.0.0-20210107163750-ce4834c2ba71 h1:WAVoBY4G2BC5Dyw1A45r/sVua65hsBVYcncR42hEGrk=
github.com/Mrs4s/MiraiGo v0.0.0-20210107163750-ce4834c2ba71/go.mod h1:HW2e375lCQiRwtuA/LV6ZVTsi7co1TRfBn+L5Ow77Bo=
github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU=
github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
@ -112,8 +112,6 @@ github.com/ugorji/go v1.1.7 h1:/68gy2h+1mWMrwZFeD1kQialdSzAb432dtpeJ42ovdo=
github.com/ugorji/go v1.1.7/go.mod h1:kZn38zHttfInRq0xu/PH0az30d+z6vm202qpg1oXVMw=
github.com/ugorji/go/codec v1.1.7 h1:2SvQaVZ1ouYrrKKwoSk2pzd4A9evlKJb9oTL+OaLUSs=
github.com/ugorji/go/codec v1.1.7/go.mod h1:Ax+UKWsSmolVDwsd+7N3ZtXu+yMGCf907BLYF3GoBXY=
github.com/wdvxdr1123/go-silk v0.0.0-20201210140933-bcdbcb2f1093 h1:t38EBwI2hFJz1sQJ402VqzdA3eMidkY1c3w/8z0SftA=
github.com/wdvxdr1123/go-silk v0.0.0-20201210140933-bcdbcb2f1093/go.mod h1:5q9LFlBr+yX/J8Jd/9wHdXwkkjFkNyQIS7kX2Lgx/Zs=
github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189 h1:4UJw9if55Fu3HOwbfcaQlJ27p3oeJU2JZqoeT3ITJQk=
github.com/yinghau76/go-ascii-art v0.0.0-20190517192627-e7f465a30189/go.mod h1:rIrm5geMiBhPQkdfUm8gDFi/WiHneOp1i9KjmJqc+9I=
golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=

5
server/apiAdmin.go
View File

@ -266,6 +266,8 @@ func (s *webServer) Dologin() {
log.Info("アトリは、高性能ですから!")
cli.OnDisconnected(func(bot *client.QQClient, e *client.ClientDisconnectedEvent) {
if conf.ReLogin.Enabled {
conf.ReLogin.Enabled = false
defer func() { conf.ReLogin.Enabled = true }()
var times uint = 1
for {
if cli.Online {
@ -293,6 +295,9 @@ func (s *webServer) Dologin() {
log.Fatalf("重连失败: 设备锁")
default:
log.Errorf("重连失败: %v", rsp.ErrorMessage)
if strings.Contains(rsp.ErrorMessage, "冻结") {
log.Fatalf("账号被冻结, 放弃重连")
}
cli.Disconnect()
continue
}

28
server/http.go
View File

@ -428,6 +428,33 @@ func HandleQuickOperation(s *httpServer, c *gin.Context) {
}
}
func DownloadFile(s *httpServer, c *gin.Context) {
url := getParam(c, "url")
tc, _ := strconv.Atoi(getParam(c, "thread_count"))
h, t := getParamWithType(c, "headers")
headers := map[string]string{}
if t == gjson.Null || t == gjson.String {
lines := strings.Split(h, "\r\n")
for _, sub := range lines {
str := strings.SplitN(sub, "=", 2)
if len(str) == 2 {
headers[str[0]] = str[1]
}
}
}
if t == gjson.JSON {
arr := gjson.Parse(h)
for _, sub := range arr.Array() {
str := strings.SplitN(sub.String(), "=", 2)
if len(str) == 2 {
headers[str[0]] = str[1]
}
}
}
println(url, tc, h, t)
c.JSON(200, s.bot.CQDownloadFile(url, headers, tc))
}
func OcrImage(s *httpServer, c *gin.Context) {
img := getParam(c, "image")
c.JSON(200, s.bot.CQOcrImage(img))
@ -535,6 +562,7 @@ var httpApi = map[string]func(s *httpServer, c *gin.Context){
"reload_event_filter": ReloadEventFilter,
"set_group_portrait": SetGroupPortrait,
"set_group_anonymous_ban": SetGroupAnonymousBan,
"download_file": DownloadFile,
".handle_quick_operation": HandleQuickOperation,
".ocr_image": OcrImage,
"ocr_image": OcrImage,

22
server/websocket.go
View File

@ -490,6 +490,28 @@ var wsApi = map[string]func(*coolq.CQBot, gjson.Result) coolq.MSG{
"get_msg": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetMessage(int32(p.Get("message_id").Int()))
},
"download_file": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
headers := map[string]string{}
headersToken := p.Get("headers")
if headersToken.IsArray() {
for _, sub := range headersToken.Array() {
str := strings.SplitN(sub.String(), "=", 2)
if len(str) == 2 {
headers[str[0]] = str[1]
}
}
}
if headersToken.Type == gjson.String {
lines := strings.Split(headersToken.String(), "\r\n")
for _, sub := range lines {
str := strings.SplitN(sub, "=", 2)
if len(str) == 2 {
headers[str[0]] = str[1]
}
}
}
return bot.CQDownloadFile(p.Get("url").Str, headers, int(p.Get("thread_count").Int()))
},
"get_group_honor_info": func(bot *coolq.CQBot, p gjson.Result) coolq.MSG {
return bot.CQGetGroupHonorInfo(p.Get("group_id").Int(), p.Get("type").Str)
},