Memos is an open-source, self-hosted note-taking app that brings your everyday thoughts together in a personal timeline. Your data stays yours, and you choose what to keep private or share.
Go dockerfossgomarkdownmemomicroblognote-takingnotesopen-sourceown-your-datareactself-hostedsqlitetimeline
chore: update list memo relations
Stevenfd395e56619d
diff --git a/store/mysql/memo.go b/store/mysql/memo.goindex b898db0f9..06df3cb54 100644--- a/store/mysql/memo.go+++ b/store/mysql/memo.go@@ -102,13 +102,11 @@ func (d *Driver) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.GROUP_CONCAT(resource.id) AS resource_id_list,(SELECT- GROUP_CONCAT(related_memo_id,':',type)+ GROUP_CONCAT(memo_id,':',related_memo_id,':',type)FROMmemo_relationWHERE- memo_relation.memo_id = memo.id- GROUP BY- memo_relation.memo_id+ memo_relation.memo_id = memo.id OR memo_relation.related_memo_id = memo.id) AS relation_listFROMmemo@@ -169,21 +167,25 @@ func (d *Driver) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.relatedMemoTypeList := strings.Split(memoRelationList.String, ",")for _, relatedMemoType := range relatedMemoTypeList {relatedMemoTypeList := strings.Split(relatedMemoType, ":")- if len(relatedMemoTypeList) != 2 {+ if len(relatedMemoTypeList) != 3 {return nil, errors.Errorf("invalid relation format")}- relatedMemoID, err := util.ConvertStringToInt32(relatedMemoTypeList[0])+ memoID, err := util.ConvertStringToInt32(relatedMemoTypeList[0])if err != nil {return nil, err}- relationType := store.MemoRelationType(relatedMemoTypeList[1])+ relatedMemoID, err := util.ConvertStringToInt32(relatedMemoTypeList[1])+ if err != nil {+ return nil, err+ }+ relationType := store.MemoRelationType(relatedMemoTypeList[2])memo.RelationList = append(memo.RelationList, &store.MemoRelation{- MemoID: memo.ID,+ MemoID: memoID,RelatedMemoID: relatedMemoID,Type: relationType,})// Set the first parent ID if relation type is comment.- if memo.ParentID == nil && relationType == store.MemoRelationComment {+ if memo.ParentID == nil && memoID == memo.ID && relationType == store.MemoRelationComment {memo.ParentID = &relatedMemoID}}diff --git a/store/sqlite/memo.go b/store/sqlite/memo.goindex 6a0cd6737..788d8b93f 100644--- a/store/sqlite/memo.go+++ b/store/sqlite/memo.go@@ -102,13 +102,11 @@ func (d *Driver) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.GROUP_CONCAT(resource.id) AS resource_id_list,(SELECT- GROUP_CONCAT(related_memo_id || ':' || type)+ GROUP_CONCAT(memo_id || ':' || related_memo_id || ':' || type)FROMmemo_relationWHERE- memo_relation.memo_id = memo.id- GROUP BY- memo_relation.memo_id+ memo_relation.memo_id = memo.id OR memo_relation.related_memo_id = memo.id) AS relation_listFROMmemo@@ -169,21 +167,25 @@ func (d *Driver) ListMemos(ctx context.Context, find *store.FindMemo) ([]*store.relatedMemoTypeList := strings.Split(memoRelationList.String, ",")for _, relatedMemoType := range relatedMemoTypeList {relatedMemoTypeList := strings.Split(relatedMemoType, ":")- if len(relatedMemoTypeList) != 2 {+ if len(relatedMemoTypeList) != 3 {return nil, errors.New("invalid relation format")}- relatedMemoID, err := util.ConvertStringToInt32(relatedMemoTypeList[0])+ memoID, err := util.ConvertStringToInt32(relatedMemoTypeList[0])if err != nil {return nil, err}- relationType := store.MemoRelationType(relatedMemoTypeList[1])+ relatedMemoID, err := util.ConvertStringToInt32(relatedMemoTypeList[1])+ if err != nil {+ return nil, err+ }+ relationType := store.MemoRelationType(relatedMemoTypeList[2])memo.RelationList = append(memo.RelationList, &store.MemoRelation{- MemoID: memo.ID,+ MemoID: memoID,RelatedMemoID: relatedMemoID,Type: relationType,})// Set the first parent ID if relation type is comment.- if memo.ParentID == nil && relationType == store.MemoRelationComment {+ if memo.ParentID == nil && memoID == memo.ID && relationType == store.MemoRelationComment {memo.ParentID = &relatedMemoID}}