wow that took awhile
This commit is contained in:
@@ -7,6 +7,7 @@ import (
|
||||
|
||||
"github.com/42wim/matterbridge/bridge"
|
||||
"github.com/42wim/matterbridge/bridge/config"
|
||||
"github.com/42wim/matterbridge/bridge/jackbox"
|
||||
"github.com/42wim/matterbridge/gateway/samechannel"
|
||||
"github.com/sirupsen/logrus"
|
||||
)
|
||||
@@ -19,8 +20,10 @@ type Router struct {
|
||||
Gateways map[string]*Gateway
|
||||
Message chan config.Message
|
||||
MattermostPlugin chan config.Message
|
||||
JackboxManager *jackbox.Manager
|
||||
|
||||
logger *logrus.Entry
|
||||
logger *logrus.Entry
|
||||
rootLogger *logrus.Logger
|
||||
}
|
||||
|
||||
// NewRouter initializes a new Matterbridge router for the specified configuration and
|
||||
@@ -35,6 +38,15 @@ func NewRouter(rootLogger *logrus.Logger, cfg config.Config, bridgeMap map[strin
|
||||
MattermostPlugin: make(chan config.Message),
|
||||
Gateways: make(map[string]*Gateway),
|
||||
logger: logger,
|
||||
rootLogger: rootLogger,
|
||||
}
|
||||
|
||||
// Initialize Jackbox manager
|
||||
jackboxLogger := rootLogger.WithFields(logrus.Fields{"prefix": "jackbox"})
|
||||
r.JackboxManager = jackbox.NewManager(cfg, jackboxLogger)
|
||||
if err := r.JackboxManager.Initialize(); err != nil {
|
||||
logger.Errorf("Failed to initialize Jackbox integration: %v", err)
|
||||
// Don't fail startup if Jackbox integration fails
|
||||
}
|
||||
sgw := samechannel.New(cfg)
|
||||
gwconfigs := append(sgw.GetConfig(), cfg.BridgeValues().Gateway...)
|
||||
@@ -71,6 +83,11 @@ func (r *Router) Start() error {
|
||||
m[br.Account] = br
|
||||
}
|
||||
}
|
||||
// Inject Jackbox client into bridges if enabled
|
||||
if r.JackboxManager.IsEnabled() {
|
||||
r.injectJackboxClient(m)
|
||||
}
|
||||
|
||||
for _, br := range m {
|
||||
r.logger.Infof("Starting bridge: %s ", br.Account)
|
||||
err := br.Connect()
|
||||
@@ -99,6 +116,14 @@ func (r *Router) Start() error {
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Start webhook server if Jackbox is enabled
|
||||
if r.JackboxManager.IsEnabled() {
|
||||
if err := r.JackboxManager.StartWebhookServer(r.broadcastJackboxMessage); err != nil {
|
||||
r.logger.Errorf("Failed to start Jackbox webhook server: %v", err)
|
||||
}
|
||||
}
|
||||
|
||||
go r.handleReceive()
|
||||
//go r.updateChannelMembers()
|
||||
return nil
|
||||
@@ -191,3 +216,49 @@ func (r *Router) updateChannelMembers() {
|
||||
time.Sleep(time.Minute)
|
||||
}
|
||||
}
|
||||
|
||||
// injectJackboxClient injects the Jackbox client into all bridges
|
||||
func (r *Router) injectJackboxClient(bridges map[string]*bridge.Bridge) {
|
||||
client := r.JackboxManager.GetClient()
|
||||
if client == nil {
|
||||
return
|
||||
}
|
||||
|
||||
for _, br := range bridges {
|
||||
// Type assert to inject the client into supported bridge types
|
||||
switch bridger := br.Bridger.(type) {
|
||||
case interface{ SetJackboxClient(*jackbox.Client) }:
|
||||
bridger.SetJackboxClient(client)
|
||||
r.logger.Debugf("Injected Jackbox client into bridge %s", br.Account)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// broadcastJackboxMessage broadcasts a message from Jackbox to all connected bridges
|
||||
func (r *Router) broadcastJackboxMessage(message string) {
|
||||
// Check if Jackbox announcements are muted
|
||||
if r.JackboxManager != nil && r.JackboxManager.IsMuted() {
|
||||
r.logger.Debugf("Jackbox message suppressed (muted): %s", message)
|
||||
return
|
||||
}
|
||||
|
||||
r.logger.Infof("Broadcasting Jackbox message: %s", message)
|
||||
|
||||
// Send message to all gateways
|
||||
for _, gw := range r.Gateways {
|
||||
for _, br := range gw.Bridges {
|
||||
// Send to each bridge
|
||||
msg := config.Message{
|
||||
Text: " " + message, // Add space before message for proper formatting
|
||||
Username: "Jackbox",
|
||||
Account: "jackbox",
|
||||
Event: config.EventUserAction,
|
||||
}
|
||||
|
||||
// Send directly to the bridge
|
||||
if _, err := br.Send(msg); err != nil {
|
||||
r.logger.Errorf("Failed to send Jackbox message to %s: %v", br.Account, err)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user