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

connector/client: refactor guild subscription, push log onto context

Browse Source
This commit is contained in:
Skip R
2026-02-11 19:03:17 -08:00
parent 07ba87f9d6
commit 40ae884e7f
2 changed files with 20 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
pkg/connector/client.go
View File

@@ -278,8 +278,8 @@ func (d *DiscordClient) syncGuildSpace(_ context.Context, guild *discordgo.Guild
} }
// bridgedGuildIDs returns a set of guild IDs that should be bridged. Note that // bridgedGuildIDs returns a set of guild IDs that should be bridged. Note that
// presence in the returned set does not imply that the rooms for the guild have // presence in the returned set does not imply anything about the corresponding
// already been created. // portals and rooms.
func (d *DiscordClient) bridgedGuildIDs() map[string]struct{} { func (d *DiscordClient) bridgedGuildIDs() map[string]struct{} {
meta := d.UserLogin.Metadata.(*discordid.UserLoginMetadata) meta := d.UserLogin.Metadata.(*discordid.UserLoginMetadata)
bridgingGuildIDs := map[string]struct{}{} bridgingGuildIDs := map[string]struct{}{}
@@ -332,7 +332,11 @@ func (d *DiscordClient) deleteGuildPortalSpace(ctx context.Context, guildID stri
} }
func (d *DiscordClient) bridgeGuild(ctx context.Context, guildID string) error { func (d *DiscordClient) bridgeGuild(ctx context.Context, guildID string) error {
log := zerolog.Ctx(ctx) log := zerolog.Ctx(ctx).With().
Str("guild_id", guildID).
Str("action", "bridge guild").
Logger()
ctx = log.WithContext(ctx)
guild, err := d.Session.State.Guild(guildID) guild, err := d.Session.State.Guild(guildID)
if errors.Is(err, discordgo.ErrStateNotFound) || guild == nil { if errors.Is(err, discordgo.ErrStateNotFound) || guild == nil {
@@ -365,18 +369,24 @@ func (d *DiscordClient) bridgeGuild(ctx context.Context, guildID string) error {
d.syncChannel(ctx, guildCh) d.syncChannel(ctx, guildCh)
} }
log.Debug().Msg("Subscribing to guild after bridging") d.subscribeGuild(ctx, guildID)
err = d.Session.SubscribeGuild(discordgo.GuildSubscribeData{
GuildID: guild.ID, return nil
}
func (d *DiscordClient) subscribeGuild(ctx context.Context, guildID string) {
log := zerolog.Ctx(ctx)
log.Debug().Msg("Subscribing to guild")
err := d.Session.SubscribeGuild(discordgo.GuildSubscribeData{
GuildID: guildID,
Typing: true, Typing: true,
Activities: true, Activities: true,
Threads: true, Threads: true,
}) })
if err != nil { if err != nil {
log.Warn().Err(err).Msg("Failed to subscribe to guild; proceeding") log.Warn().Err(err).Msg("Failed to subscribe to guild, proceeding")
} }
return nil
} }
func (d *DiscordClient) simpleDownload(ctx context.Context, url, thing string) ([]byte, error) { func (d *DiscordClient) simpleDownload(ctx context.Context, url, thing string) ([]byte, error) {

8
pkg/connector/provisioning.go
View File

@@ -215,13 +215,7 @@ func (p *ProvisioningAPI) bridgeGuild(w http.ResponseWriter, r *http.Request, lo
return return
} }
bridgeCtx := login.Log.With(). go client.bridgeGuild(p.connector.Bridge.BackgroundCtx, guildID)
Str("component", "provisioning").
Str("action", "bridge guild").
Str("guild_id", guildID).
Logger().
WithContext(context.Background())
go client.bridgeGuild(bridgeCtx, guildID)
responseStatus := 201 responseStatus := 201
if alreadyBridged { if alreadyBridged {