Merge remote-tracking branch 'origin/dev' into dev

2023-03-24 10:02:06 +08:00 · 2023-03-24 10:02:06 +08:00 · f9ead1db1e
commit f9ead1db1e
parent 8a73e08acd 5fca475702
2 changed files with 3 additions and 1 deletions
--- a/kernel/model/block.go
+++ b/kernel/model/block.go
@ -61,7 +61,8 @@ type Block struct {
 	Created  string            `json:"created"`
 	Updated  string            `json:"updated"`

-	RiffCardID string `json:"riffCardID"`
+	RiffCardID   string `json:"riffCardID"`
+	RiffCardReps uint64 `json:"riffCardReps"`
 }

 func (block *Block) IsContainerBlock() bool {
--- a/kernel/model/flashcard.go
+++ b/kernel/model/flashcard.go
@ -178,6 +178,7 @@ func getCardsBlocks(cards []riff.Card, page int) (blocks []*Block, total, pageCo
 		}

 		b.RiffCardID = cards[i].ID()
+		b.RiffCardReps = cards[i].(*riff.FSRSCard).C.Reps
 	}
 	return
 }