From 86544bc7afaf2bfbe3e0481a7edc3be50d95c054 Mon Sep 17 00:00:00 2001
From: Skip R <tinyslices@gmail.com>
Date: Fri, 9 Jan 2026 17:08:33 -0800
Subject: [PATCH] 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        |  4 ++--
 pkg/connector/dbmeta.go        | 10 +++-------
 pkg/connector/login_generic.go |  4 +++-
 pkg/discordid/dbmeta.go        | 24 ++++++++++++++++++++++++
 4 files changed, 32 insertions(+), 10 deletions(-)
 create mode 100644 pkg/discordid/dbmeta.go

diff --git a/pkg/connector/client.go b/pkg/connector/client.go
index 9b02caf..8bf9925 100644
--- a/pkg/connector/client.go
+++ b/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)
 
diff --git a/pkg/connector/dbmeta.go b/pkg/connector/dbmeta.go
index 53537f1..d4ecb85 100644
--- a/pkg/connector/dbmeta.go
+++ b/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{}
 		},
 	}
 }
diff --git a/pkg/connector/login_generic.go b/pkg/connector/login_generic.go
index edda578..ba206ee 100644
--- a/pkg/connector/login_generic.go
+++ b/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,
 		},
diff --git a/pkg/discordid/dbmeta.go b/pkg/discordid/dbmeta.go
new file mode 100644
index 0000000..2e8131b
--- /dev/null
+++ b/pkg/discordid/dbmeta.go
@@ -0,0 +1,24 @@
+// mautrix-discord - A Matrix-Discord puppeting bridge.
+// Copyright (C) 2026 Tulir Asokan
+//
+// This program is free software: you can redistribute it and/or modify
+// it under the terms of the GNU Affero General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// This program is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+// GNU Affero General Public License for more details.
+//
+// You should have received a copy of the GNU Affero General Public License
+// along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+package discordid
+
+import "github.com/bwmarrin/discordgo"
+
+type UserLoginMetadata struct {
+	Token            string                     `json:"token"`
+	HeartbeatSession discordgo.HeartbeatSession `json:"heartbeat_session"`
+}