relocate dbmeta models to discordid

While we're about to introduce more metadata structs, it seems like
mautrix-slack keeps these in slackid, so let's keep ours in discordid.

pkg/connector/client.go

@@ -49,7 +49,7 @@ type DiscordClient struct {
 }
 
 func (d *DiscordConnector) LoadUserLogin(ctx context.Context, login *bridgev2.UserLogin) error {
-	meta := login.Metadata.(*UserLoginMetadata)
+	meta := login.Metadata.(*discordid.UserLoginMetadata)
 
 	session, err := NewDiscordSession(ctx, meta.Token)
 	login.Save(ctx)
@@ -77,7 +77,7 @@ var _ bridgev2.NetworkAPI = (*DiscordClient)(nil)
 //
 // nil may be passed for meta, especially during provisioning where we need to
 // connect to the Discord gateway, but don't have a UserLogin yet.
-func (d *DiscordClient) SetUp(ctx context.Context, meta *UserLoginMetadata) {
+func (d *DiscordClient) SetUp(ctx context.Context, meta *discordid.UserLoginMetadata) {
 	// TODO: Turn this into a factory function like `NewDiscordClient`.
 	log := zerolog.Ctx(ctx)
 

pkg/connector/dbmeta.go

@@ -17,19 +17,15 @@
 package connector
 
 import (
-	"github.com/bwmarrin/discordgo"
 	"maunium.net/go/mautrix/bridgev2/database"
-)
 
-type UserLoginMetadata struct {
-	Token            string                     `json:"token"`
-	HeartbeatSession discordgo.HeartbeatSession `json:"heartbeat_session"`
-}
+	"go.mau.fi/mautrix-discord/pkg/discordid"
+)
 
 func (d *DiscordConnector) GetDBMetaTypes() database.MetaTypes {
 	return database.MetaTypes{
 		UserLogin: func() any {
-			return &UserLoginMetadata{}
+			return &discordid.UserLoginMetadata{}
 		},
 	}
 }

pkg/connector/login_generic.go

@@ -25,6 +25,8 @@ import (
 	"maunium.net/go/mautrix/bridgev2"
 	"maunium.net/go/mautrix/bridgev2/database"
 	"maunium.net/go/mautrix/bridgev2/networkid"
+
+	"go.mau.fi/mautrix-discord/pkg/discordid"
 )
 
 // DiscordGenericLogin is embedded within each struct that implements
@@ -70,7 +72,7 @@ func (dl *DiscordGenericLogin) FinalizeCreatingLogin(ctx context.Context, token
 	dl.Session = session
 	ul, err := dl.User.NewLogin(ctx, &database.UserLogin{
 		ID: networkid.UserLoginID(user.ID),
-		Metadata: &UserLoginMetadata{
+		Metadata: &discordid.UserLoginMetadata{
 			Token:            token,
 			HeartbeatSession: session.HeartbeatSession,
 		},