diff --git a/release/sites/Danbooru (2.0)/model.ts b/release/sites/Danbooru (2.0)/model.ts index 803660f73..ad4576a28 100644 --- a/release/sites/Danbooru (2.0)/model.ts +++ b/release/sites/Danbooru (2.0)/model.ts @@ -257,7 +257,7 @@ export const source: ISource = { }, parse: (src: string): IParsedSearch => { let wiki = Grabber.regexToConst("wiki", '
]+)>(?.+?)
', src); - wiki = wiki.replace(/href="\/wiki_pages\/show_or_new\?title=([^"]+)"/g, 'href="$1"'); + wiki = wiki ? wiki.replace(/href="\/wiki_pages\/show_or_new\?title=([^"]+)"/g, 'href="$1"') : wiki; return { tags: Grabber.regexToTags('
  • (?:\\s*\\?)?(?:\\s*]* class="search-inc-tag">[^<]+\\s*]* class="search-exl-tag">[^<]+)?\\s*]*href="[^"]+"[^>]*>(?[^<]+)\\s*(?[^<]+)\\s*
  • ', src), images: Grabber.regexToImages(']* id="[^"]*" class="[^"]*"\\s+data-id="(?[^"]*)"\\s+data-has-sound="[^"]*"\\s+data-tags="(?[^"]*)"\\s+data-pools="(?[^"]*)"(?:\\s+data-uploader="(?[^"]*)")?\\s+data-approver-id="(?[^"]*)"\\s+data-rating="(?[^"]*)"\\s+data-width="(?[^"]*)"\\s+data-height="(?[^"]*)"\\s+data-flags="(?[^"]*)"\\s+data-parent-id="(?[^"]*)"\\s+data-has-children="(?[^"]*)"\\s+data-score="(?[^"]*)"\\s+data-views="[^"]*"\\s+data-fav-count="(?[^"]*)"\\s+data-pixiv-id="[^"]*"\\s+data-file-ext="(?[^"]*)"\\s+data-source="(?[^"]*)"\\s+data-top-tagger="[^"]*"\\s+data-uploader-id="[^"]*"\\s+data-normalized-source="[^"]*"\\s+data-is-favorited="[^"]*"\\s+data-md5="(?[^"]*)"\\s+data-file-url="(?[^"]*)"\\s+data-large-file-url="(?[^"]*)"\\s+data-preview-file-url="(?[^"]*)"', src).map(completeImage), diff --git a/release/sites/Danbooru/model.ts b/release/sites/Danbooru/model.ts index 642dcabd2..e445fd0de 100644 --- a/release/sites/Danbooru/model.ts +++ b/release/sites/Danbooru/model.ts @@ -189,7 +189,7 @@ export const source: ISource = { }, parse: (src: string): IParsedSearch => { let wiki = Grabber.regexToConst("wiki", '', src); - wiki = wiki.replace(/href="\/wiki\/show\?title=([^"]+)"/g, 'href="$1"'); + wiki = wiki ? wiki.replace(/href="\/wiki\/show\?title=([^"]+)"/g, 'href="$1"') : wiki; return { images: Grabber.regexToImages("Post\\.register\\((?\\{.+?\\})\\);?", src).map(completeImage), tags: Grabber.regexToTags('
  • ]*tag-type-(?[^">]+)(?:|"[^>]*)>.*?]*>(?[^<\\?]+).*?(?\\d+).*?
  • ', src), diff --git a/release/sites/Sankaku/model.ts b/release/sites/Sankaku/model.ts index 1cb9d42f1..109adb439 100644 --- a/release/sites/Sankaku/model.ts +++ b/release/sites/Sankaku/model.ts @@ -86,7 +86,7 @@ export const source: ISource = { const searchImageCounts = Grabber.regexMatches('class="?tag-(?:count|type-none)"? title="Post Count: (?[0-9,]+)"', src); const lastPage = Grabber.regexToConst("page", '\\s*(?[0-9,]+)\\s*\\s*>>\\s*', src); let wiki = Grabber.regexToConst("wiki", '
    ]*>(?.+?)
    ', src); - wiki = wiki.replace(/href="\/wiki\/show\?title=([^"]+)"/g, 'href="$1"'); + wiki = wiki ? wiki.replace(/href="\/wiki\/show\?title=([^"]+)"/g, 'href="$1"') : undefined; return { tags: Grabber.regexToTags('
  • ]*tag-type-(?[^">]+)(?:|"[^>]*)>.*?]*>(?[^<\\?]+).*?(?\\d+).*?
  • ', src), images: Grabber.regexToImages(']* id="?p(?\\d+)"?>]*>]* src="(?[^"]+/preview/\\w{2}/\\w{2}/(?[^.]+)\\.[^"]+|[^"]+/download-preview.png)" title="(?[^"]+)"[^>]+>', src).map(completeImage),