xiaoxue_admin
/
Folo
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(store): handle null titles when sorting imported subscriptions (#4840)

This commit is contained in:
Kowyo 2026-02-13 20:03:52 +08:00 committed by GitHub
parent 01da257c90
commit 2d7fe56ce2
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
packages/internal/store/src/modules/subscription/getter.ts
View File

@ -103,8 +103,8 @@ const sortUngroupedSubscriptionByAlphabet = (
if (!leftFeed || !rightFeed) return 0
const comparedLeftTitle = leftSubscription.title || leftFeed.title!
const comparedRightTitle = rightSubscription.title || rightFeed.title!
const comparedLeftTitle = leftSubscription.title ?? leftFeed.title ?? ""
const comparedRightTitle = rightSubscription.title ?? rightFeed.title ?? ""
return sortByAlphabet(comparedLeftTitle, comparedRightTitle)
}
@ -273,7 +273,7 @@ export const getSortedFeedSubscriptionByAlphabetSelector =
const leftFeed = getFeedById(a)
const rightFeed = getFeedById(b)
if (!leftFeed || !rightFeed) return 0
return sortByAlphabet(leftFeed.title!, rightFeed.title!)
return sortByAlphabet(leftFeed.title ?? "", rightFeed.title ?? "")
})
}

13
packages/internal/utils/src/utils.ts
View File

@ -185,9 +185,12 @@ export const omitObjectUndefinedValue = (obj: Record<string, any>) => {
return newObj
}
export const sortByAlphabet = (a: string, b: string) => {
const isALetter = /^[a-z]/i.test(a)
const isBLetter = /^[a-z]/i.test(b)
export const sortByAlphabet = (a: string | null | undefined, b: string | null | undefined) => {
const safeA = String(a ?? "")
const safeB = String(b ?? "")
const isALetter = /^[a-z]/i.test(safeA)
const isBLetter = /^[a-z]/i.test(safeB)
if (isALetter && !isBLetter) {
return -1
@ -197,10 +200,10 @@ export const sortByAlphabet = (a: string, b: string) => {
}
if (isALetter && isBLetter) {
return a.localeCompare(b)
return safeA.localeCompare(safeB)
}
return a.localeCompare(b, "zh-CN")
return safeA.localeCompare(safeB, "zh-CN")
}
export const isEmptyObject = (obj: Record<string, any>) => Object.keys(obj).length === 0