summaryrefslogtreecommitdiff
path: root/danmaku
diff options
context:
space:
mode:
Diffstat (limited to 'danmaku')
-rw-r--r--danmaku/client.go4
-rw-r--r--danmaku/dmpkg/auth.go16
2 files changed, 10 insertions, 10 deletions
diff --git a/danmaku/client.go b/danmaku/client.go
index c74a449..3862154 100644
--- a/danmaku/client.go
+++ b/danmaku/client.go
@@ -9,8 +9,8 @@ package danmaku
import (
"context"
"fmt"
- "github.com/keuin/slbr/bilibili"
"github.com/keuin/slbr/danmaku/dmpkg"
+ "github.com/keuin/slbr/types"
"nhooyr.io/websocket"
)
@@ -87,7 +87,7 @@ func (d *DanmakuClient) Disconnect() error {
return ws.Close(websocket.StatusInternalError, "disconnected")
}
-func (d *DanmakuClient) Authenticate(roomId bilibili.RoomId, authKey string) error {
+func (d *DanmakuClient) Authenticate(roomId types.RoomId, authKey string) error {
pkg := dmpkg.NewAuth(dmpkg.ProtoPlainJson, roomId, authKey)
data, err := pkg.Marshal()
if err != nil {
diff --git a/danmaku/dmpkg/auth.go b/danmaku/dmpkg/auth.go
index bb66f1d..b6a90d3 100644
--- a/danmaku/dmpkg/auth.go
+++ b/danmaku/dmpkg/auth.go
@@ -8,20 +8,20 @@ package dmpkg
import (
"encoding/json"
"fmt"
- "github.com/keuin/slbr/bilibili"
+ "github.com/keuin/slbr/types"
)
type authInfo struct {
- UID uint64 `json:"uid"`
- RoomId bilibili.RoomId `json:"roomid"`
- ProtoVer int `json:"protover"`
- Platform string `json:"platform"`
- Type int `json:"type"`
- Key string `json:"key"`
+ UID uint64 `json:"uid"`
+ RoomId types.RoomId `json:"roomid"`
+ ProtoVer int `json:"protover"`
+ Platform string `json:"platform"`
+ Type int `json:"type"`
+ Key string `json:"key"`
}
// NewAuth creates a new authentication exchange.
-func NewAuth(protocol ProtocolVer, roomId bilibili.RoomId, authKey string) (exc DanmakuExchange) {
+func NewAuth(protocol ProtocolVer, roomId types.RoomId, authKey string) (exc DanmakuExchange) {
exc, _ = NewPlainExchange(OpConnect, authInfo{
UID: UidGuest,
RoomId: roomId,