fix(gelbooru): image broken due to missing referer

fix #73

Author: drunkg00se

src/sites/base/downloadConfig.ts

@@ -25,6 +25,7 @@ export type TemplateData = {
 
 export interface OptionBase extends DownloadSettingState {
   setProgress?: (progress: number) => void;
+  headers?: Record<string, string>;
 }
 
 export abstract class MediaDownloadConfig<T extends string | string[] = string> {
@@ -222,10 +223,6 @@ export abstract class MayBeMultiIllustsConfig extends MediaDownloadConfig<string
   abstract createBundle(option: OptionBase): DownloadConfig[];
 }
 
-interface BooruOption extends OptionBase {
-  cfClearance?: string;
-}
-
 export class BooruDownloadConfig extends MediaDownloadConfig {
   protected character: string;
   protected score: number;
@@ -247,12 +244,6 @@ export class BooruDownloadConfig extends MediaDownloadConfig {
     };
   }
 
-  protected getHeaders(cfClearance: string): Record<string, string> {
-    return {
-      cookie: `cf_clearance=${cfClearance}`
-    };
-  }
-
   protected getTemplateData(): Partial<TemplateData> {
     return {
       id: this.id,
@@ -265,18 +256,18 @@ export class BooruDownloadConfig extends MediaDownloadConfig {
     };
   }
 
-  create(option: BooruOption): DownloadConfig {
+  create(option: OptionBase): DownloadConfig {
     const {
       filenameTemplate,
       filenameConflictAction,
       directoryTemplate,
       useFileSystemAccessApi,
       setProgress,
-      cfClearance
+      headers
     } = option;
 
     return {
-      headers: cfClearance ? this.getHeaders(cfClearance) : undefined,
+      headers,
       taskId: this.getTaskId(),
       src: this.getSrc(),
       path: this.getSavePath(

src/sites/base/gelbooru/index.ts

@@ -38,6 +38,16 @@ export abstract class GelbooruV020 extends SiteInject {
     return '/favicon.ico';
   }
 
+  protected getHeaders(): Record<string, string> | undefined {
+    if (userAuthentication.cf_clearance) {
+      return {
+        cookie: `cf_clearance=${userAuthentication.cf_clearance}`
+      };
+    }
+
+    return undefined;
+  }
+
   #validityCheckFactory(
     checkValidity: (meta: Partial<GelbooruMeta>) => Promise<boolean>
   ): (postData: GelbooruHtmlPostDataV020) => Promise<PostValidState> {
@@ -58,7 +68,7 @@ export abstract class GelbooruV020 extends SiteInject {
     downloadArtworkByMeta: async (meta, signal) => {
       const downloadConfigs = new BooruDownloadConfig(meta).create({
         ...downloadSetting,
-        cfClearance: userAuthentication.cf_clearance || undefined
+        headers: this.getHeaders()
       });
 
       await downloader.download(downloadConfigs, { signal });
@@ -203,7 +213,7 @@ export abstract class GelbooruV020 extends SiteInject {
     const mediaMeta = this.parser.buildMeta(id, doc);
     const downloadConfig = new BooruDownloadConfig(mediaMeta).create({
       ...downloadSetting,
-      cfClearance: userAuthentication.cf_clearance || undefined,
+      headers: this.getHeaders(),
       setProgress: (progress: number) => {
         btn.setProgress(progress);
       }

src/sites/base/moebooru/index.ts

@@ -43,6 +43,16 @@ export abstract class Moebooru extends SiteInject {
     return BooruDownloadConfig.supportedTemplate;
   }
 
+  protected getHeaders(): Record<string, string> | undefined {
+    if (userAuthentication.cf_clearance) {
+      return {
+        cookie: `cf_clearance=${userAuthentication.cf_clearance}`
+      };
+    }
+
+    return undefined;
+  }
+
   /**
    * register
    * https://github.com/moebooru/moebooru/blob/master/app/javascript/src/legacy/post.coffee#L286
@@ -89,7 +99,7 @@ export abstract class Moebooru extends SiteInject {
     downloadArtworkByMeta: async (meta, signal) => {
       const downloadConfig = new BooruDownloadConfig(meta).create({
         ...downloadSetting,
-        cfClearance: userAuthentication.cf_clearance || undefined
+        headers: this.getHeaders()
       });
 
       await downloader.download(downloadConfig, { signal });
@@ -325,7 +335,7 @@ export abstract class Moebooru extends SiteInject {
 
     const downloadConfig = new BooruDownloadConfig(mediaMeta).create({
       ...downloadSetting,
-      cfClearance: userAuthentication.cf_clearance || undefined,
+      headers: this.getHeaders(),
       setProgress: (progress: number) => {
         btn.setProgress(progress);
       }

src/sites/gelbooru/index.ts

@@ -35,6 +35,12 @@ export class Gelbooru extends GelbooruV020 {
     return '/user_avatars/honkonymous.png';
   }
 
+  protected getHeaders() {
+    return {
+      referer: 'https://gelbooru.com/'
+    };
+  }
+
   protected getThumbnailSelector(): string {
     // favorite
     // post list

src/sites/rule34vault/downloadConfig.ts

@@ -1,10 +1,4 @@
-import type { DownloadConfig } from '@/lib/downloader';
-import {
-  BooruDownloadConfig,
-  SupportedTemplate,
-  type OptionBase,
-  type TemplateData
-} from '../base/downloadConfig';
+import { BooruDownloadConfig, SupportedTemplate, type TemplateData } from '../base/downloadConfig';
 
 export class Rule34VaultDownloadConfig extends BooruDownloadConfig {
   static get supportedTemplate(): Partial<TemplateData> {
@@ -26,8 +20,4 @@ export class Rule34VaultDownloadConfig extends BooruDownloadConfig {
       score: String(this.score)
     };
   }
-
-  create(option: OptionBase): DownloadConfig {
-    return super.create({ ...option, cfClearance: undefined });
-  }
 }

src/sites/sankakuComplex/downloadConfig.ts

@@ -3,7 +3,6 @@ import { SiteInject } from '../base';
 import { logger } from '@/lib/logger';
 import { SankakuApi, type SankakuPool } from './api';
 import { SankakuParser } from './parser';
-import { SankakuDownloadConfig } from './downloadConfig';
 import { downloadSetting } from '@/lib/store/downloadSetting.svelte';
 import { downloader } from '@/lib/downloader';
 import { historyDb } from '@/lib/db';
@@ -14,6 +13,7 @@ import { ArtworkButton } from '@/lib/components/Button/artworkButton';
 import { regexp } from '@/lib/regExp';
 import { t } from '@/lib/i18n.svelte';
 import { PostValidState } from '../base/parser';
+import { BooruDownloadConfig } from '../base/downloadConfig';
 
 /** @default query */
 type SelectorMatchStrategy = 'query' | 'match' | 'both';
@@ -103,7 +103,7 @@ export class SankakuApp extends SiteInject {
   }
 
   protected getSupportedTemplate() {
-    return SankakuDownloadConfig.supportedTemplate;
+    return BooruDownloadConfig.supportedTemplate;
   }
 
   static get hostname(): string[] {
@@ -140,7 +140,7 @@ export class SankakuApp extends SiteInject {
 
     const mediaMeta = this.parser.buildMeta(postData, postUrl, tagDetail);
 
-    const downloadConfig = new SankakuDownloadConfig(mediaMeta).create({
+    const downloadConfig = new BooruDownloadConfig(mediaMeta).create({
       ...downloadSetting,
       setProgress: (progress: number) => {
         btn.setProgress(progress);
@@ -334,7 +334,7 @@ export class SankakuApp extends SiteInject {
     downloadArtworkByMeta: async (meta, signal) => {
       if (this.parser.isURLExpired(meta.src)) throw new Error('URL is expired.');
 
-      const downloadConfig = new SankakuDownloadConfig(meta).create({
+      const downloadConfig = new BooruDownloadConfig(meta).create({
         ...downloadSetting
       });