From b6eb2c0da4e653c6fdd278bcbdcd55ec376cd481 Mon Sep 17 00:00:00 2001
From: Keuin <keuinx@gmail.com>
Date: Sun, 2 Jul 2023 14:48:47 +0800
Subject: Refactor: move RoomId type to the correct package. Type all room ID
 usages.

---
 danmaku/client.go     |  4 ++--
 danmaku/dmpkg/auth.go | 18 +++++++++---------
 2 files changed, 11 insertions(+), 11 deletions(-)

(limited to 'danmaku')

diff --git a/danmaku/client.go b/danmaku/client.go
index b785e23..c74a449 100644
--- a/danmaku/client.go
+++ b/danmaku/client.go
@@ -9,7 +9,7 @@ package danmaku
 import (
 	"context"
 	"fmt"
-	"github.com/keuin/slbr/common"
+	"github.com/keuin/slbr/bilibili"
 	"github.com/keuin/slbr/danmaku/dmpkg"
 
 	"nhooyr.io/websocket"
@@ -87,7 +87,7 @@ func (d *DanmakuClient) Disconnect() error {
 	return ws.Close(websocket.StatusInternalError, "disconnected")
 }
 
-func (d *DanmakuClient) Authenticate(roomId common.RoomId, authKey string) error {
+func (d *DanmakuClient) Authenticate(roomId bilibili.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 5caf868..bb66f1d 100644
--- a/danmaku/dmpkg/auth.go
+++ b/danmaku/dmpkg/auth.go
@@ -8,23 +8,23 @@ package dmpkg
 import (
 	"encoding/json"
 	"fmt"
-	"github.com/keuin/slbr/common"
+	"github.com/keuin/slbr/bilibili"
 )
 
 type authInfo struct {
-	UID      uint64 `json:"uid"`
-	RoomId   uint64 `json:"roomid"`
-	ProtoVer int    `json:"protover"`
-	Platform string `json:"platform"`
-	Type     int    `json:"type"`
-	Key      string `json:"key"`
+	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"`
 }
 
 // NewAuth creates a new authentication exchange.
-func NewAuth(protocol ProtocolVer, roomId common.RoomId, authKey string) (exc DanmakuExchange) {
+func NewAuth(protocol ProtocolVer, roomId bilibili.RoomId, authKey string) (exc DanmakuExchange) {
 	exc, _ = NewPlainExchange(OpConnect, authInfo{
 		UID:      UidGuest,
-		RoomId:   uint64(roomId),
+		RoomId:   roomId,
 		ProtoVer: int(protocol),
 		Platform: PlatformWeb,
 		Type:     AuthTypeDefault,
-- 
cgit v1.2.3