From eab5e51f666b362c71bf23e5aa71db2c274ba7b1 Mon Sep 17 00:00:00 2001 From: lyswhut Date: Tue, 5 Sep 2023 12:14:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=BD=9C=E5=9C=A8=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/renderer/core/dislikeList.ts | 2 +- src/renderer/store/dislikeList/action.ts | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/renderer/core/dislikeList.ts b/src/renderer/core/dislikeList.ts index cf4244f4..5f85dfc4 100644 --- a/src/renderer/core/dislikeList.ts +++ b/src/renderer/core/dislikeList.ts @@ -41,7 +41,7 @@ export const overwirteDislikeInfo = async(rules: string) => { // } -export const hasDislike = (info: LX.Music.MusicInfo | null) => { +export const hasDislike = (info: LX.Music.MusicInfo | LX.Download.ListItem | null) => { if (!info) return false return action.hasDislike(info) } diff --git a/src/renderer/store/dislikeList/action.ts b/src/renderer/store/dislikeList/action.ts index 8f508d3f..04cf6601 100644 --- a/src/renderer/store/dislikeList/action.ts +++ b/src/renderer/store/dislikeList/action.ts @@ -5,7 +5,8 @@ import { dislikeInfo } from './state' import { SPLIT_CHAR } from '@common/constants' -export const hasDislike = (info: LX.Music.MusicInfo) => { +export const hasDislike = (info: LX.Music.MusicInfo | LX.Download.ListItem) => { + if ('progress' in info) info = info.metadata.musicInfo const name = info.name?.replaceAll(SPLIT_CHAR.DISLIKE_NAME, SPLIT_CHAR.DISLIKE_NAME_ALIAS).toLocaleLowerCase().trim() ?? '' const singer = info.singer?.replaceAll(SPLIT_CHAR.DISLIKE_NAME, SPLIT_CHAR.DISLIKE_NAME_ALIAS).toLocaleLowerCase().trim() ?? ''