DBT/clawgo
1
0
Fork 0
mirror of https://github.com/YspCoder/clawgo.git synced 2026-04-15 00:27:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix loop

Browse Source
This commit is contained in:
lpf
2026-02-21 11:45:40 +08:00
parent 6724d0e10f
commit cbf7df67d1
6 changed files with 124 additions and 1244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
pkg/channels/discord.go
View File

@@ -1,6 +1,9 @@
package channels
import (
"clawgo/pkg/bus"
"clawgo/pkg/config"
"clawgo/pkg/logger"
"context"
"fmt"
"io"
@@ -8,20 +11,14 @@ import (
"os"
"path/filepath"
"strings"
"time"
"clawgo/pkg/bus"
"clawgo/pkg/config"
"clawgo/pkg/logger"
"clawgo/pkg/voice"
"github.com/bwmarrin/discordgo"
)
type DiscordChannel struct {
*BaseChannel
session *discordgo.Session
config config.DiscordConfig
transcriber *voice.GroqTranscriber
session *discordgo.Session
config config.DiscordConfig
}
func NewDiscordChannel(cfg config.DiscordConfig, bus *bus.MessageBus) (*DiscordChannel, error) {
@@ -36,14 +33,9 @@ func NewDiscordChannel(cfg config.DiscordConfig, bus *bus.MessageBus) (*DiscordC
BaseChannel: base,
session: session,
config: cfg,
transcriber: nil,
}, nil
}
func (c *DiscordChannel) SetTranscriber(transcriber *voice.GroqTranscriber) {
c.transcriber = transcriber
}
func (c *DiscordChannel) Start(ctx context.Context) error {
logger.InfoC("discord", "Starting Discord bot")
@@ -123,26 +115,7 @@ func (c *DiscordChannel) handleMessage(s *discordgo.Session, m *discordgo.Messag
if localPath != "" {
mediaPaths = append(mediaPaths, localPath)
transcribedText := ""
if c.transcriber != nil && c.transcriber.IsAvailable() {
ctx, cancel := context.WithTimeout(context.Background(), 30*time.Second)
defer cancel()
result, err := c.transcriber.Transcribe(ctx, localPath)
if err != nil {
logger.WarnCF("discord", "Voice transcription failed", map[string]interface{}{
logger.FieldError: err.Error(),
})
transcribedText = fmt.Sprintf("[audio: %s (transcription failed)]", localPath)
} else {
transcribedText = fmt.Sprintf("[audio transcription: %s]", result.Text)
logger.InfoCF("discord", "Audio transcribed successfully", map[string]interface{}{
"text_preview": truncateString(result.Text, 120),
})
}
} else {
transcribedText = fmt.Sprintf("[audio: %s]", localPath)
}
transcribedText := fmt.Sprintf("[audio: %s]", localPath)
if content != "" {
content += "\n"

31
pkg/channels/telegram.go
View File

@@ -18,7 +18,6 @@ import (
"clawgo/pkg/bus"
"clawgo/pkg/config"
"clawgo/pkg/logger"
"clawgo/pkg/voice"
)
const (
@@ -36,7 +35,6 @@ type TelegramChannel struct {
chatIDsMu sync.RWMutex
updates <-chan telego.Update
runCancel cancelGuard
transcriber *voice.GroqTranscriber
placeholders sync.Map // chatID -> messageID
stopThinking sync.Map // chatID -> chan struct{}
handleSem chan struct{}
@@ -56,7 +54,6 @@ func NewTelegramChannel(cfg config.TelegramConfig, bus *bus.MessageBus) (*Telegr
bot: bot,
config: cfg,
chatIDs: make(map[string]int64),
transcriber: nil,
placeholders: sync.Map{},
stopThinking: sync.Map{},
handleSem: make(chan struct{}, telegramMaxConcurrentHandlers),
@@ -70,10 +67,6 @@ func withTelegramAPITimeout(ctx context.Context) (context.Context, context.Cance
return context.WithTimeout(ctx, telegramAPICallTimeout)
}
func (c *TelegramChannel) SetTranscriber(transcriber *voice.GroqTranscriber) {
c.transcriber = transcriber
}
func (c *TelegramChannel) HealthCheck(ctx context.Context) error {
if !c.IsRunning() {
return fmt.Errorf("telegram bot not running")
@@ -372,32 +365,10 @@ func (c *TelegramChannel) handleMessage(runCtx context.Context, message *telego.
voicePath := c.downloadFile(runCtx, message.Voice.FileID, ".ogg", "")
if voicePath != "" {
mediaPaths = append(mediaPaths, voicePath)
transcribedText := ""
if c.transcriber != nil && c.transcriber.IsAvailable() {
ctx, cancel := context.WithTimeout(runCtx, 30*time.Second)
defer cancel()
result, err := c.transcriber.Transcribe(ctx, voicePath)
if err != nil {
logger.WarnCF("telegram", "Voice transcription failed", map[string]interface{}{
logger.FieldError: err.Error(),
})
transcribedText = fmt.Sprintf("[voice: %s (transcription failed)]", voicePath)
} else {
transcribedText = fmt.Sprintf("[voice transcription: %s]", result.Text)
logger.InfoCF("telegram", "Voice transcribed successfully", map[string]interface{}{
"text_preview": truncateString(result.Text, 120),
})
}
} else {
transcribedText = fmt.Sprintf("[voice: %s]", voicePath)
}
if content != "" {
content += "\n"
}
content += transcribedText
content += fmt.Sprintf("[voice: %s]", voicePath)
}
}