Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

connector/login: remove custom LoadUserLogin

Browse Source 
Consolidate how we construct `DiscordClient` by always going through the
connector's `LoadUserLogin` method.
This commit is contained in:
Skip R
2026-02-03 20:44:25 -08:00
parent 2682175508
commit 1900993acd
1 changed files with 3 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
pkg/connector/login_generic.go
View File

@@ -49,7 +49,9 @@ type DiscordGenericLogin struct {
func (dl *DiscordGenericLogin) FinalizeCreatingLogin(ctx context.Context, token string) (*bridgev2.UserLogin, error) { func (dl *DiscordGenericLogin) FinalizeCreatingLogin(ctx context.Context, token string) (*bridgev2.UserLogin, error) {
log := zerolog.Ctx(ctx).With().Str("action", "finalize login").Logger() log := zerolog.Ctx(ctx).With().Str("action", "finalize login").Logger()
log.Info().Msg("Creating session with provided token") // TODO we don't need an entire discordgo session for this as we're just
// interested in /users/@me
log.Info().Msg("Creating initial session with provided token")
session, err := NewDiscordSession(ctx, token) session, err := NewDiscordSession(ctx, token)
if err != nil { if err != nil {
return nil, fmt.Errorf("couldn't create discord session: %w", err) return nil, fmt.Errorf("couldn't create discord session: %w", err)
@@ -71,15 +73,6 @@ func (dl *DiscordGenericLogin) FinalizeCreatingLogin(ctx context.Context, token
HeartbeatSession: session.HeartbeatSession, HeartbeatSession: session.HeartbeatSession,
}, },
}, &bridgev2.NewLoginParams{ }, &bridgev2.NewLoginParams{
LoadUserLogin: func(ctx context.Context, login *bridgev2.UserLogin) error {
// (mautrix will instead call `LoadUserLogin` on the connector if we don't provide this.)
login.Client = &DiscordClient{
connector: dl.connector,
UserLogin: login,
Session: session,
}
return nil
},
DeleteOnConflict: true, DeleteOnConflict: true,
}) })
if err != nil { if err != nil {