connector: share session construction logic

So we can't forget to set up the logging handler.
This commit is contained in:
Skip R
2026-01-07 18:50:02 -08:00
parent 4314aa9206
commit 8a28fa0f95
4 changed files with 47 additions and 11 deletions

44
pkg/connector/session.go Normal file
View File

@@ -0,0 +1,44 @@
// mautrix-discord - A Matrix-Discord puppeting bridge.
// Copyright (C) 2024 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 connector
import (
"context"
"fmt"
"strings"
"github.com/bwmarrin/discordgo"
"github.com/rs/zerolog"
)
func NewDiscordSession(ctx context.Context, token string) (*discordgo.Session, error) {
log := zerolog.Ctx(ctx)
session, err := discordgo.New(token)
if err != nil {
return nil, fmt.Errorf("couldn't create discord session: %w", err)
}
// Set up logging.
session.LogLevel = discordgo.LogInformational
session.Logger = func(msgL, caller int, format string, a ...any) {
// FIXME(skip): Hook up zerolog properly.
log.Debug().Str("component", "discordgo").Msgf(strings.TrimSpace(format), a...) // zerolog-allow-msgf
}
return session, nil
}