LobotomyLabs/dumpsterChat
2
0
Fork 0
Code Issues Pull Requests Actions Packages Releases 10 Wiki Activity

feat(bots): bot framework polish + store

Browse Source 
- /ws/bot endpoint: bot token auth via query param, SHA-256 lookup
- Bot WS actions: SEND_MESSAGE + DELETE_MESSAGE handled in gateway
- Bot messages: bot_id on messages table, bot badge in chat (green + BOT tag)
- Bot store: /bots lists all bots with server count + add-to-server
- Bot manager moved to /bots/manage
- Fix: command routes were double-nested under /bots/{botID}/commands
- Fix: fetchServerCommands route corrected to /bots/servers/...
This commit is contained in:
Dustin Newkirk
2026-07-15 12:45:44 -04:00
parent 2674c254a1
commit 7c70082f37
13 changed files with 557 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files
internal/bot/handlers.go
+52
View File
@@ -22,6 +22,7 @@ func NewHandler(db *sql.DB) *Handler {
// RegisterRoutes registers authenticated bot routes under the given router.
func (h *Handler) RegisterRoutes(r chi.Router) {
r.Get("/store", h.Store)
r.Post("/", h.Create)
r.Get("/", h.List)
r.Get("/{botID}", h.Get)
@@ -547,3 +548,54 @@ func (h *Handler) RegenerateToken(w http.ResponseWriter, r *http.Request) {
writeJSON(w, http.StatusOK, b)
}
// ---- Store (public listing) ----
type storeBotResponse struct {
ID string `json:"id"`
Name string `json:"name"`
Avatar *string `json:"avatar"`
Description string `json:"description"`
ServerCount int `json:"server_count"`
OwnerID string `json:"owner_id"`
CreatedAt string `json:"created_at"`
}
// Store returns all bots with their server count (visible to any authenticated user).
func (h *Handler) Store(w http.ResponseWriter, r *http.Request) {
rows, err := h.db.QueryContext(r.Context(), `
SELECT b.id, b.name, b.avatar, b.description, b.owner_id, b.created_at::text,
COUNT(bs.server_id) AS server_count
FROM bots b
LEFT JOIN bot_servers bs ON bs.bot_id = b.id
GROUP BY b.id, b.name, b.avatar, b.description, b.owner_id, b.created_at
ORDER BY server_count DESC, b.name
`)
if err != nil {
writeErr(w, http.StatusInternalServerError, "server error")
return
}
defer rows.Close()
bots := make([]storeBotResponse, 0)
for rows.Next() {
var b storeBotResponse
var avatar sql.NullString
var createdAt sql.NullString
if err := rows.Scan(&b.ID, &b.Name, &avatar, &b.Description, &b.OwnerID, &createdAt, &b.ServerCount); err != nil {
writeErr(w, http.StatusInternalServerError, "server error")
return
}
if avatar.Valid {
b.Avatar = &avatar.String
}
b.CreatedAt = createdAt.String
bots = append(bots, b)
}
if err := rows.Err(); err != nil {
writeErr(w, http.StatusInternalServerError, "server error")
return
}
writeJSON(w, http.StatusOK, bots)
}
internal/db/db.go
+4
View File
@@ -565,5 +565,9 @@ CREATE TABLE IF NOT EXISTS feature_request_votes (
PRIMARY KEY (feature_request_id, user_id)
);
CREATE INDEX IF NOT EXISTS idx_feature_request_votes_fr ON feature_request_votes(feature_request_id);
-- Bot messages: track which bot authored a message
ALTER TABLE messages ADD COLUMN IF NOT EXISTS bot_id UUID REFERENCES bots(id) ON DELETE SET NULL;
CREATE INDEX IF NOT EXISTS idx_messages_bot ON messages(bot_id) WHERE bot_id IS NOT NULL;
`
internal/gateway/client.go
+209
View File
@@ -2,7 +2,9 @@ package gateway
import (
"context"
"crypto/sha256"
"database/sql"
"encoding/hex"
"encoding/json"
"log/slog"
"net/http"
@@ -106,6 +108,9 @@ type Client struct {
Conn *websocket.Conn
UserID string
Username string
IsBot bool
BotID string
BotName string
send chan []byte
}
@@ -184,6 +189,18 @@ func (c *Client) readPump() {
})
}
}
case BotSendMessage:
if !c.IsBot {
c.Hub.logger.Warn("non-bot client sent SEND_MESSAGE", "user_id", c.UserID)
continue
}
c.handleBotSendMessage(event.Data)
case BotDeleteMessage:
if !c.IsBot {
c.Hub.logger.Warn("non-bot client sent DELETE_MESSAGE", "user_id", c.UserID)
continue
}
c.handleBotDeleteMessage(event.Data)
default:
c.Hub.logger.Info("received event from client", "type", event.Type, "user_id", c.UserID)
}
@@ -300,3 +317,195 @@ func ServeWS(db *sql.DB, hub *Hub, logger *slog.Logger, w http.ResponseWriter, r
go client.writePump()
go client.readPump()
}
// ServeBotWS handles websocket requests from bot clients.
// Authenticates via ?token= query param (bot token, hashed lookup).
func ServeBotWS(db *sql.DB, hub *Hub, logger *slog.Logger, w http.ResponseWriter, r *http.Request) {
token := r.URL.Query().Get("token")
if token == "" {
http.Error(w, `{"error":"token query param required"}`, http.StatusBadRequest)
return
}
// Hash the token and look up the bot.
tokenHash := hashToken(token)
var botID, botName, ownerID string
err := db.QueryRowContext(r.Context(),
`SELECT id, name, owner_id FROM bots WHERE token = $1`,
tokenHash,
).Scan(&botID, &botName, &ownerID)
if err != nil {
logger.Warn("bot ws auth: invalid token")
http.Error(w, `{"error":"invalid bot token"}`, http.StatusUnauthorized)
return
}
// Verify the bot is added to at least one server.
var serverCount int
err = db.QueryRowContext(r.Context(),
`SELECT COUNT(*) FROM bot_servers WHERE bot_id = $1`, botID,
).Scan(&serverCount)
if err != nil || serverCount == 0 {
logger.Warn("bot ws auth: bot not added to any server", "bot_id", botID)
http.Error(w, `{"error":"bot not added to any server"}`, http.StatusForbidden)
return
}
conn, err := upgrader.Upgrade(w, r, nil)
if err != nil {
logger.Error("bot websocket upgrade failed", "error", err)
return
}
// Load bot server memberships into hub so BroadcastToServer works.
hub.RefreshUserServers(ownerID)
conn.SetReadDeadline(time.Time{})
conn.WriteMessage(websocket.TextMessage, []byte(`{"type":"ready","bot_id":"`+botID+`"}`))
client := &Client{
Hub: hub,
Conn: conn,
UserID: ownerID,
Username: botName,
IsBot: true,
BotID: botID,
BotName: botName,
send: make(chan []byte, 256),
}
hub.Register(client)
go client.writePump()
go client.readPump()
}
// hashToken returns the SHA-256 hex digest of a token.
func hashToken(token string) string {
h := sha256.Sum256([]byte(token))
return hex.EncodeToString(h[:])
}
// handleBotSendMessage processes a SEND_MESSAGE action from a bot client.
func (c *Client) handleBotSendMessage(data interface{}) {
var payload struct {
ChannelID string `json:"channel_id"`
Content string `json:"content"`
}
raw, ok := data.(json.RawMessage)
if !ok {
return
}
if err := json.Unmarshal(raw, &payload); err != nil || payload.ChannelID == "" || payload.Content == "" {
c.Hub.logger.Warn("bot SEND_MESSAGE: invalid payload")
return
}
if len(payload.Content) > 4000 {
payload.Content = payload.Content[:4000]
}
// Verify the bot is in the server that owns this channel.
serverID, err := c.Hub.ServerIDForChannel(context.Background(), payload.ChannelID)
if err != nil {
c.Hub.logger.Warn("bot SEND_MESSAGE: channel not found", "channel_id", payload.ChannelID)
return
}
var inServer bool
err = c.Hub.db.QueryRowContext(context.Background(),
`SELECT EXISTS(SELECT 1 FROM bot_servers WHERE bot_id = $1 AND server_id = $2)`,
c.BotID, serverID,
).Scan(&inServer)
if err != nil || !inServer {
c.Hub.logger.Warn("bot SEND_MESSAGE: bot not in server", "bot_id", c.BotID, "server_id", serverID)
return
}
// Insert the message with bot_id set.
var msgID, createdAt string
err = c.Hub.db.QueryRowContext(context.Background(),
`INSERT INTO messages (channel_id, author_id, content, bot_id)
VALUES ($1, $2, $3, $4)
RETURNING id, created_at::text`,
payload.ChannelID, c.UserID, payload.Content, c.BotID,
).Scan(&msgID, &createdAt)
if err != nil {
c.Hub.logger.Error("bot SEND_MESSAGE: insert failed", "error", err)
return
}
// Broadcast MESSAGE_CREATE to the server.
c.Hub.BroadcastToServer(serverID, Event{
Type: EventMessageCreate,
Data: map[string]interface{}{
"id": msgID,
"channel_id": payload.ChannelID,
"author_id": c.UserID,
"author_username": c.BotName,
"author_display_name": nil,
"author_bot": true,
"bot_id": c.BotID,
"bot_name": c.BotName,
"content": payload.Content,
"reply_to": nil,
"edited_at": nil,
"pinned": false,
"created_at": createdAt,
"embeds": []interface{}{},
"reactions": []interface{}{},
},
})
}
// handleBotDeleteMessage processes a DELETE_MESSAGE action from a bot client.
func (c *Client) handleBotDeleteMessage(data interface{}) {
var payload struct {
ChannelID string `json:"channel_id"`
MessageID string `json:"message_id"`
}
raw, ok := data.(json.RawMessage)
if !ok {
return
}
if err := json.Unmarshal(raw, &payload); err != nil || payload.ChannelID == "" || payload.MessageID == "" {
c.Hub.logger.Warn("bot DELETE_MESSAGE: invalid payload")
return
}
// Verify the bot is in the server that owns this channel.
serverID, err := c.Hub.ServerIDForChannel(context.Background(), payload.ChannelID)
if err != nil {
return
}
var inServer bool
err = c.Hub.db.QueryRowContext(context.Background(),
`SELECT EXISTS(SELECT 1 FROM bot_servers WHERE bot_id = $1 AND server_id = $2)`,
c.BotID, serverID,
).Scan(&inServer)
if err != nil || !inServer {
return
}
// Delete the message (only if it exists in this channel).
result, err := c.Hub.db.ExecContext(context.Background(),
`DELETE FROM messages WHERE id = $1 AND channel_id = $2`,
payload.MessageID, payload.ChannelID,
)
if err != nil {
c.Hub.logger.Error("bot DELETE_MESSAGE: delete failed", "error", err)
return
}
rows, _ := result.RowsAffected()
if rows == 0 {
return
}
// Broadcast MESSAGE_DELETE.
c.Hub.BroadcastToServer(serverID, Event{
Type: EventMessageDelete,
Data: map[string]string{
"id": payload.MessageID,
"channel_id": payload.ChannelID,
},
})
}
internal/gateway/events.go
+4
View File
@@ -23,6 +23,10 @@ const (
EventVoiceMute = "VOICE_MUTE"
EventVoiceDeafen = "VOICE_DEAFEN"
EventVoiceWhisper = "VOICE_WHISPER"
// Bot action events (sent by bot clients)
BotSendMessage = "SEND_MESSAGE"
BotDeleteMessage = "DELETE_MESSAGE"
)
// Event represents a WebSocket event sent to clients.
internal/message/handlers.go
+41 -7
View File
@@ -159,6 +159,9 @@ type messageResponse struct {
AuthorID string `json:"author_id"`
AuthorName string `json:"author_username"`
DisplayName *string `json:"author_display_name"`
AuthorBot bool `json:"author_bot"`
BotID *string `json:"bot_id,omitempty"`
BotName *string `json:"bot_name,omitempty"`
Content string `json:"content"`
ReplyTo *string `json:"reply_to,omitempty"`
EditedAt *string `json:"edited_at"`
@@ -505,18 +508,20 @@ func (h *Handler) List(w http.ResponseWriter, r *http.Request) {
var err error
if before != "" {
rows, err = h.db.QueryContext(r.Context(), `
SELECT m.id, m.channel_id, m.author_id, u.username, u.display_name, m.content, m.reply_to::text, m.edited_at::text, m.pinned, m.created_at::text
SELECT m.id, m.channel_id, m.author_id, u.username, u.display_name, m.content, m.reply_to::text, m.edited_at::text, m.pinned, m.created_at::text, m.bot_id, b.name
FROM messages m
JOIN users u ON m.author_id = u.id
LEFT JOIN bots b ON m.bot_id = b.id
WHERE m.channel_id = $1 AND m.created_at < (SELECT created_at FROM messages WHERE id = $2)
ORDER BY m.created_at DESC
LIMIT $3
`, channelID, before, limit)
} else {
rows, err = h.db.QueryContext(r.Context(), `
SELECT m.id, m.channel_id, m.author_id, u.username, u.display_name, m.content, m.reply_to::text, m.edited_at::text, m.pinned, m.created_at::text
SELECT m.id, m.channel_id, m.author_id, u.username, u.display_name, m.content, m.reply_to::text, m.edited_at::text, m.pinned, m.created_at::text, m.bot_id, b.name
FROM messages m
JOIN users u ON m.author_id = u.id
LEFT JOIN bots b ON m.bot_id = b.id
WHERE m.channel_id = $1
ORDER BY m.created_at DESC
LIMIT $2
@@ -534,7 +539,9 @@ func (h *Handler) List(w http.ResponseWriter, r *http.Request) {
var editedAt sql.NullString
var createdAt sql.NullString
var replyTo sql.NullString
err := rows.Scan(&msg.ID, &msg.ChannelID, &msg.AuthorID, &msg.AuthorName, &msg.DisplayName, &msg.Content, &replyTo, &editedAt, &msg.Pinned, &createdAt)
var botID sql.NullString
var botName sql.NullString
err := rows.Scan(&msg.ID, &msg.ChannelID, &msg.AuthorID, &msg.AuthorName, &msg.DisplayName, &msg.Content, &replyTo, &editedAt, &msg.Pinned, &createdAt, &botID, &botName)
if err != nil {
continue
}
@@ -544,6 +551,13 @@ func (h *Handler) List(w http.ResponseWriter, r *http.Request) {
if editedAt.Valid {
msg.EditedAt = &editedAt.String
}
if botID.Valid {
msg.BotID = &botID.String
msg.AuthorBot = true
}
if botName.Valid {
msg.BotName = &botName.String
}
msg.CreatedAt = createdAt.String
messages = append(messages, msg)
}
@@ -802,9 +816,10 @@ func (h *Handler) Search(w http.ResponseWriter, r *http.Request) {
rows, err := h.db.QueryContext(r.Context(), `
SELECT m.id, m.channel_id, m.author_id, u.username, u.display_name, m.content, m.reply_to::text, m.edited_at::text, m.pinned, m.created_at::text,
ts_rank(m.search_vector, plainto_tsquery('english', $2)) AS rank
ts_rank(m.search_vector, plainto_tsquery('english', $2)) AS rank, m.bot_id, b.name
FROM messages m
JOIN users u ON m.author_id = u.id
LEFT JOIN bots b ON m.bot_id = b.id
WHERE m.channel_id = $1 AND m.search_vector @@ plainto_tsquery('english', $2)
ORDER BY rank DESC, m.created_at DESC
LIMIT $3
@@ -822,7 +837,9 @@ func (h *Handler) Search(w http.ResponseWriter, r *http.Request) {
var createdAt sql.NullString
var replyTo sql.NullString
var rank float64
err := rows.Scan(&msg.ID, &msg.ChannelID, &msg.AuthorID, &msg.AuthorName, &msg.DisplayName, &msg.Content, &replyTo, &editedAt, &msg.Pinned, &createdAt, &rank)
var botID sql.NullString
var botName sql.NullString
err := rows.Scan(&msg.ID, &msg.ChannelID, &msg.AuthorID, &msg.AuthorName, &msg.DisplayName, &msg.Content, &replyTo, &editedAt, &msg.Pinned, &createdAt, &rank, &botID, &botName)
if err != nil {
continue
}
@@ -832,6 +849,13 @@ func (h *Handler) Search(w http.ResponseWriter, r *http.Request) {
if editedAt.Valid {
msg.EditedAt = &editedAt.String
}
if botID.Valid {
msg.BotID = &botID.String
msg.AuthorBot = true
}
if botName.Valid {
msg.BotName = &botName.String
}
msg.CreatedAt = createdAt.String
messages = append(messages, msg)
}
@@ -1059,9 +1083,10 @@ func (h *Handler) ListPinned(w http.ResponseWriter, r *http.Request) {
}
rows, err := h.db.QueryContext(r.Context(), `
SELECT m.id, m.channel_id, m.author_id, u.username, u.display_name, m.content, m.reply_to::text, m.edited_at::text, m.pinned, m.created_at::text
SELECT m.id, m.channel_id, m.author_id, u.username, u.display_name, m.content, m.reply_to::text, m.edited_at::text, m.pinned, m.created_at::text, m.bot_id, b.name
FROM messages m
JOIN users u ON m.author_id = u.id
LEFT JOIN bots b ON m.bot_id = b.id
WHERE m.channel_id = $1 AND m.pinned = TRUE
ORDER BY m.created_at DESC
`, channelID)
@@ -1077,7 +1102,9 @@ func (h *Handler) ListPinned(w http.ResponseWriter, r *http.Request) {
var editedAt sql.NullString
var createdAt sql.NullString
var replyTo sql.NullString
err := rows.Scan(&msg.ID, &msg.ChannelID, &msg.AuthorID, &msg.AuthorName, &msg.DisplayName, &msg.Content, &replyTo, &editedAt, &msg.Pinned, &createdAt)
var botID sql.NullString
var botName sql.NullString
err := rows.Scan(&msg.ID, &msg.ChannelID, &msg.AuthorID, &msg.AuthorName, &msg.DisplayName, &msg.Content, &replyTo, &editedAt, &msg.Pinned, &createdAt, &botID, &botName)
if err != nil {
continue
}
@@ -1087,6 +1114,13 @@ func (h *Handler) ListPinned(w http.ResponseWriter, r *http.Request) {
if editedAt.Valid {
msg.EditedAt = &editedAt.String
}
if botID.Valid {
msg.BotID = &botID.String
msg.AuthorBot = true
}
if botName.Valid {
msg.BotName = &botName.String
}
msg.CreatedAt = createdAt.String
messages = append(messages, msg)
}