From 1900993acd53f364ddbfa836dbad8271c4baa54c Mon Sep 17 00:00:00 2001 From: Skip R Date: Tue, 3 Feb 2026 20:44:25 -0800 Subject: [PATCH] connector/login: remove custom `LoadUserLogin` Consolidate how we construct `DiscordClient` by always going through the connector's `LoadUserLogin` method. --- pkg/connector/login_generic.go | 13 +++---------- 1 file changed, 3 insertions(+), 10 deletions(-) diff --git a/pkg/connector/login_generic.go b/pkg/connector/login_generic.go index 9719cd5..380ea52 100644 --- a/pkg/connector/login_generic.go +++ b/pkg/connector/login_generic.go @@ -49,7 +49,9 @@ type DiscordGenericLogin struct { func (dl *DiscordGenericLogin) FinalizeCreatingLogin(ctx context.Context, token string) (*bridgev2.UserLogin, error) { 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) if err != nil { 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, }, }, &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, }) if err != nil {