mirror of
https://github.com/memohai/Memoh.git
synced 2026-04-27 07:16:19 +09:00
Squashed commit of the following:
commit bcdb026ae43e4f95d0b2c4f9bd440a2df9d6b514 Author: Ran <16112591+chen-ran@users.noreply.github.com> Date: Thu Feb 12 17:10:32 2026 +0800 chore: update DEVELOPMENT.md commit30281742efMerge:ca5c6a15b05f13Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Thu Feb 12 15:49:17 2026 +0800 merge(github/main): integrate fx dependency injection framework Merge upstream fx refactor and adapt all services to use go.uber.org/fx for dependency injection. Resolve conflicts in main.go, server.go, and service constructors while preserving our domain model changes. - Fix telegram adapter panic on shutdown (double close channel) - Fix feishu adapter processing messages after stop - Increase directory lookup timeout from 2s to 5s commitca5c6a1866Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Thu Feb 12 15:33:09 2026 +0800 refactor(core): restructure conversation, channel and message domains - Rename chat module to conversation with flow-based architecture - Move channelidentities into channel/identities subpackage - Add channel/route for routing logic - Add message service with event hub - Add MCP providers: container, directory, schedule - Refactor Feishu/Telegram adapters with directory and stream support - Add platform management page and channel badges in web UI - Update database schema for conversations, messages and channel routes - Add @memoh/shared package for cross-package type definitions commit75e2ef0467Merge:d99ba3801cb6c8Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Thu Feb 12 14:45:49 2026 +0800 merge(github): merge github/main, resolve index.ts URL conflict Keep our defensive absolute-URL check in createAuthFetcher. commitd99ba38b7dMerge:860e20f35ce7d1Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Thu Feb 12 05:20:18 2026 +0800 merge(github): merge github/main, keep our code and docs/spec commit860e20fe70Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Wed Feb 11 22:13:27 2026 +0800 docs(docs): add concepts and style guides for VitePress site - Add concepts: identity-and-binding, index (en/zh) - Add style: terminology (en/zh) - Update index and zh/index - Update .vitepress/config.ts commita75fdb8040Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Wed Feb 11 17:37:16 2026 +0800 refactor(mcp): standardize unified tool gateway on go-sdk Split business executors from federation sources and migrate unified tool/federation transports to the official go-sdk for stricter MCP compliance and safer session lifecycle handling. Add targeted regression tests for accept compatibility, initialization retries, pending cleanup, and include updated swagger artifacts. commit02b33c8e85Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Wed Feb 11 15:42:21 2026 +0800 refactor(core): finalize user-centric identity and policy cleanup Unify auth and chat identity semantics around user_id, enforce personal-bot owner-only authorization, and remove legacy compatibility branches in integration tests. commit06e8619a37Author: BBQ <bbq@BBQdeMacBook-Air.local> Date: Wed Feb 11 14:47:03 2026 +0800 refactor(core): migrate channel identity and binding across app Align channel identity and bind flow across backend and app-facing layers, including generated swagger artifacts and package lock updates while excluding docs content changes.
This commit is contained in:
@@ -0,0 +1,120 @@
|
||||
// Code generated by sqlc. DO NOT EDIT.
|
||||
// versions:
|
||||
// sqlc v1.30.0
|
||||
// source: bind.sql
|
||||
|
||||
package sqlc
|
||||
|
||||
import (
|
||||
"context"
|
||||
|
||||
"github.com/jackc/pgx/v5/pgtype"
|
||||
)
|
||||
|
||||
const createBindCode = `-- name: CreateBindCode :one
|
||||
INSERT INTO channel_identity_bind_codes (token, issued_by_user_id, channel_type, expires_at)
|
||||
VALUES ($1, $2, $3, $4)
|
||||
RETURNING id, token, issued_by_user_id, channel_type, expires_at, used_at, used_by_channel_identity_id, created_at
|
||||
`
|
||||
|
||||
type CreateBindCodeParams struct {
|
||||
Token string `json:"token"`
|
||||
IssuedByUserID pgtype.UUID `json:"issued_by_user_id"`
|
||||
ChannelType pgtype.Text `json:"channel_type"`
|
||||
ExpiresAt pgtype.Timestamptz `json:"expires_at"`
|
||||
}
|
||||
|
||||
func (q *Queries) CreateBindCode(ctx context.Context, arg CreateBindCodeParams) (ChannelIdentityBindCode, error) {
|
||||
row := q.db.QueryRow(ctx, createBindCode,
|
||||
arg.Token,
|
||||
arg.IssuedByUserID,
|
||||
arg.ChannelType,
|
||||
arg.ExpiresAt,
|
||||
)
|
||||
var i ChannelIdentityBindCode
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Token,
|
||||
&i.IssuedByUserID,
|
||||
&i.ChannelType,
|
||||
&i.ExpiresAt,
|
||||
&i.UsedAt,
|
||||
&i.UsedByChannelIdentityID,
|
||||
&i.CreatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const getBindCode = `-- name: GetBindCode :one
|
||||
SELECT id, token, issued_by_user_id, channel_type, expires_at, used_at, used_by_channel_identity_id, created_at
|
||||
FROM channel_identity_bind_codes
|
||||
WHERE token = $1
|
||||
`
|
||||
|
||||
func (q *Queries) GetBindCode(ctx context.Context, token string) (ChannelIdentityBindCode, error) {
|
||||
row := q.db.QueryRow(ctx, getBindCode, token)
|
||||
var i ChannelIdentityBindCode
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Token,
|
||||
&i.IssuedByUserID,
|
||||
&i.ChannelType,
|
||||
&i.ExpiresAt,
|
||||
&i.UsedAt,
|
||||
&i.UsedByChannelIdentityID,
|
||||
&i.CreatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const getBindCodeForUpdate = `-- name: GetBindCodeForUpdate :one
|
||||
SELECT id, token, issued_by_user_id, channel_type, expires_at, used_at, used_by_channel_identity_id, created_at
|
||||
FROM channel_identity_bind_codes
|
||||
WHERE token = $1
|
||||
FOR UPDATE
|
||||
`
|
||||
|
||||
func (q *Queries) GetBindCodeForUpdate(ctx context.Context, token string) (ChannelIdentityBindCode, error) {
|
||||
row := q.db.QueryRow(ctx, getBindCodeForUpdate, token)
|
||||
var i ChannelIdentityBindCode
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Token,
|
||||
&i.IssuedByUserID,
|
||||
&i.ChannelType,
|
||||
&i.ExpiresAt,
|
||||
&i.UsedAt,
|
||||
&i.UsedByChannelIdentityID,
|
||||
&i.CreatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
|
||||
const markBindCodeUsed = `-- name: MarkBindCodeUsed :one
|
||||
UPDATE channel_identity_bind_codes
|
||||
SET used_at = now(), used_by_channel_identity_id = $2
|
||||
WHERE id = $1
|
||||
AND used_at IS NULL
|
||||
RETURNING id, token, issued_by_user_id, channel_type, expires_at, used_at, used_by_channel_identity_id, created_at
|
||||
`
|
||||
|
||||
type MarkBindCodeUsedParams struct {
|
||||
ID pgtype.UUID `json:"id"`
|
||||
UsedByChannelIdentityID pgtype.UUID `json:"used_by_channel_identity_id"`
|
||||
}
|
||||
|
||||
func (q *Queries) MarkBindCodeUsed(ctx context.Context, arg MarkBindCodeUsedParams) (ChannelIdentityBindCode, error) {
|
||||
row := q.db.QueryRow(ctx, markBindCodeUsed, arg.ID, arg.UsedByChannelIdentityID)
|
||||
var i ChannelIdentityBindCode
|
||||
err := row.Scan(
|
||||
&i.ID,
|
||||
&i.Token,
|
||||
&i.IssuedByUserID,
|
||||
&i.ChannelType,
|
||||
&i.ExpiresAt,
|
||||
&i.UsedAt,
|
||||
&i.UsedByChannelIdentityID,
|
||||
&i.CreatedAt,
|
||||
)
|
||||
return i, err
|
||||
}
|
||||
Reference in New Issue
Block a user