mirror of
https://github.com/usememos/memos.git
synced 2025-06-05 22:09:59 +02:00
chore: update find memo api
This commit is contained in:
@@ -471,8 +471,9 @@ func (s *APIV1Service) GetMemoStats(c echo.Context) error {
|
|||||||
normalStatus := store.Normal
|
normalStatus := store.Normal
|
||||||
hasParentFlag := false
|
hasParentFlag := false
|
||||||
findMemoMessage := &store.FindMemo{
|
findMemoMessage := &store.FindMemo{
|
||||||
RowStatus: &normalStatus,
|
RowStatus: &normalStatus,
|
||||||
HasParent: &hasParentFlag,
|
HasParent: &hasParentFlag,
|
||||||
|
ExcludeContent: true,
|
||||||
}
|
}
|
||||||
if creatorID, err := util.ConvertStringToInt32(c.QueryParam("creatorId")); err == nil {
|
if creatorID, err := util.ConvertStringToInt32(c.QueryParam("creatorId")); err == nil {
|
||||||
findMemoMessage.CreatorID = &creatorID
|
findMemoMessage.CreatorID = &creatorID
|
||||||
|
@@ -104,17 +104,23 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
|
|||||||
}
|
}
|
||||||
orders = append(orders, "id DESC")
|
orders = append(orders, "id DESC")
|
||||||
|
|
||||||
|
fields := []string{
|
||||||
|
`memo.id AS id`,
|
||||||
|
`memo.creator_id AS creator_id`,
|
||||||
|
`memo.created_ts AS created_ts`,
|
||||||
|
`memo.updated_ts AS updated_ts`,
|
||||||
|
`memo.row_status AS row_status`,
|
||||||
|
`memo.visibility AS visibility`,
|
||||||
|
}
|
||||||
|
if !find.ExcludeContent {
|
||||||
|
fields = append(fields, `memo.content AS content`)
|
||||||
|
}
|
||||||
|
|
||||||
query := `
|
query := `
|
||||||
SELECT
|
SELECT
|
||||||
memo.id AS id,
|
` + strings.Join(fields, ", ") + `
|
||||||
memo.creator_id AS creator_id,
|
CASE WHEN mo.pinned = 1 THEN 1 ELSE 0 END AS pinned,
|
||||||
memo.created_ts AS created_ts,
|
(
|
||||||
memo.updated_ts AS updated_ts,
|
|
||||||
memo.row_status AS row_status,
|
|
||||||
memo.content AS content,
|
|
||||||
memo.visibility AS visibility,
|
|
||||||
CASE WHEN memo_organizer.pinned = 1 THEN 1 ELSE 0 END AS pinned,
|
|
||||||
(
|
|
||||||
SELECT
|
SELECT
|
||||||
related_memo_id
|
related_memo_id
|
||||||
FROM
|
FROM
|
||||||
@@ -122,26 +128,25 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
|
|||||||
WHERE
|
WHERE
|
||||||
memo_relation.memo_id = memo.id AND memo_relation.type = 'COMMENT'
|
memo_relation.memo_id = memo.id AND memo_relation.type = 'COMMENT'
|
||||||
LIMIT 1
|
LIMIT 1
|
||||||
) AS parent_id,
|
) AS parent_id,
|
||||||
GROUP_CONCAT(resource.id) AS resource_id_list,
|
GROUP_CONCAT(resource.id) AS resource_id_list,
|
||||||
(
|
(
|
||||||
SELECT
|
SELECT
|
||||||
GROUP_CONCAT(memo_id || ':' || related_memo_id || ':' || type)
|
GROUP_CONCAT(memo_relation.memo_id || ':' || memo_relation.related_memo_id || ':' || memo_relation.type)
|
||||||
FROM
|
FROM
|
||||||
memo_relation
|
memo_relation
|
||||||
WHERE
|
WHERE
|
||||||
memo_relation.memo_id = memo.id OR memo_relation.related_memo_id = memo.id
|
memo_relation.memo_id = memo.id OR memo_relation.related_memo_id = memo.id
|
||||||
) AS relation_list
|
) AS relation_list
|
||||||
FROM
|
FROM
|
||||||
memo
|
memo
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
memo_organizer ON memo.id = memo_organizer.memo_id
|
memo_organizer mo ON memo.id = mo.memo_id
|
||||||
LEFT JOIN
|
LEFT JOIN
|
||||||
resource ON memo.id = resource.memo_id
|
resource ON memo.id = resource.memo_id
|
||||||
WHERE ` + strings.Join(where, " AND ") + `
|
WHERE ` + strings.Join(where, " AND ") + `
|
||||||
GROUP BY memo.id
|
GROUP BY memo.id
|
||||||
ORDER BY ` + strings.Join(orders, ", ") + `
|
ORDER BY ` + strings.Join(orders, ", ")
|
||||||
`
|
|
||||||
if find.Limit != nil {
|
if find.Limit != nil {
|
||||||
query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)
|
query = fmt.Sprintf("%s LIMIT %d", query, *find.Limit)
|
||||||
if find.Offset != nil {
|
if find.Offset != nil {
|
||||||
@@ -160,19 +165,19 @@ func (d *DB) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.Memo
|
|||||||
var memo store.Memo
|
var memo store.Memo
|
||||||
var memoResourceIDList sql.NullString
|
var memoResourceIDList sql.NullString
|
||||||
var memoRelationList sql.NullString
|
var memoRelationList sql.NullString
|
||||||
if err := rows.Scan(
|
dests := []any{
|
||||||
&memo.ID,
|
&memo.ID,
|
||||||
&memo.CreatorID,
|
&memo.CreatorID,
|
||||||
&memo.CreatedTs,
|
&memo.CreatedTs,
|
||||||
&memo.UpdatedTs,
|
&memo.UpdatedTs,
|
||||||
&memo.RowStatus,
|
&memo.RowStatus,
|
||||||
&memo.Content,
|
|
||||||
&memo.Visibility,
|
&memo.Visibility,
|
||||||
&memo.Pinned,
|
}
|
||||||
&memo.ParentID,
|
if !find.ExcludeContent {
|
||||||
&memoResourceIDList,
|
dests = append(dests, &memo.Content)
|
||||||
&memoRelationList,
|
}
|
||||||
); err != nil {
|
dests = append(dests, &memo.Pinned, &memo.ParentID, &memoResourceIDList, &memoRelationList)
|
||||||
|
if err := rows.Scan(dests...); err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -64,6 +64,7 @@ type FindMemo struct {
|
|||||||
VisibilityList []Visibility
|
VisibilityList []Visibility
|
||||||
Pinned *bool
|
Pinned *bool
|
||||||
HasParent *bool
|
HasParent *bool
|
||||||
|
ExcludeContent bool
|
||||||
|
|
||||||
// Pagination
|
// Pagination
|
||||||
Limit *int
|
Limit *int
|
||||||
|
@@ -104,7 +104,7 @@ const MemoDetail = () => {
|
|||||||
<>
|
<>
|
||||||
<section className="relative top-0 w-full min-h-full overflow-x-hidden bg-zinc-100 dark:bg-zinc-900">
|
<section className="relative top-0 w-full min-h-full overflow-x-hidden bg-zinc-100 dark:bg-zinc-900">
|
||||||
<div className="relative w-full h-auto mx-auto flex flex-col justify-start items-center bg-white dark:bg-zinc-700">
|
<div className="relative w-full h-auto mx-auto flex flex-col justify-start items-center bg-white dark:bg-zinc-700">
|
||||||
<div className="w-full flex flex-col justify-start items-center py-8">
|
<div className="w-full flex flex-col justify-start items-center pt-16 pb-8">
|
||||||
<UserAvatar className="!w-20 h-auto mb-2 drop-shadow" avatarUrl={systemStatus.customizedProfile.logoUrl} />
|
<UserAvatar className="!w-20 h-auto mb-2 drop-shadow" avatarUrl={systemStatus.customizedProfile.logoUrl} />
|
||||||
<p className="text-3xl text-black opacity-80 dark:text-gray-200">{systemStatus.customizedProfile.name}</p>
|
<p className="text-3xl text-black opacity-80 dark:text-gray-200">{systemStatus.customizedProfile.name}</p>
|
||||||
</div>
|
</div>
|
||||||
@@ -186,7 +186,7 @@ const MemoDetail = () => {
|
|||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
<div className="py-6 w-full border-t dark:border-t-zinc-700">
|
<div className="pt-8 pb-16 w-full border-t dark:border-t-zinc-700">
|
||||||
<div className="relative mx-auto flex-grow max-w-2xl w-full min-h-full flex flex-col justify-start items-start px-4 gap-y-1">
|
<div className="relative mx-auto flex-grow max-w-2xl w-full min-h-full flex flex-col justify-start items-start px-4 gap-y-1">
|
||||||
{comments.length === 0 ? (
|
{comments.length === 0 ? (
|
||||||
<div className="w-full flex flex-col justify-center items-center py-6 mb-2">
|
<div className="w-full flex flex-col justify-center items-center py-6 mb-2">
|
||||||
|
Reference in New Issue
Block a user