From 602435bc373f739fd987ae3b1368e79131a6da97 Mon Sep 17 00:00:00 2001 From: qydysky Date: Tue, 10 May 2022 19:15:12 +0800 Subject: [PATCH] =?utf8?q?ws=E8=B6=85=E7=AE=A1=E8=AD=A6=E5=91=8A?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- Reply/Msg.go | 1 + Reply/Reply.go | 16 ++++++++++++++++ Reply/tts.go | 3 ++- Reply/ws_msg/WARNING.go | 11 +++++++++++ demo/go.mod | 2 +- demo/go.sum | 4 ++++ go.mod | 2 +- go.sum | 4 ++++ 8 files changed, 40 insertions(+), 3 deletions(-) create mode 100644 Reply/ws_msg/WARNING.go diff --git a/Reply/Msg.go b/Reply/Msg.go index f77bdd6..0cf386f 100644 --- a/Reply/Msg.go +++ b/Reply/Msg.go @@ -102,6 +102,7 @@ var Msg_map = map[string]func(replyF, string){ "VIDEO_CONNECTION_JOIN_START": replyF.video_connection_join_start, //开始了与某人的视频连线 "VIDEO_CONNECTION_JOIN_END": replyF.video_connection_join_end, //结束了与某人的视频连线 "VIDEO_CONNECTION_MSG": replyF.video_connection_msg, //视频连线状态改变 + "WARNING": replyF.warning, //超管警告 } //屏蔽不需要的消息 diff --git a/Reply/Reply.go b/Reply/Reply.go index 84b80dd..891316e 100644 --- a/Reply/Reply.go +++ b/Reply/Reply.go @@ -15,6 +15,7 @@ import ( send "github.com/qydysky/bili_danmu/Send" p "github.com/qydysky/part" mq "github.com/qydysky/part/msgq" + pstrings "github.com/qydysky/part/strings" ) var reply_log = c.C.Log.Base(`Reply`) @@ -471,6 +472,21 @@ func (replyF) room_change(s string) { msglog.Base_add("房").L(`I: `, sh...) } +//Msg-超管警告 +func (replyF) warning(s string) { + var type_item ws_msg.WARNING + + if e := json.Unmarshal([]byte(s), &type_item); e != nil { + msglog.L(`E: `, e) + } + + s, _ = pstrings.UnescapeUnicode(type_item.Msg) + + Gui_show(s, "0room") + + msglog.Base_add("房").L(`I: `, s) +} + //Msg-开始了视频连线 func (replyF) video_connection_join_start(s string) { msglog := msglog.Base_add("房").Log_show_control(false) diff --git a/Reply/tts.go b/Reply/tts.go index c4006c1..9e88fdd 100644 --- a/Reply/tts.go +++ b/Reply/tts.go @@ -20,6 +20,7 @@ import ( limit "github.com/qydysky/part/limit" msgq "github.com/qydysky/part/msgq" reqf "github.com/qydysky/part/reqf" + pstrings "github.com/qydysky/part/strings" ws "github.com/qydysky/part/websocket" ) @@ -226,7 +227,7 @@ func youdao(msg string) error { `q`: msg, `langType`: "zh-CHS", `youdaoappKey`: youdaoId, - `salt`: p.Stringf().Rand(1, 8), + `salt`: pstrings.Rand(1, 8), } postS string ) diff --git a/Reply/ws_msg/WARNING.go b/Reply/ws_msg/WARNING.go new file mode 100644 index 0000000..b2034bf --- /dev/null +++ b/Reply/ws_msg/WARNING.go @@ -0,0 +1,11 @@ +package part + +type WARNING struct { + Cmd string `json:"cmd"` + Msg string `json:"msg"` + Roomid int `json:"roomid"` +} + +/* +{"cmd":"WARNING","msg":"\u865a\u62df\u5f62\u8c61\u4e0d\u9002\u5b9c\uff0c\u8bf7\u7acb\u5373\u8c03\u6574","roomid":22259479} +*/ diff --git a/demo/go.mod b/demo/go.mod index 0be9cf9..c18768a 100644 --- a/demo/go.mod +++ b/demo/go.mod @@ -4,7 +4,7 @@ go 1.14 require ( github.com/qydysky/bili_danmu v0.5.9 - github.com/qydysky/part v0.8.0 // indirect + github.com/qydysky/part v0.9.1 // indirect github.com/stretchr/testify v1.7.1 // indirect ) diff --git a/demo/go.sum b/demo/go.sum index 20f6b3b..f54f357 100644 --- a/demo/go.sum +++ b/demo/go.sum @@ -44,6 +44,10 @@ github.com/qydysky/part v0.7.1 h1:ddbtNCE594hbcQYlnen3xBpJXRA835IZghZpL7LKZjA= github.com/qydysky/part v0.7.1/go.mod h1:43opuciW71sZvOR67kye50jgMDSDrn/t6+LefNdlXPg= github.com/qydysky/part v0.8.0 h1:D+vXHW65XS2GOSg9lwFAXRWbS3ymjHKaZW+OpRisenY= github.com/qydysky/part v0.8.0/go.mod h1:43opuciW71sZvOR67kye50jgMDSDrn/t6+LefNdlXPg= +github.com/qydysky/part v0.9.0 h1:mEikgorOZUgN/l9WpJW2pjEv/wd5Ddx7L3gvj+DT7Xs= +github.com/qydysky/part v0.9.0/go.mod h1:43opuciW71sZvOR67kye50jgMDSDrn/t6+LefNdlXPg= +github.com/qydysky/part v0.9.1 h1:E38l3ChASeBKQwRyOrJGCzeYYLmFwf1Gh/knCvi0s3k= +github.com/qydysky/part v0.9.1/go.mod h1:43opuciW71sZvOR67kye50jgMDSDrn/t6+LefNdlXPg= github.com/shirou/gopsutil v3.20.12+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= github.com/shirou/gopsutil v3.21.5+incompatible h1:OloQyEerMi7JUrXiNzy8wQ5XN+baemxSl12QgIzt0jc= github.com/shirou/gopsutil v3.21.5+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= diff --git a/go.mod b/go.mod index b8da272..aca1751 100644 --- a/go.mod +++ b/go.mod @@ -12,7 +12,7 @@ require ( github.com/mdp/qrterminal/v3 v3.0.0 github.com/miekg/dns v1.1.42 // indirect github.com/mitchellh/mapstructure v1.4.1 // indirect - github.com/qydysky/part v0.8.0 + github.com/qydysky/part v0.9.1 github.com/shirou/gopsutil v3.21.5+incompatible // indirect github.com/skip2/go-qrcode v0.0.0-20200617195104-da1b6568686e github.com/skratchdot/open-golang v0.0.0-20200116055534-eef842397966 diff --git a/go.sum b/go.sum index c336bf1..9193053 100644 --- a/go.sum +++ b/go.sum @@ -98,6 +98,10 @@ github.com/qydysky/part v0.7.1 h1:ddbtNCE594hbcQYlnen3xBpJXRA835IZghZpL7LKZjA= github.com/qydysky/part v0.7.1/go.mod h1:43opuciW71sZvOR67kye50jgMDSDrn/t6+LefNdlXPg= github.com/qydysky/part v0.8.0 h1:D+vXHW65XS2GOSg9lwFAXRWbS3ymjHKaZW+OpRisenY= github.com/qydysky/part v0.8.0/go.mod h1:43opuciW71sZvOR67kye50jgMDSDrn/t6+LefNdlXPg= +github.com/qydysky/part v0.9.0 h1:mEikgorOZUgN/l9WpJW2pjEv/wd5Ddx7L3gvj+DT7Xs= +github.com/qydysky/part v0.9.0/go.mod h1:43opuciW71sZvOR67kye50jgMDSDrn/t6+LefNdlXPg= +github.com/qydysky/part v0.9.1 h1:E38l3ChASeBKQwRyOrJGCzeYYLmFwf1Gh/knCvi0s3k= +github.com/qydysky/part v0.9.1/go.mod h1:43opuciW71sZvOR67kye50jgMDSDrn/t6+LefNdlXPg= github.com/qydysky/part/msgq v0.0.0-20201213120821-f36e49c32bba h1:1ew9dRpc0Rux0WkWeT/4AE15ynYWmL2D7onJEJIFOB8= github.com/qydysky/part/msgq v0.0.0-20201213120821-f36e49c32bba/go.mod h1:w32TkJNVtTJd4LOS09cq+4uYG6itcN2vsqw+slp44Rg= github.com/shirou/gopsutil v2.20.7+incompatible/go.mod h1:5b4v6he4MtMOwMlS0TUMTu2PcXUg8+E1lC7eC3UO/RA= -- 2.39.2