From de439d2cdc92e1f9facbb4e3cf4fb2e970c721c7 Mon Sep 17 00:00:00 2001
From: HughWan <977741432@qq.com>
Date: Thu, 21 Dec 2023 22:57:46 +0800
Subject: [PATCH] fix note import error

---
 src/org/wanxp/douban/data/handler/DoubanMovieLoadHandler.ts   | 4 ++--
 src/org/wanxp/douban/data/handler/DoubanNoteLoadHandler.ts    | 3 +--
 .../wanxp/douban/data/handler/DoubanTeleplayLoadHandler.ts    | 4 ++--
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/org/wanxp/douban/data/handler/DoubanMovieLoadHandler.ts b/src/org/wanxp/douban/data/handler/DoubanMovieLoadHandler.ts
index fa5a5a7..f031057 100644
--- a/src/org/wanxp/douban/data/handler/DoubanMovieLoadHandler.ts
+++ b/src/org/wanxp/douban/data/handler/DoubanMovieLoadHandler.ts
@@ -34,8 +34,8 @@ export default class DoubanMovieLoadHandler extends DoubanAbstractLoadHandler<Do
 		return beforeContent
 			.replaceAll("{{originalTitle}}", extract.originalTitle ??  "")
 			.replaceAll("{{director}}", this.handleArray(extract.director.map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c), context))
-			.replaceAll("{{actor}}", this.handleArray( extract.actor.map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c), context))
-			.replaceAll("{{author}}", this.handleArray(extract.author.map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c), context))
+			.replaceAll("{{actor}}", this.handleArray( extract.actor.map(SchemaOrg.getPersonName).filter(c => c), context))
+			.replaceAll("{{author}}", this.handleArray(extract.author.map(SchemaOrg.getPersonName).filter(c => c), context))
 			.replaceAll("{{aliases}}", this.handleArray(extract.aliases.map(a=>a.replace(TITLE_ALIASES_SPECIAL_CHAR_REG_G, '_')), context))
 			.replaceAll("{{country}}", this.handleArray( extract.country, context))
 			.replaceAll("{{language}}",this.handleArray( extract.language, context))
diff --git a/src/org/wanxp/douban/data/handler/DoubanNoteLoadHandler.ts b/src/org/wanxp/douban/data/handler/DoubanNoteLoadHandler.ts
index 9fad9a0..396b1b6 100644
--- a/src/org/wanxp/douban/data/handler/DoubanNoteLoadHandler.ts
+++ b/src/org/wanxp/douban/data/handler/DoubanNoteLoadHandler.ts
@@ -7,7 +7,6 @@ import html2markdown from '@notable/html2markdown';
 import HandleContext from "../model/HandleContext";
 import {SupportType, TemplateKey} from "../../../constant/Constsant";
 import {UserStateSubject} from "../model/UserStateSubject";
-import {moment} from "obsidian";
 
 export default class DoubanNoteLoadHandler extends DoubanAbstractLoadHandler<DoubanNoteSubject> {
 
@@ -36,7 +35,7 @@ export default class DoubanNoteLoadHandler extends DoubanAbstractLoadHandler<Dou
 	}
 
 	support(extract: DoubanSubject): boolean {
-		return extract && extract.type && (extract.type.contains("日记") || extract.type.contains("Note") || extract.type.contains("Article"));
+		return extract && extract.type && (extract.type.contains("日记") || extract.type.contains("Note") || extract.type.contains("Article") || extract.type.contains("note") || extract.type.contains("article"));
 	}
 
 	analysisUser(html: CheerioAPI, context: HandleContext): {data:CheerioAPI ,  userState: UserStateSubject} {
diff --git a/src/org/wanxp/douban/data/handler/DoubanTeleplayLoadHandler.ts b/src/org/wanxp/douban/data/handler/DoubanTeleplayLoadHandler.ts
index efa1fe4..b6d8128 100644
--- a/src/org/wanxp/douban/data/handler/DoubanTeleplayLoadHandler.ts
+++ b/src/org/wanxp/douban/data/handler/DoubanTeleplayLoadHandler.ts
@@ -29,8 +29,8 @@ export class DoubanTeleplayLoadHandler extends DoubanAbstractLoadHandler<DoubanT
 		return beforeContent
 			.replaceAll("{{originalTitle}}", extract.originalTitle ??  "")
 			.replaceAll("{{director}}", this.handleArray( extract.director.map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c), context))
-			.replaceAll("{{actor}}", this.handleArray( extract.actor.map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c), context))
-			.replaceAll("{{author}}", this.handleArray( extract.author.map(SchemaOrg.getPersonName).map(name => super.getPersonName(name, context)).filter(c => c), context))
+			.replaceAll("{{actor}}", this.handleArray( extract.actor.map(SchemaOrg.getPersonName).filter(c => c), context))
+			.replaceAll("{{author}}", this.handleArray( extract.author.map(SchemaOrg.getPersonName).filter(c => c), context))
 			.replaceAll("{{aliases}}", this.handleArray( extract.aliases.map(a=>a.replace(TITLE_ALIASES_SPECIAL_CHAR_REG_G, '_')), context))
 			.replaceAll("{{country}}", this.handleArray( extract.country, context))
 			.replaceAll("{{language}}", this.handleArray(extract.language, context))