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
refactor: use the built-in max/min to simplify the code (#6060)
grandpig76aee4e17732
diff --git a/internal/ai/audio/webm.go b/internal/ai/audio/webm.goindex 6f3b28e35..9acf6eb2d 100644--- a/internal/ai/audio/webm.go+++ b/internal/ai/audio/webm.go@@ -98,10 +98,7 @@ func WebMOpusToWAV(input []byte) ([]byte, error) {}}- skip := preSkip * channels- if skip > len(pcm) {- skip = len(pcm)- }+ skip := min(preSkip*channels, len(pcm))pcm = pcm[skip:]return encodeWAV(pcm, opusOutputSampleRate, channels), nildiff --git a/server/router/api/v1/memo_service.go b/server/router/api/v1/memo_service.goindex 956b090e2..21afdf372 100644--- a/server/router/api/v1/memo_service.go+++ b/server/router/api/v1/memo_service.go@@ -236,10 +236,7 @@ func (s *APIV1Service) ListMemos(ctx context.Context, request *v1pb.ListMemosReqreturn nil, status.Errorf(codes.InvalidArgument, "invalid page token: %v", err)}limit = normalizePageSize(pageToken.Limit)- offset = int(pageToken.Offset)- if offset < 0 {- offset = 0- }+ offset = max(int(pageToken.Offset), 0)} else {limit = normalizePageSize(request.PageSize)}@@ -782,10 +779,7 @@ func (s *APIV1Service) ListMemoComments(ctx context.Context, request *v1pb.ListMreturn nil, status.Errorf(codes.InvalidArgument, "invalid page token: %v", err)}limit = normalizePageSize(pageToken.Limit)- offset = int(pageToken.Offset)- if offset < 0 {- offset = 0- }+ offset = max(int(pageToken.Offset), 0)} else {limit = normalizePageSize(request.PageSize)}diff --git a/store/db/mysql/user_delete.go b/store/db/mysql/user_delete.goindex dfd1a723f..85e150ca6 100644--- a/store/db/mysql/user_delete.go+++ b/store/db/mysql/user_delete.go@@ -524,10 +524,7 @@ func deleteUserBatches[T any](values []T, size int) [][]T {batches := make([][]T, 0, (len(values)+size-1)/size)for start := 0; start < len(values); start += size {- end := start + size- if end > len(values) {- end = len(values)- }+ end := min(start+size, len(values))batches = append(batches, values[start:end])}return batchesdiff --git a/store/db/postgres/user_delete.go b/store/db/postgres/user_delete.goindex 6f97ac48b..84d25625c 100644--- a/store/db/postgres/user_delete.go+++ b/store/db/postgres/user_delete.go@@ -487,10 +487,7 @@ func deleteUserBatches[T any](values []T, size int) [][]T {batches := make([][]T, 0, (len(values)+size-1)/size)for start := 0; start < len(values); start += size {- end := start + size- if end > len(values) {- end = len(values)- }+ end := min(start+size, len(values))batches = append(batches, values[start:end])}return batchesdiff --git a/store/db/sqlite/user_delete.go b/store/db/sqlite/user_delete.goindex 07b241f7d..563b34a1c 100644--- a/store/db/sqlite/user_delete.go+++ b/store/db/sqlite/user_delete.go@@ -487,10 +487,7 @@ func deleteUserBatches[T any](values []T, size int) [][]T {batches := make([][]T, 0, (len(values)+size-1)/size)for start := 0; start < len(values); start += size {- end := start + size- if end > len(values) {- end = len(values)- }+ end := min(start+size, len(values))batches = append(batches, values[start:end])}return batches