Files
BBQ 7f9d6e4aba feat(acl): redesign ACL with conversation scope selector (#297)
Backend
- New subject kinds: all / channel_identity / channel_type
- Source scope fields on bot_acl_rules: source_channel,
  source_conversation_type, source_conversation_id, source_thread_id
- Fix source_scope_check constraint: resolve source_channel server-side
  (channel_type → subject_channel_type; channel_identity → DB lookup)
- Add GET /bots/:id/acl/channel-types/:type/conversations to list
  observed conversations by platform type
- ListObservedConversations: include private/DM chats, normalise
  conversation_type; COALESCE(name, handle) for display name
- enrichConversationAvatar: persist entry.Name → conversation_name
  (keeps Telegram group titles current on every message)
- Unify Priority type to int32 across Go types to match DB INTEGER;
  remove all int/int32 casts in service layer
- Fix duplicate nil guard in Evaluate; drop dead SourceScope.Channel field
- Migration 0048_acl_redesign

Frontend
- Drag-and-drop rule priority reordering (SortableJS/useSortable);
  fix reorder: compute new order from oldIndex/newIndex directly,
  not from the array (which useSortable syncs after onEnd)
- Conversation scope selector: searchable popover backed by observed
  conversations (by identity or platform type); collapsible manual-ID fallback
- Display: name as primary label, stable channel·type·id always shown
  as subtitle for verification
- bot-terminal: accessibility fix on close-tab button (keyboard events)
- i18n: drag-to-reorder, conversation source, manual IDs (en/zh)

Tests: update fakeChatACL to Evaluate interface; fix SourceScope literals.
SDK/spec regenerated.
2026-03-28 01:06:13 +08:00

415 lines
14 KiB
Go

// Code generated by sqlc. DO NOT EDIT.
// versions:
// sqlc v1.30.0
// source: acl.sql
package sqlc
import (
"context"
"github.com/jackc/pgx/v5/pgtype"
)
const createBotACLRule = `-- name: CreateBotACLRule :one
INSERT INTO bot_acl_rules (
bot_id,
priority,
enabled,
description,
action,
effect,
subject_kind,
channel_identity_id,
subject_channel_type,
source_channel,
source_conversation_type,
source_conversation_id,
source_thread_id,
created_by_user_id
)
VALUES (
$1,
$2,
$3,
$7::text,
'chat.trigger',
$4,
$5,
$8::uuid,
$9::text,
$10::text,
$11::text,
$12::text,
$13::text,
$6
)
RETURNING id, bot_id, priority, enabled, description, action, effect, subject_kind, channel_identity_id, subject_channel_type, source_channel, source_conversation_type, source_conversation_id, source_thread_id, created_by_user_id, created_at, updated_at
`
type CreateBotACLRuleParams struct {
BotID pgtype.UUID `json:"bot_id"`
Priority int32 `json:"priority"`
Enabled bool `json:"enabled"`
Effect string `json:"effect"`
SubjectKind string `json:"subject_kind"`
CreatedByUserID pgtype.UUID `json:"created_by_user_id"`
Description pgtype.Text `json:"description"`
ChannelIdentityID pgtype.UUID `json:"channel_identity_id"`
SubjectChannelType pgtype.Text `json:"subject_channel_type"`
SourceChannel pgtype.Text `json:"source_channel"`
SourceConversationType pgtype.Text `json:"source_conversation_type"`
SourceConversationID pgtype.Text `json:"source_conversation_id"`
SourceThreadID pgtype.Text `json:"source_thread_id"`
}
type CreateBotACLRuleRow struct {
ID pgtype.UUID `json:"id"`
BotID pgtype.UUID `json:"bot_id"`
Priority int32 `json:"priority"`
Enabled bool `json:"enabled"`
Description pgtype.Text `json:"description"`
Action string `json:"action"`
Effect string `json:"effect"`
SubjectKind string `json:"subject_kind"`
ChannelIdentityID pgtype.UUID `json:"channel_identity_id"`
SubjectChannelType pgtype.Text `json:"subject_channel_type"`
SourceChannel pgtype.Text `json:"source_channel"`
SourceConversationType pgtype.Text `json:"source_conversation_type"`
SourceConversationID pgtype.Text `json:"source_conversation_id"`
SourceThreadID pgtype.Text `json:"source_thread_id"`
CreatedByUserID pgtype.UUID `json:"created_by_user_id"`
CreatedAt pgtype.Timestamptz `json:"created_at"`
UpdatedAt pgtype.Timestamptz `json:"updated_at"`
}
func (q *Queries) CreateBotACLRule(ctx context.Context, arg CreateBotACLRuleParams) (CreateBotACLRuleRow, error) {
row := q.db.QueryRow(ctx, createBotACLRule,
arg.BotID,
arg.Priority,
arg.Enabled,
arg.Effect,
arg.SubjectKind,
arg.CreatedByUserID,
arg.Description,
arg.ChannelIdentityID,
arg.SubjectChannelType,
arg.SourceChannel,
arg.SourceConversationType,
arg.SourceConversationID,
arg.SourceThreadID,
)
var i CreateBotACLRuleRow
err := row.Scan(
&i.ID,
&i.BotID,
&i.Priority,
&i.Enabled,
&i.Description,
&i.Action,
&i.Effect,
&i.SubjectKind,
&i.ChannelIdentityID,
&i.SubjectChannelType,
&i.SourceChannel,
&i.SourceConversationType,
&i.SourceConversationID,
&i.SourceThreadID,
&i.CreatedByUserID,
&i.CreatedAt,
&i.UpdatedAt,
)
return i, err
}
const deleteBotACLRuleByID = `-- name: DeleteBotACLRuleByID :exec
DELETE FROM bot_acl_rules WHERE id = $1
`
func (q *Queries) DeleteBotACLRuleByID(ctx context.Context, id pgtype.UUID) error {
_, err := q.db.Exec(ctx, deleteBotACLRuleByID, id)
return err
}
const evaluateBotACLRule = `-- name: EvaluateBotACLRule :one
SELECT effect
FROM bot_acl_rules
WHERE bot_id = $1
AND enabled = true
AND action = $2
AND (
subject_kind = 'all'
OR (subject_kind = 'channel_identity' AND channel_identity_id = $3::uuid)
OR (subject_kind = 'channel_type' AND subject_channel_type = $4::text)
)
AND (source_conversation_type IS NULL OR source_conversation_type = $5::text)
AND (source_conversation_id IS NULL OR source_conversation_id = $6::text)
AND (source_thread_id IS NULL OR source_thread_id = $7::text)
ORDER BY priority ASC, created_at ASC
LIMIT 1
`
type EvaluateBotACLRuleParams struct {
BotID pgtype.UUID `json:"bot_id"`
Action string `json:"action"`
ChannelIdentityID pgtype.UUID `json:"channel_identity_id"`
SubjectChannelType pgtype.Text `json:"subject_channel_type"`
SourceConversationType pgtype.Text `json:"source_conversation_type"`
SourceConversationID pgtype.Text `json:"source_conversation_id"`
SourceThreadID pgtype.Text `json:"source_thread_id"`
}
// First-match-wins: returns the effect of the highest-priority matching enabled rule.
// If no row is returned, the caller falls back to bots.acl_default_effect.
func (q *Queries) EvaluateBotACLRule(ctx context.Context, arg EvaluateBotACLRuleParams) (string, error) {
row := q.db.QueryRow(ctx, evaluateBotACLRule,
arg.BotID,
arg.Action,
arg.ChannelIdentityID,
arg.SubjectChannelType,
arg.SourceConversationType,
arg.SourceConversationID,
arg.SourceThreadID,
)
var effect string
err := row.Scan(&effect)
return effect, err
}
const getBotACLDefaultEffect = `-- name: GetBotACLDefaultEffect :one
SELECT acl_default_effect FROM bots WHERE id = $1
`
func (q *Queries) GetBotACLDefaultEffect(ctx context.Context, id pgtype.UUID) (string, error) {
row := q.db.QueryRow(ctx, getBotACLDefaultEffect, id)
var acl_default_effect string
err := row.Scan(&acl_default_effect)
return acl_default_effect, err
}
const listBotACLRules = `-- name: ListBotACLRules :many
SELECT
r.id,
r.bot_id,
r.priority,
r.enabled,
r.description,
r.action,
r.effect,
r.subject_kind,
r.channel_identity_id,
r.subject_channel_type,
r.source_conversation_type,
r.source_conversation_id,
r.source_thread_id,
r.created_by_user_id,
r.created_at,
r.updated_at,
ci.channel_type,
ci.channel_subject_id,
ci.display_name AS channel_identity_display_name,
ci.avatar_url AS channel_identity_avatar_url,
linked.id AS linked_user_id,
linked.username AS linked_user_username,
linked.display_name AS linked_user_display_name,
linked.avatar_url AS linked_user_avatar_url
FROM bot_acl_rules r
LEFT JOIN channel_identities ci ON ci.id = r.channel_identity_id
LEFT JOIN users linked ON linked.id = ci.user_id
WHERE r.bot_id = $1
AND r.action = 'chat.trigger'
ORDER BY r.priority ASC, r.created_at ASC
`
type ListBotACLRulesRow struct {
ID pgtype.UUID `json:"id"`
BotID pgtype.UUID `json:"bot_id"`
Priority int32 `json:"priority"`
Enabled bool `json:"enabled"`
Description pgtype.Text `json:"description"`
Action string `json:"action"`
Effect string `json:"effect"`
SubjectKind string `json:"subject_kind"`
ChannelIdentityID pgtype.UUID `json:"channel_identity_id"`
SubjectChannelType pgtype.Text `json:"subject_channel_type"`
SourceConversationType pgtype.Text `json:"source_conversation_type"`
SourceConversationID pgtype.Text `json:"source_conversation_id"`
SourceThreadID pgtype.Text `json:"source_thread_id"`
CreatedByUserID pgtype.UUID `json:"created_by_user_id"`
CreatedAt pgtype.Timestamptz `json:"created_at"`
UpdatedAt pgtype.Timestamptz `json:"updated_at"`
ChannelType pgtype.Text `json:"channel_type"`
ChannelSubjectID pgtype.Text `json:"channel_subject_id"`
ChannelIdentityDisplayName pgtype.Text `json:"channel_identity_display_name"`
ChannelIdentityAvatarUrl pgtype.Text `json:"channel_identity_avatar_url"`
LinkedUserID pgtype.UUID `json:"linked_user_id"`
LinkedUserUsername pgtype.Text `json:"linked_user_username"`
LinkedUserDisplayName pgtype.Text `json:"linked_user_display_name"`
LinkedUserAvatarUrl pgtype.Text `json:"linked_user_avatar_url"`
}
func (q *Queries) ListBotACLRules(ctx context.Context, botID pgtype.UUID) ([]ListBotACLRulesRow, error) {
rows, err := q.db.Query(ctx, listBotACLRules, botID)
if err != nil {
return nil, err
}
defer rows.Close()
var items []ListBotACLRulesRow
for rows.Next() {
var i ListBotACLRulesRow
if err := rows.Scan(
&i.ID,
&i.BotID,
&i.Priority,
&i.Enabled,
&i.Description,
&i.Action,
&i.Effect,
&i.SubjectKind,
&i.ChannelIdentityID,
&i.SubjectChannelType,
&i.SourceConversationType,
&i.SourceConversationID,
&i.SourceThreadID,
&i.CreatedByUserID,
&i.CreatedAt,
&i.UpdatedAt,
&i.ChannelType,
&i.ChannelSubjectID,
&i.ChannelIdentityDisplayName,
&i.ChannelIdentityAvatarUrl,
&i.LinkedUserID,
&i.LinkedUserUsername,
&i.LinkedUserDisplayName,
&i.LinkedUserAvatarUrl,
); err != nil {
return nil, err
}
items = append(items, i)
}
if err := rows.Err(); err != nil {
return nil, err
}
return items, nil
}
const setBotACLDefaultEffect = `-- name: SetBotACLDefaultEffect :exec
UPDATE bots SET acl_default_effect = $2, updated_at = now() WHERE id = $1
`
type SetBotACLDefaultEffectParams struct {
ID pgtype.UUID `json:"id"`
AclDefaultEffect string `json:"acl_default_effect"`
}
func (q *Queries) SetBotACLDefaultEffect(ctx context.Context, arg SetBotACLDefaultEffectParams) error {
_, err := q.db.Exec(ctx, setBotACLDefaultEffect, arg.ID, arg.AclDefaultEffect)
return err
}
const updateBotACLRule = `-- name: UpdateBotACLRule :one
UPDATE bot_acl_rules
SET
priority = $2,
enabled = $3,
description = $6::text,
effect = $4,
subject_kind = $5,
channel_identity_id = $7::uuid,
subject_channel_type = $8::text,
source_channel = $9::text,
source_conversation_type = $10::text,
source_conversation_id = $11::text,
source_thread_id = $12::text,
updated_at = now()
WHERE id = $1
RETURNING id, bot_id, priority, enabled, description, action, effect, subject_kind, channel_identity_id, subject_channel_type, source_channel, source_conversation_type, source_conversation_id, source_thread_id, created_by_user_id, created_at, updated_at
`
type UpdateBotACLRuleParams struct {
ID pgtype.UUID `json:"id"`
Priority int32 `json:"priority"`
Enabled bool `json:"enabled"`
Effect string `json:"effect"`
SubjectKind string `json:"subject_kind"`
Description pgtype.Text `json:"description"`
ChannelIdentityID pgtype.UUID `json:"channel_identity_id"`
SubjectChannelType pgtype.Text `json:"subject_channel_type"`
SourceChannel pgtype.Text `json:"source_channel"`
SourceConversationType pgtype.Text `json:"source_conversation_type"`
SourceConversationID pgtype.Text `json:"source_conversation_id"`
SourceThreadID pgtype.Text `json:"source_thread_id"`
}
type UpdateBotACLRuleRow struct {
ID pgtype.UUID `json:"id"`
BotID pgtype.UUID `json:"bot_id"`
Priority int32 `json:"priority"`
Enabled bool `json:"enabled"`
Description pgtype.Text `json:"description"`
Action string `json:"action"`
Effect string `json:"effect"`
SubjectKind string `json:"subject_kind"`
ChannelIdentityID pgtype.UUID `json:"channel_identity_id"`
SubjectChannelType pgtype.Text `json:"subject_channel_type"`
SourceChannel pgtype.Text `json:"source_channel"`
SourceConversationType pgtype.Text `json:"source_conversation_type"`
SourceConversationID pgtype.Text `json:"source_conversation_id"`
SourceThreadID pgtype.Text `json:"source_thread_id"`
CreatedByUserID pgtype.UUID `json:"created_by_user_id"`
CreatedAt pgtype.Timestamptz `json:"created_at"`
UpdatedAt pgtype.Timestamptz `json:"updated_at"`
}
func (q *Queries) UpdateBotACLRule(ctx context.Context, arg UpdateBotACLRuleParams) (UpdateBotACLRuleRow, error) {
row := q.db.QueryRow(ctx, updateBotACLRule,
arg.ID,
arg.Priority,
arg.Enabled,
arg.Effect,
arg.SubjectKind,
arg.Description,
arg.ChannelIdentityID,
arg.SubjectChannelType,
arg.SourceChannel,
arg.SourceConversationType,
arg.SourceConversationID,
arg.SourceThreadID,
)
var i UpdateBotACLRuleRow
err := row.Scan(
&i.ID,
&i.BotID,
&i.Priority,
&i.Enabled,
&i.Description,
&i.Action,
&i.Effect,
&i.SubjectKind,
&i.ChannelIdentityID,
&i.SubjectChannelType,
&i.SourceChannel,
&i.SourceConversationType,
&i.SourceConversationID,
&i.SourceThreadID,
&i.CreatedByUserID,
&i.CreatedAt,
&i.UpdatedAt,
)
return i, err
}
const updateBotACLRulePriority = `-- name: UpdateBotACLRulePriority :exec
UPDATE bot_acl_rules SET priority = $2, updated_at = now() WHERE id = $1
`
type UpdateBotACLRulePriorityParams struct {
ID pgtype.UUID `json:"id"`
Priority int32 `json:"priority"`
}
func (q *Queries) UpdateBotACLRulePriority(ctx context.Context, arg UpdateBotACLRulePriorityParams) error {
_, err := q.db.Exec(ctx, updateBotACLRulePriority, arg.ID, arg.Priority)
return err
}