feat(controller): add source for command handling.
feat(telegram): switch message type to markdown feat(controller): add welcome message for telegram bot.
This commit is contained in:
@@ -12,7 +12,8 @@ import (
|
||||
|
||||
// Command represents a parsed bot command.
|
||||
type Command struct {
|
||||
RawText string
|
||||
Source string // The source pipe (e.g., "telegram", "qq", "napcat")
|
||||
RawText string // The raw text of the command message
|
||||
Command string // The command word (e.g., "list", "status")
|
||||
Args []string // Command arguments
|
||||
ChatID int64 // Chat/group ID where the command was issued
|
||||
|
||||
@@ -179,12 +179,12 @@ func (q *QQController) processCommand(cmd controller.Command) string {
|
||||
parsed.ChatID = cmd.ChatID
|
||||
parsed.ChatType = cmd.ChatType
|
||||
parsed.SenderID = cmd.SenderID
|
||||
parsed.Source = "qq_napcat"
|
||||
|
||||
// Hand the complete command to the unified processor, which checks group
|
||||
// vs private, trusted groups, admin permissions, and executes it.
|
||||
response, err := controller.GetManager().Trigger(parsed, q.cfg.TrustedGroups, q.cfg.Admins, q.cfg.ListenMethod)
|
||||
cfg := config.GetConfig()
|
||||
if cfg.System.DebugMode && cfg.Debug.ShowTriggerCmdEcho {
|
||||
if config.GetConfig().System.DebugMode && config.GetConfig().Debug.ShowTriggerCmdEcho {
|
||||
postLog.Debug(fmt.Sprintf("[qq_napcat] triggered command: \"/%s\" with args: \"%s\" from chatID: %d and senderID: %d", parsed.Command, strings.Join(parsed.Args, ", "), cmd.ChatID, cmd.SenderID))
|
||||
}
|
||||
if err != nil {
|
||||
|
||||
@@ -182,8 +182,11 @@ func (c *Client) getUpdates(offset int64, limit, timeout int) ([]Update, error)
|
||||
}
|
||||
|
||||
// SendMessage sends a text message to a chat, splitting it into chunks that
|
||||
// fit Telegram's 4096-character limit. The text is sent without a parse mode so
|
||||
// template asterisks render literally.
|
||||
// fit Telegram's 4096-character limit. All messages are sent with
|
||||
// parse_mode=Markdown so fenced code blocks and inline formatting render as
|
||||
// rich text. Templates must stay valid under Telegram's legacy Markdown:
|
||||
// unpaired '*' or '_' characters (e.g. a lone '*Event: ...' label) make the
|
||||
// API reject the whole message.
|
||||
func (c *Client) SendMessage(chatID int64, text string) error {
|
||||
if strings.TrimSpace(text) == "" {
|
||||
return nil
|
||||
@@ -198,8 +201,9 @@ func (c *Client) SendMessage(chatID int64, text string) error {
|
||||
|
||||
func (c *Client) sendMessageChunk(chatID int64, text string) error {
|
||||
params := url.Values{
|
||||
"chat_id": {strconv.FormatInt(chatID, 10)},
|
||||
"text": {text},
|
||||
"chat_id": {strconv.FormatInt(chatID, 10)},
|
||||
"text": {text},
|
||||
"parse_mode": {"Markdown"},
|
||||
}
|
||||
return c.call("sendMessage", params, nil)
|
||||
}
|
||||
|
||||
@@ -169,10 +169,14 @@ func (t *TelegramController) processCommand(cmd controller.Command) string {
|
||||
parsed.ChatID = cmd.ChatID
|
||||
parsed.ChatType = cmd.ChatType
|
||||
parsed.SenderID = cmd.SenderID
|
||||
parsed.Source = "telegram"
|
||||
|
||||
// Hand the complete command to the unified processor, which checks group
|
||||
// vs private, trusted groups, admin permissions, and executes it.
|
||||
response, err := controller.GetManager().Trigger(parsed, t.cfg.TrustedGroups, t.resolvedAdminList(), t.cfg.ListenMethod)
|
||||
if config.GetConfig().System.DebugMode && config.GetConfig().Debug.ShowTriggerCmdEcho {
|
||||
postLog.Debug(fmt.Sprintf("[telegram] triggered command: \"/%s\" with args: \"%s\" from chatID: %d and senderID: %d", parsed.Command, strings.Join(parsed.Args, ", "), cmd.ChatID, cmd.SenderID))
|
||||
}
|
||||
if err != nil {
|
||||
postLog.Error("Telegram command processing failed: " + err.Error())
|
||||
return ""
|
||||
|
||||
@@ -10,64 +10,6 @@ import (
|
||||
"nukumizu-backend/internal/template"
|
||||
)
|
||||
|
||||
// Trigger validates an incoming command against the pipe's authorization
|
||||
// config (trusted groups / admins) and, if authorized, processes it through
|
||||
// RouteCommand. It returns the response text to reply with; an empty response means
|
||||
// the command was discarded.
|
||||
//
|
||||
// All command handling across pipes is unified here: pipes only decide whether
|
||||
// a received message is a command, then hand the complete command over.
|
||||
func (m *Manager) Trigger(cmd Command, trustedGroups, admins []string, listenMethod string) (string, error) {
|
||||
// Check whether the command arrived in a group or a private chat.
|
||||
if cmd.ChatType == "group" {
|
||||
// Group commands are only honored from trusted groups, otherwise discard.
|
||||
if !IsTrustedGroup(cmd.ChatID, trustedGroups) {
|
||||
return "", nil
|
||||
}
|
||||
}
|
||||
|
||||
// Commands that require special permission must be sent by an admin.
|
||||
if IsAdminCommand(cmd.Command) {
|
||||
if !IsAdmin(cmd.SenderID, admins) {
|
||||
return "", nil
|
||||
}
|
||||
}
|
||||
|
||||
response, err := m.RouteCommand(cmd)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// In "at" listen mode, give feedback for unknown commands.
|
||||
if response == "" && listenMethod == "at" {
|
||||
return "Unknown command: /" + cmd.Command, nil
|
||||
}
|
||||
return response, nil
|
||||
}
|
||||
|
||||
// RouteCommand processes a parsed bot command and returns the response text.
|
||||
// The actual command execution for every pipe is unified here.
|
||||
func (m *Manager) RouteCommand(cmd Command) (string, error) {
|
||||
switch cmd.Command {
|
||||
case "help":
|
||||
return handleHelp()
|
||||
case "list":
|
||||
return handleList()
|
||||
case "status":
|
||||
return handleStatus(cmd)
|
||||
case "shutdown":
|
||||
return handleShutdown(cmd)
|
||||
case "reboot":
|
||||
return handleReboot(cmd)
|
||||
case "run":
|
||||
return handleRun(cmd)
|
||||
case "info":
|
||||
return handleInfo(cmd)
|
||||
default:
|
||||
return "", nil
|
||||
}
|
||||
}
|
||||
|
||||
func handleHelp() (string, error) {
|
||||
cfg := config.GetConfig()
|
||||
params := template.BuildBotInitializationMsgParams()
|
||||
@@ -235,6 +177,12 @@ func handleInfo(cmd Command) (string, error) {
|
||||
return sb.String(), nil
|
||||
}
|
||||
|
||||
func telegram_handleStart() (string, error) {
|
||||
cfg := config.GetConfig()
|
||||
params := template.BuildBotInitializationMsgParams()
|
||||
return template.Render(cfg.ControllerMessage.Tg_BotStart, params), nil
|
||||
}
|
||||
|
||||
// formatBytes renders a byte count in a human-readable form.
|
||||
func formatBytes(b int64) string {
|
||||
const (
|
||||
|
||||
@@ -5,6 +5,70 @@ import (
|
||||
"strings"
|
||||
)
|
||||
|
||||
// Trigger validates an incoming command against the pipe's authorization
|
||||
// config (trusted groups / admins) and, if authorized, processes it through
|
||||
// RouteCommand. It returns the response text to reply with; an empty response means
|
||||
// the command was discarded.
|
||||
//
|
||||
// All command handling across pipes is unified here: pipes only decide whether
|
||||
// a received message is a command, then hand the complete command over.
|
||||
func (m *Manager) Trigger(cmd Command, trustedGroups, admins []string, listenMethod string) (string, error) {
|
||||
// Check whether the command arrived in a group or a private chat.
|
||||
if cmd.ChatType == "group" {
|
||||
// Group commands are only honored from trusted groups, otherwise discard.
|
||||
if !IsTrustedGroup(cmd.ChatID, trustedGroups) {
|
||||
return "", nil
|
||||
}
|
||||
}
|
||||
|
||||
// Commands that require special permission must be sent by an admin.
|
||||
if IsAdminCommand(cmd.Command) {
|
||||
if !IsAdmin(cmd.SenderID, admins) {
|
||||
return "", nil
|
||||
}
|
||||
}
|
||||
|
||||
response, err := m.RouteCommand(cmd)
|
||||
if err != nil {
|
||||
return "", err
|
||||
}
|
||||
|
||||
// In "at" listen mode, give feedback for unknown commands.
|
||||
if response == "" && listenMethod == "at" {
|
||||
return "Unknown command: /" + cmd.Command, nil
|
||||
}
|
||||
return response, nil
|
||||
}
|
||||
|
||||
// RouteCommand processes a parsed bot command and returns the response text.
|
||||
// The actual command execution for every pipe is unified here.
|
||||
func (m *Manager) RouteCommand(cmd Command) (string, error) {
|
||||
if cmd.Source == "telegram"{
|
||||
switch cmd.Command {
|
||||
case "start":
|
||||
return telegram_handleStart()
|
||||
}
|
||||
}
|
||||
switch cmd.Command {
|
||||
case "help":
|
||||
return handleHelp()
|
||||
case "list":
|
||||
return handleList()
|
||||
case "status":
|
||||
return handleStatus(cmd)
|
||||
case "shutdown":
|
||||
return handleShutdown(cmd)
|
||||
case "reboot":
|
||||
return handleReboot(cmd)
|
||||
case "run":
|
||||
return handleRun(cmd)
|
||||
case "info":
|
||||
return handleInfo(cmd)
|
||||
default:
|
||||
return "", nil
|
||||
}
|
||||
}
|
||||
|
||||
// ParseCommand parses a raw message text into a Command.
|
||||
// Format: /{{command}} {{args...}}
|
||||
func ParseCommand(rawText string) (cmd Command, ok bool) {
|
||||
|
||||
Reference in New Issue
Block a user