From 36fe9e116e982428ea6bd4739d6a657438b1b84e Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 28 Jul 2023 18:52:45 +0800 Subject: [PATCH 1/3] =?UTF-8?q?:art:=20Upgrade=20flashcard=20algorithm=20t?= =?UTF-8?q?o=20FSRSv4=20Fix=20https://github.com/siyuan-note/siyuan/issues?= =?UTF-8?q?/8843=20Rating=20=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=20https:/?= =?UTF-8?q?/github.com/siyuan-note/riff/issues/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/card/openCard.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/src/card/openCard.ts b/app/src/card/openCard.ts index 1427ea4ce..19d5d7215 100644 --- a/app/src/card/openCard.ts +++ b/app/src/card/openCard.ts @@ -349,7 +349,7 @@ export const bindCardEvent = (options: { } return; } - if (["0", "1", "2", "3", "-3"].includes(type) && actionElements[0].classList.contains("fn__none")) { + if (["1", "2", "3", "4", "-3"].includes(type) && actionElements[0].classList.contains("fn__none")) { fetchPost(type === "-3" ? "/api/riff/skipReviewRiffCard" : "/api/riff/reviewRiffCard", { deckID: options.blocks[index].deckID, cardID: options.blocks[index].cardID, From 53db7e22d45045a8c59a4a9731289a850a1ba092 Mon Sep 17 00:00:00 2001 From: Daniel <845765@qq.com> Date: Fri, 28 Jul 2023 18:53:44 +0800 Subject: [PATCH 2/3] =?UTF-8?q?:art:=20Upgrade=20flashcard=20algorithm=20t?= =?UTF-8?q?o=20FSRSv4=20Fix=20https://github.com/siyuan-note/siyuan/issues?= =?UTF-8?q?/8843=20Rating=20=E7=9B=B8=E5=85=B3=E9=97=AE=E9=A2=98=20https:/?= =?UTF-8?q?/github.com/siyuan-note/riff/issues/2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- kernel/go.mod | 2 +- kernel/go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/kernel/go.mod b/kernel/go.mod index c14711c92..9a82b4ddc 100644 --- a/kernel/go.mod +++ b/kernel/go.mod @@ -51,7 +51,7 @@ require ( github.com/siyuan-note/filelock v0.0.0-20230615140405-d05a21d49524 github.com/siyuan-note/httpclient v0.0.0-20230726100424-dca968525ec6 github.com/siyuan-note/logging v0.0.0-20230327073243-ebe83aec1493 - github.com/siyuan-note/riff v0.0.0-20230728094206-c39d8f20d0c6 + github.com/siyuan-note/riff v0.0.0-20230728105206-f7c344346d61 github.com/steambap/captcha v1.4.1 github.com/studio-b12/gowebdav v0.9.0 github.com/vmihailenco/msgpack/v5 v5.3.5 diff --git a/kernel/go.sum b/kernel/go.sum index 7c4e28ab1..bf1abea8c 100644 --- a/kernel/go.sum +++ b/kernel/go.sum @@ -302,8 +302,8 @@ github.com/siyuan-note/httpclient v0.0.0-20230726100424-dca968525ec6 h1:h96nJtx5 github.com/siyuan-note/httpclient v0.0.0-20230726100424-dca968525ec6/go.mod h1:NBC9D4kBDDHJk00trpUBl7bVedYkjGk7TEsfVXyr6jg= github.com/siyuan-note/logging v0.0.0-20230327073243-ebe83aec1493 h1:oaN5b0WDFkjdBgGxmmBnMrtZxaJ76LZLwhQSZnznJMI= github.com/siyuan-note/logging v0.0.0-20230327073243-ebe83aec1493/go.mod h1:6mRFtAAvYPn3cDzqvyv+t8BVPGqpONDMMb5ywOhY1D4= -github.com/siyuan-note/riff v0.0.0-20230728094206-c39d8f20d0c6 h1:z+MUQtN58REihnVp0oMvunbX+ekRgzWJhw6NvVlNEtM= -github.com/siyuan-note/riff v0.0.0-20230728094206-c39d8f20d0c6/go.mod h1:ofTZZkYTjMS/mYo9VLjQfgsiwlTEK4ragBiQmKSK/QE= +github.com/siyuan-note/riff v0.0.0-20230728105206-f7c344346d61 h1:67G1+JSlkcbRsCig83khfK7e96DxrsVnha87Tm/xgdo= +github.com/siyuan-note/riff v0.0.0-20230728105206-f7c344346d61/go.mod h1:ofTZZkYTjMS/mYo9VLjQfgsiwlTEK4ragBiQmKSK/QE= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d h1:zE9ykElWQ6/NYmHa3jpm/yHnI4xSofP+UP6SpjHcSeM= github.com/smartystreets/assertions v0.0.0-20180927180507-b2de0cb4f26d/go.mod h1:OnSkiWE9lh6wB0YB77sQom3nweQdgAjqCqsofrRNTgc= github.com/smartystreets/goconvey v1.6.7 h1:I6tZjLXD2Q1kjvNbIzB1wvQBsXmKXiVrhpRE8ZjP5jY= From 0c621de5d9a1c762a919911e3add7cfbb840d768 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Candy=E3=83=A1=E5=A5=B6=E7=B3=96?= <359031282@qq.com> Date: Sat, 29 Jul 2023 09:43:21 +0800 Subject: [PATCH 3/3] :bug: When maxListCount limit is not reached, the wrong pop-up box prompts a maxListCount error (#8846) box.Ls(path) will count the same document repeatedly (x/x.sy). Before checking maxListCount limit, assign len(ret) to the totals variable so that it only represents the number of .sy documents --- kernel/model/file.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/kernel/model/file.go b/kernel/model/file.go index 8542f9190..be56fc848 100644 --- a/kernel/model/file.go +++ b/kernel/model/file.go @@ -387,6 +387,7 @@ func ListDocTree(boxID, path string, sortMode int, flashcard bool, maxListCount return fileTreeFiles[i].Sort < fileTreeFiles[j].Sort }) ret = append(ret, fileTreeFiles...) + totals = len(ret) if maxListCount < len(ret) { ret = ret[:maxListCount] } @@ -414,6 +415,7 @@ func ListDocTree(boxID, path string, sortMode int, flashcard bool, maxListCount ret = append(ret, docs...) } + totals = len(ret) if maxListCount < len(ret) { ret = ret[:maxListCount] }