mirror of
https://github.com/memohai/Memoh.git
synced 2026-04-25 07:00:48 +09:00
BBQ
7f9d6e4aba
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.
117 lines
3.8 KiB
SQL
117 lines
3.8 KiB
SQL
-- name: EvaluateBotACLRule :one
|
|
-- 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.
|
|
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 = sqlc.narg(channel_identity_id)::uuid)
|
|
OR (subject_kind = 'channel_type' AND subject_channel_type = sqlc.narg(subject_channel_type)::text)
|
|
)
|
|
AND (source_conversation_type IS NULL OR source_conversation_type = sqlc.narg(source_conversation_type)::text)
|
|
AND (source_conversation_id IS NULL OR source_conversation_id = sqlc.narg(source_conversation_id)::text)
|
|
AND (source_thread_id IS NULL OR source_thread_id = sqlc.narg(source_thread_id)::text)
|
|
ORDER BY priority ASC, created_at ASC
|
|
LIMIT 1;
|
|
|
|
-- name: GetBotACLDefaultEffect :one
|
|
SELECT acl_default_effect FROM bots WHERE id = $1;
|
|
|
|
-- name: SetBotACLDefaultEffect :exec
|
|
UPDATE bots SET acl_default_effect = $2, updated_at = now() WHERE id = $1;
|
|
|
|
-- 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;
|
|
|
|
-- 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,
|
|
sqlc.narg(description)::text,
|
|
'chat.trigger',
|
|
$4,
|
|
$5,
|
|
sqlc.narg(channel_identity_id)::uuid,
|
|
sqlc.narg(subject_channel_type)::text,
|
|
sqlc.narg(source_channel)::text,
|
|
sqlc.narg(source_conversation_type)::text,
|
|
sqlc.narg(source_conversation_id)::text,
|
|
sqlc.narg(source_thread_id)::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;
|
|
|
|
-- name: UpdateBotACLRule :one
|
|
UPDATE bot_acl_rules
|
|
SET
|
|
priority = $2,
|
|
enabled = $3,
|
|
description = sqlc.narg(description)::text,
|
|
effect = $4,
|
|
subject_kind = $5,
|
|
channel_identity_id = sqlc.narg(channel_identity_id)::uuid,
|
|
subject_channel_type = sqlc.narg(subject_channel_type)::text,
|
|
source_channel = sqlc.narg(source_channel)::text,
|
|
source_conversation_type = sqlc.narg(source_conversation_type)::text,
|
|
source_conversation_id = sqlc.narg(source_conversation_id)::text,
|
|
source_thread_id = sqlc.narg(source_thread_id)::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;
|
|
|
|
-- name: UpdateBotACLRulePriority :exec
|
|
UPDATE bot_acl_rules SET priority = $2, updated_at = now() WHERE id = $1;
|
|
|
|
-- name: DeleteBotACLRuleByID :exec
|
|
DELETE FROM bot_acl_rules WHERE id = $1;
|