diff --git a/coolq/api.go b/coolq/api.go index d0502e6..32e5fdf 100644 --- a/coolq/api.go +++ b/coolq/api.go @@ -1324,9 +1324,9 @@ func (bot *CQBot) CQGetEssenceMessageList(groupCode int64) MSG { "sender_time": m.SenderTime, "operator_time": m.AddDigestTime, "operator_nick": m.AddDigestNick, + "sender_id": m.SenderUin, + "operator_id": m.AddDigestUin, } - msg["sender_id"], _ = strconv.ParseUint(m.SenderUin, 10, 64) - msg["operator_id"], _ = strconv.ParseUint(m.AddDigestUin, 10, 64) msg["message_id"] = toGlobalID(groupCode, int32(m.MessageID)) list = append(list, msg) } diff --git a/go.mod b/go.mod index 35c8430..d0fb6c6 100644 --- a/go.mod +++ b/go.mod @@ -5,7 +5,7 @@ go 1.16 require ( github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f github.com/Microsoft/go-winio v0.5.0 - github.com/Mrs4s/MiraiGo v0.0.0-20210718145418-bf6cfc84c5a7 + github.com/Mrs4s/MiraiGo v0.0.0-20210726103104-1d68826cef0e github.com/dustin/go-humanize v1.0.0 github.com/gorilla/websocket v1.4.2 github.com/guonaihong/gout v0.2.1 @@ -24,12 +24,10 @@ require ( github.com/tidwall/gjson v1.8.1 github.com/tuotoo/qrcode v0.0.0-20190222102259-ac9c44189bf2 github.com/wdvxdr1123/go-silk v0.0.0-20210316130616-d47b553def60 - github.com/willf/bitset v1.2.0 // indirect + github.com/bits-and-blooms/bitset v1.2.0 // indirect golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e - golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d // indirect golang.org/x/term v0.0.0-20210615171337-6886f2dfbf5b + golang.org/x/text v0.3.6 // indirect golang.org/x/time v0.0.0-20210611083556-38a9dc6acbc6 gopkg.in/yaml.v3 v3.0.0-20210107192922-496545a6307b ) - -replace github.com/willf/bitset v1.2.0 => github.com/bits-and-blooms/bitset v1.2.0 diff --git a/go.sum b/go.sum index 4a762b7..585c4b9 100644 --- a/go.sum +++ b/go.sum @@ -4,8 +4,8 @@ github.com/Baozisoftware/qrcode-terminal-go v0.0.0-20170407111555-c0650d8dff0f/g github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03qcyfWMU= github.com/Microsoft/go-winio v0.5.0 h1:Elr9Wn+sGKPlkaBvwu4mTrxtmOp3F3yV9qhaHbXGjwU= github.com/Microsoft/go-winio v0.5.0/go.mod h1:JPGBdM1cNvN/6ISo+n8V5iA4v8pBzdOpzfwIujj1a84= -github.com/Mrs4s/MiraiGo v0.0.0-20210718145418-bf6cfc84c5a7 h1:0bCImF0VJEOkAYlMgrx+Xnfi93DIeJA5ooYe8XrJbn4= -github.com/Mrs4s/MiraiGo v0.0.0-20210718145418-bf6cfc84c5a7/go.mod h1:CPaznIPn415uQqxJgjyMHLqGLkvLS6R6+bkW3/fe08Q= +github.com/Mrs4s/MiraiGo v0.0.0-20210726103104-1d68826cef0e h1:PgFshw1L5TVdiDRLgr/bSotPGaGXYzbtn5cDBBvpL6U= +github.com/Mrs4s/MiraiGo v0.0.0-20210726103104-1d68826cef0e/go.mod h1:CPaznIPn415uQqxJgjyMHLqGLkvLS6R6+bkW3/fe08Q= github.com/bits-and-blooms/bitset v1.2.0 h1:Kn4yilvwNtMACtf1eYDlG8H77R07mZSPbMjLyS07ChA= github.com/bits-and-blooms/bitset v1.2.0/go.mod h1:gIdJ4wp64HaoK2YrL1Q5/N7Y16edYb8uY+O0FJTyyDA= github.com/census-instrumentation/opencensus-proto v0.2.1/go.mod h1:f6KPmirojxKA12rnyqOA5BBL4O983OfeGPqjHWSTneU= @@ -137,8 +137,6 @@ golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACk golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e h1:gsTQYXdTw2Gq7RBsWvlQ91b+aEQ6bXFUngBGuR8sPpI= golang.org/x/crypto v0.0.0-20210616213533-5ff15b29337e/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc= golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA= -golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d h1:RNPAfi2nHY7C2srAV8A49jpsYr0ADedCk1wq6fTMTvs= -golang.org/x/image v0.0.0-20210628002857-a66eb6448b8d/go.mod h1:023OzeP/+EPmXeapQh35lcL3II3LrY8Ic+EFFKVhULM= golang.org/x/lint v0.0.0-20181026193005-c67002cb31c3/go.mod h1:UVdnD1Gm6xHRNCYTkRU2/jEulfH38KcIWyp/GAMgvoE= golang.org/x/lint v0.0.0-20190227174305-5b3e6a55c961/go.mod h1:wehouNa3lNwaWXcvxsM5YxQ5yQlVC4a0KAMCusXpPoU= golang.org/x/lint v0.0.0-20190313153728-d0100b6bd8b3/go.mod h1:6SW0HCj/g11FgYtHlgUYUwCkIfeOF89ocIRzGO/8vkc= diff --git a/scripts/bootstrap b/scripts/bootstrap index bb0d671..9868a9e 100644 --- a/scripts/bootstrap +++ b/scripts/bootstrap @@ -1,10 +1,6 @@ #!/bin/sh echo "Start GOCQHTTP~~~" -unset http_proxy -unset https_proxy -mkdir /mnt/ -rm -rf /mnt/data/leveldb -cp -f config.yml /mnt/config.yml -cp -f device.json /mnt/device.json -./go-cqhttp -w="/mnt/" faststart +cp -f config.yml /tmp/config.yml +cp -f device.json /tmp/device.json +./go-cqhttp -w="/tmp/" faststart