patreon-dl 3.7.1 → 3.8.1

package/dist/downloaders/IncludeCriteriaHelper.d.ts

@@ -0,0 +1,25 @@
+import type { Post, Product } from "../entities/index.js";
+import { type LogLevel } from "../utils/logging/Logger.js";
+import type Logger from "../utils/logging/Logger.js";
+import { type DownloaderConfig } from "./Downloader.js";
+export type IncludeCriteriaCheckPostResult = {
+    ok: true;
+} | {
+    ok: false;
+    reason: 'unviewable' | 'unmetMediaTypeCriteria' | 'notInTier' | 'publishDateOutOfRange';
+};
+export type IncludeCriteriaCheckProductResult = {
+    ok: true;
+} | {
+    ok: false;
+    reason: 'unviewable' | 'publishDateOutOfRange';
+};
+export declare class IncludeCriteriaHelper {
+    name: 'IncludeCriteriaHelper';
+    protected logger?: Logger | null;
+    constructor(logger?: Logger | null);
+    checkPost(post: Post, config: DownloaderConfig<Post>): IncludeCriteriaCheckPostResult;
+    checkProduct(product: Product, config: DownloaderConfig<Product>): IncludeCriteriaCheckProductResult;
+    protected isPublishDateOutOfRange<T extends Post | Product>(entity: T, config: DownloaderConfig<T>): boolean;
+    protected log(level: LogLevel, ...msg: any[]): void;
+}

package/dist/downloaders/IncludeCriteriaHelper.js

@@ -0,0 +1,160 @@
+import { isYouTubeEmbed } from "../entities/Downloadable.js";
+import { commonLog } from "../utils/logging/Logger.js";
+export class IncludeCriteriaHelper {
+    constructor(logger) {
+        this.logger = logger;
+    }
+    checkPost(post, config) {
+        // -- 1. Viewability
+        if (!post.isViewable && !config.include.lockedContent) {
+            return {
+                ok: false,
+                reason: 'unviewable'
+            };
+        }
+        // -- 2. Config option 'include.postsWithMediaType'
+        const postsWithMediaType = config.include.postsWithMediaType;
+        if (postsWithMediaType !== 'any') {
+            const hasAttachments = post.attachments.length > 0;
+            const hasAudio = !!post.audio || !!post.audioPreview;
+            const hasImages = post.images.length > 0;
+            const hasVideo = !!post.video || !!post.videoPreview || !!(post.embed && (post.embed.type === 'videoEmbed' || isYouTubeEmbed(post.embed)));
+            const isPodcast = post.postType === 'podcast';
+            let skip = false;
+            if (postsWithMediaType === 'none') {
+                skip = hasAttachments || hasAudio || hasImages || hasVideo;
+            }
+            else if (Array.isArray(postsWithMediaType)) {
+                skip = !((postsWithMediaType.includes('attachment') && hasAttachments) ||
+                    (postsWithMediaType.includes('audio') && hasAudio) ||
+                    (postsWithMediaType.includes('image') && hasImages) ||
+                    (postsWithMediaType.includes('video') && hasVideo) ||
+                    (postsWithMediaType.includes('podcast') && isPodcast && (hasAudio || hasVideo)));
+            }
+            if (skip) {
+                this.log('debug', 'Match criteria failed:', `config.include.postsWithMediaType: ${JSON.stringify(postsWithMediaType)} <-> post #${post.id}:`, {
+                    hasAttachments,
+                    hasAudio,
+                    hasImages,
+                    hasVideo
+                });
+                return {
+                    ok: false,
+                    reason: 'unmetMediaTypeCriteria'
+                };
+            }
+        }
+        // -- 3. Config option 'include.postsInTier'
+        const postsInTier = config.include.postsInTier;
+        const isAnyTier = postsInTier === 'any' || postsInTier.includes('any');
+        if (!isAnyTier) {
+            const applicableTierIds = postsInTier.filter((id) => post.campaign?.rewards.find((r) => r.id === id));
+            if (!post.campaign) {
+                this.log('warn', 'config.include.postsInTier: ignored - post missing campaign info');
+            }
+            else {
+                this.log('debug', 'config.include.postsInTier: applicable tier IDs:', applicableTierIds);
+            }
+            let skip = false;
+            if (!post.campaign) {
+                skip = false;
+            }
+            else if (applicableTierIds.length === 0) {
+                skip = true;
+            }
+            else if (!post.tiers.find((tier) => tier.id === 'patrons')) {
+                skip = applicableTierIds.every((id) => !post.tiers.find((tier) => tier.id === id));
+            }
+            if (skip) {
+                this.log('debug', 'Match criteria failed:', `config.include.postsInTier: ${JSON.stringify(applicableTierIds)} <-> post #${post.id}:`, post.tiers);
+                return {
+                    ok: false,
+                    reason: 'notInTier'
+                };
+            }
+            if (post.campaign) {
+                this.log('debug', 'Match criteria OK:', `config.include.postsInTier: ${JSON.stringify(applicableTierIds)} <-> post #${post.id}:`, post.tiers);
+            }
+        }
+        // -- 4. Config option 'include.postsPublished'
+        if (this.isPublishDateOutOfRange(post, config)) {
+            return {
+                ok: false,
+                reason: 'publishDateOutOfRange'
+            };
+        }
+        return {
+            ok: true
+        };
+    }
+    checkProduct(product, config) {
+        // -- 1. Viewability
+        if (!product.isAccessible && !config.include.lockedContent) {
+            return {
+                ok: false,
+                reason: 'unviewable'
+            };
+        }
+        // -- 2. Config option 'include.productsPublished'
+        if (this.isPublishDateOutOfRange(product, config)) {
+            return {
+                ok: false,
+                reason: 'publishDateOutOfRange'
+            };
+        }
+        return {
+            ok: true
+        };
+    }
+    isPublishDateOutOfRange(entity, config) {
+        const publishedAfter = entity.type === 'post' ? config.include.postsPublished.after : config.include.productsPublished.after;
+        const publishedBefore = entity.type === 'post' ? config.include.postsPublished.before : config.include.productsPublished.before;
+        if (publishedAfter || publishedBefore) {
+            const targetPublishedAt = entity.publishedAt;
+            let parsedPublishedAt = null;
+            if (!targetPublishedAt) {
+                this.log('warn', `config.include.productsPublished: ignored - ${entity.type} #${entity.id} missing publish date`);
+            }
+            else {
+                try {
+                    parsedPublishedAt = new Date(targetPublishedAt);
+                }
+                catch (error) {
+                    this.log('error', `Failed to parse publish date of ${entity.type} #${entity.id} ("${targetPublishedAt}"): `, error);
+                    this.log('warn', `config.include.productsPublished: ignored - publish date of ${entity.type} #${entity.id} could not be parsed`);
+                }
+            }
+            let skip = false;
+            if (parsedPublishedAt) {
+                const isAfter = publishedAfter ? parsedPublishedAt.getTime() >= publishedAfter.valueOf().getTime() : true;
+                const isBefore = publishedBefore ? parsedPublishedAt.getTime() < publishedBefore.valueOf().getTime() : true;
+                skip = !isAfter || !isBefore;
+                let eq = null;
+                if (publishedAfter && publishedBefore) {
+                    eq = `${publishedAfter.toString()} <= *${targetPublishedAt}* < ${publishedBefore.toString()}`;
+                }
+                else if (publishedAfter) {
+                    eq = `${publishedAfter.toString()} <= *${targetPublishedAt}*`;
+                }
+                else if (publishedBefore) {
+                    eq = `*${targetPublishedAt}* < ${publishedBefore.toString()}`;
+                }
+                if (eq) {
+                    if (skip) {
+                        // this.log('warn', `Skipped downloading ${entity.type} #${entity.id}: publish date out of range`);
+                        this.log('debug', `Publish date test failed for ${entity.type} #${entity.id}: ${eq}`);
+                    }
+                    else {
+                        this.log('debug', `Publish date test OK for ${entity.type} #${entity.id}: ${eq}`);
+                    }
+                }
+                return skip;
+            }
+        }
+        return false;
+    }
+    log(level, ...msg) {
+        commonLog(this.logger, level, this.name, ...msg);
+    }
+}
+//# sourceMappingURL=IncludeCriteriaHelper.js.map

package/dist/downloaders/IncludeCriteriaHelper.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"IncludeCriteriaHelper.js","sourceRoot":"","sources":["../../src/downloaders/IncludeCriteriaHelper.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAC;AAG7D,OAAO,EAAE,SAAS,EAAE,MAAM,4BAA4B,CAAC;AAkBvD,MAAM,OAAO,qBAAqB;IAKhC,YAAY,MAAsB;QAChC,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,SAAS,CAAC,IAAU,EAAE,MAA8B;QAClD,oBAAoB;QACpB,IAAI,CAAC,IAAI,CAAC,UAAU,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YACtD,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE,YAAY;aACrB,CAAC;QACJ,CAAC;QAED,mDAAmD;QACnD,MAAM,kBAAkB,GAAG,MAAM,CAAC,OAAO,CAAC,kBAAkB,CAAC;QAC7D,IAAI,kBAAkB,KAAK,KAAK,EAAE,CAAC;YACjC,MAAM,cAAc,GAAG,IAAI,CAAC,WAAW,CAAC,MAAM,GAAG,CAAC,CAAC;YACnD,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,CAAC;YACrD,MAAM,SAAS,GAAG,IAAI,CAAC,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;YACzC,MAAM,QAAQ,GAAG,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,CAAC,IAAI,CAAC,YAAY,IAAI,CAAC,CAAC,CAAC,IAAI,CAAC,KAAK,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,KAAK,YAAY,IAAI,cAAc,CAAC,IAAI,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;YAC3I,MAAM,SAAS,GAAG,IAAI,CAAC,QAAQ,KAAK,SAAS,CAAA;YAE7C,IAAI,IAAI,GAAG,KAAK,CAAC;YACjB,IAAI,kBAAkB,KAAK,MAAM,EAAE,CAAC;gBAClC,IAAI,GAAG,cAAc,IAAI,QAAQ,IAAI,SAAS,IAAI,QAAQ,CAAC;YAC7D,CAAC;iBACI,IAAI,KAAK,CAAC,OAAO,CAAC,kBAAkB,CAAC,EAAE,CAAC;gBAC3C,IAAI,GAAG,CAAC,CACN,CAAC,kBAAkB,CAAC,QAAQ,CAAC,YAAY,CAAC,IAAI,cAAc,CAAC;oBAC7D,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC;oBAClD,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,SAAS,CAAC;oBACnD,CAAC,kBAAkB,CAAC,QAAQ,CAAC,OAAO,CAAC,IAAI,QAAQ,CAAC;oBAClD,CAAC,kBAAkB,CAAC,QAAQ,CAAC,SAAS,CAAC,IAAI,SAAS,IAAI,CAAC,QAAQ,IAAI,QAAQ,CAAC,CAAC,CAAC,CAAC;YACrF,CAAC;YAED,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,wBAAwB,EAAE,sCAAsC,IAAI,CAAC,SAAS,CAAC,kBAAkB,CAAC,cAAc,IAAI,CAAC,EAAE,GAAG,EAAE;oBAC5I,cAAc;oBACd,QAAQ;oBACR,SAAS;oBACT,QAAQ;iBACT,CAAC,CAAC;gBACH,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,MAAM,EAAE,wBAAwB;iBACjC,CAAC;YACJ,CAAC;QACH,CAAC;QAED,4CAA4C;QAC5C,MAAM,WAAW,GAAG,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC;QAC/C,MAAM,SAAS,GAAG,WAAW,KAAK,KAAK,IAAI,WAAW,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;QACvE,IAAI,CAAC,SAAS,EAAE,CAAC;YACf,MAAM,iBAAiB,GAAG,WAAW,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,IAAI,CAAC,QAAQ,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACtG,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,kEAAkE,CAAC,CAAC;YACvF,CAAC;iBACI,CAAC;gBACJ,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,kDAAkD,EAAE,iBAAiB,CAAC,CAAC;YAC3F,CAAC;YACD,IAAI,IAAI,GAAG,KAAK,CAAC;YACjB,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;gBACnB,IAAI,GAAG,KAAK,CAAC;YACf,CAAC;iBACI,IAAI,iBAAiB,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;gBACxC,IAAI,GAAG,IAAI,CAAC;YACd,CAAC;iBACI,IAAI,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,SAAS,CAAC,EAAE,CAAC;gBAC3D,IAAI,GAAG,iBAAiB,CAAC,KAAK,CAAC,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,EAAE,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACrF,CAAC;YACD,IAAI,IAAI,EAAE,CAAC;gBACT,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,wBAAwB,EAAE,+BAA+B,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,cAAc,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;gBAClJ,OAAO;oBACL,EAAE,EAAE,KAAK;oBACT,MAAM,EAAE,WAAW;iBACpB,CAAC;YACJ,CAAC;YACD,IAAI,IAAI,CAAC,QAAQ,EAAE,CAAC;gBAClB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,oBAAoB,EAAE,+BAA+B,IAAI,CAAC,SAAS,CAAC,iBAAiB,CAAC,cAAc,IAAI,CAAC,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,CAAC,CAAC;YAChJ,CAAC;QACH,CAAC;QAED,+CAA+C;QAC/C,IAAI,IAAI,CAAC,uBAAuB,CAAC,IAAI,EAAE,MAAM,CAAC,EAAE,CAAC;YAC/C,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE,uBAAuB;aAChC,CAAC;QACJ,CAAC;QAED,OAAO;YACL,EAAE,EAAE,IAAI;SACT,CAAC;IACJ,CAAC;IAED,YAAY,CAAC,OAAgB,EAAE,MAAiC;QAC9D,oBAAoB;QACpB,IAAI,CAAC,OAAO,CAAC,YAAY,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC;YAC3D,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE,YAAY;aACrB,CAAC;QACJ,CAAC;QAED,kDAAkD;QAClD,IAAI,IAAI,CAAC,uBAAuB,CAAC,OAAO,EAAE,MAAM,CAAC,EAAE,CAAC;YAClD,OAAO;gBACL,EAAE,EAAE,KAAK;gBACT,MAAM,EAAE,uBAAuB;aAChC,CAAC;QACJ,CAAC;QAED,OAAO;YACL,EAAE,EAAE,IAAI;SACT,CAAC;IACJ,CAAC;IAES,uBAAuB,CAC/B,MAAS,EACT,MAA2B;QAE3B,MAAM,cAAc,GAAG,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,KAAK,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,KAAK,CAAC;QAC7H,MAAM,eAAe,GAAG,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,iBAAiB,CAAC,MAAM,CAAC;QAChI,IAAI,cAAc,IAAI,eAAe,EAAE,CAAC;YACtC,MAAM,iBAAiB,GAAG,MAAM,CAAC,WAAW,CAAC;YAC7C,IAAI,iBAAiB,GAAgB,IAAI,CAAC;YAC1C,IAAI,CAAC,iBAAiB,EAAE,CAAC;gBACvB,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,+CAA+C,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,uBAAuB,CAAC,CAAC;YACpH,CAAC;iBACI,CAAC;gBACJ,IAAI,CAAC;oBACH,iBAAiB,GAAG,IAAI,IAAI,CAAC,iBAAiB,CAAC,CAAC;gBAClD,CAAC;gBACD,OAAO,KAAU,EAAE,CAAC;oBAClB,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,mCAAmC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,MAAM,iBAAiB,MAAM,EAAE,KAAK,CAAC,CAAC;oBACpH,IAAI,CAAC,GAAG,CAAC,MAAM,EAAE,+DAA+D,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,sBAAsB,CAAC,CAAC;gBACnI,CAAC;YACH,CAAC;YACD,IAAI,IAAI,GAAG,KAAK,CAAC;YACjB,IAAI,iBAAiB,EAAE,CAAC;gBACtB,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,cAAc,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC1G,MAAM,QAAQ,GAAG,eAAe,CAAC,CAAC,CAAC,iBAAiB,CAAC,OAAO,EAAE,GAAG,eAAe,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,IAAI,CAAC;gBAC5G,IAAI,GAAG,CAAC,OAAO,IAAI,CAAC,QAAQ,CAAC;gBAC7B,IAAI,EAAE,GAAkB,IAAI,CAAC;gBAC7B,IAAI,cAAc,IAAI,eAAe,EAAE,CAAC;oBACtC,EAAE,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,QAAQ,iBAAiB,OAAO,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC;gBAChG,CAAC;qBACI,IAAI,cAAc,EAAE,CAAC;oBACxB,EAAE,GAAG,GAAG,cAAc,CAAC,QAAQ,EAAE,QAAQ,iBAAiB,GAAG,CAAC;gBAChE,CAAC;qBACI,IAAI,eAAe,EAAE,CAAC;oBACzB,EAAE,GAAG,IAAI,iBAAiB,OAAO,eAAe,CAAC,QAAQ,EAAE,EAAE,CAAC;gBAChE,CAAC;gBACD,IAAI,EAAE,EAAE,CAAC;oBACP,IAAI,IAAI,EAAE,CAAC;wBACT,mGAAmG;wBACnG,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,gCAAgC,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;oBACxF,CAAC;yBACI,CAAC;wBACJ,IAAI,CAAC,GAAG,CAAC,OAAO,EAAE,4BAA4B,MAAM,CAAC,IAAI,KAAK,MAAM,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC,CAAC;oBACpF,CAAC;gBACH,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;QACH,CAAC;QACD,OAAO,KAAK,CAAC;IACf,CAAC;IAES,GAAG,CAAC,KAAe,EAAE,GAAG,GAAU;QAC1C,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC;IACnD,CAAC;CACF","sourcesContent":["import type { Post, Product } from \"../entities/index.js\";\nimport { isYouTubeEmbed } from \"../entities/Downloadable.js\";\nimport { type LogLevel } from \"../utils/logging/Logger.js\";\nimport type Logger from \"../utils/logging/Logger.js\";\nimport { commonLog } from \"../utils/logging/Logger.js\";\nimport { type DownloaderConfig } from \"./Downloader.js\";\n\nexport type IncludeCriteriaCheckPostResult = {\n  ok: true;\n} | {\n  ok: false;\n  reason: 'unviewable' | 'unmetMediaTypeCriteria' | 'notInTier' | 'publishDateOutOfRange';\n};\n\nexport type IncludeCriteriaCheckProductResult = {\n  ok: true;\n} | {\n  ok: false;\n  reason: 'unviewable' | 'publishDateOutOfRange';\n};\n\n\nexport class IncludeCriteriaHelper {\n  name: 'IncludeCriteriaHelper';\n\n  protected logger?: Logger | null;\n\n  constructor(logger?: Logger | null) {\n    this.logger = logger;\n  }\n\n  checkPost(post: Post, config: DownloaderConfig<Post>): IncludeCriteriaCheckPostResult {\n    // -- 1. Viewability\n    if (!post.isViewable && !config.include.lockedContent) {\n      return {\n        ok: false,\n        reason: 'unviewable'\n      };\n    }\n\n    // -- 2. Config option 'include.postsWithMediaType'\n    const postsWithMediaType = config.include.postsWithMediaType;\n    if (postsWithMediaType !== 'any') {\n      const hasAttachments = post.attachments.length > 0;\n      const hasAudio = !!post.audio || !!post.audioPreview;\n      const hasImages = post.images.length > 0;\n      const hasVideo = !!post.video || !!post.videoPreview || !!(post.embed && (post.embed.type === 'videoEmbed' || isYouTubeEmbed(post.embed)));\n      const isPodcast = post.postType === 'podcast'\n\n      let skip = false;\n      if (postsWithMediaType === 'none') {\n        skip = hasAttachments || hasAudio || hasImages || hasVideo;\n      }\n      else if (Array.isArray(postsWithMediaType)) {\n        skip = !(\n          (postsWithMediaType.includes('attachment') && hasAttachments) ||\n          (postsWithMediaType.includes('audio') && hasAudio) ||\n          (postsWithMediaType.includes('image') && hasImages) ||\n          (postsWithMediaType.includes('video') && hasVideo) ||\n          (postsWithMediaType.includes('podcast') && isPodcast && (hasAudio || hasVideo)));\n      }\n\n      if (skip) {\n        this.log('debug', 'Match criteria failed:', `config.include.postsWithMediaType: ${JSON.stringify(postsWithMediaType)} <-> post #${post.id}:`, {\n          hasAttachments,\n          hasAudio,\n          hasImages,\n          hasVideo\n        });\n        return {\n          ok: false,\n          reason: 'unmetMediaTypeCriteria'\n        };\n      }\n    }\n\n    // -- 3. Config option 'include.postsInTier'\n    const postsInTier = config.include.postsInTier;\n    const isAnyTier = postsInTier === 'any' || postsInTier.includes('any');\n    if (!isAnyTier) {\n      const applicableTierIds = postsInTier.filter((id) => post.campaign?.rewards.find((r) => r.id === id));\n      if (!post.campaign) {\n        this.log('warn', 'config.include.postsInTier: ignored - post missing campaign info');\n      }\n      else {\n        this.log('debug', 'config.include.postsInTier: applicable tier IDs:', applicableTierIds);\n      }\n      let skip = false;\n      if (!post.campaign) {\n        skip = false;\n      }\n      else if (applicableTierIds.length === 0) {\n        skip = true;\n      }\n      else if (!post.tiers.find((tier) => tier.id === 'patrons')) {\n        skip = applicableTierIds.every((id) => !post.tiers.find((tier) => tier.id === id));\n      }\n      if (skip) {\n        this.log('debug', 'Match criteria failed:', `config.include.postsInTier: ${JSON.stringify(applicableTierIds)} <-> post #${post.id}:`, post.tiers);\n        return {\n          ok: false,\n          reason: 'notInTier'\n        };\n      }\n      if (post.campaign) {\n        this.log('debug', 'Match criteria OK:', `config.include.postsInTier: ${JSON.stringify(applicableTierIds)} <-> post #${post.id}:`, post.tiers);\n      }\n    }\n\n    // -- 4. Config option 'include.postsPublished'\n    if (this.isPublishDateOutOfRange(post, config)) {\n      return {\n        ok: false,\n        reason: 'publishDateOutOfRange'\n      };\n    }\n\n    return {\n      ok: true\n    };\n  }\n\n  checkProduct(product: Product, config: DownloaderConfig<Product>): IncludeCriteriaCheckProductResult {\n    // -- 1. Viewability\n    if (!product.isAccessible && !config.include.lockedContent) {\n      return {\n        ok: false,\n        reason: 'unviewable'\n      };\n    }\n\n    // -- 2. Config option 'include.productsPublished'\n    if (this.isPublishDateOutOfRange(product, config)) {\n      return {\n        ok: false,\n        reason: 'publishDateOutOfRange'\n      };\n    }\n\n    return {\n      ok: true\n    };\n  }\n\n  protected isPublishDateOutOfRange<T extends Post | Product>(\n    entity: T,\n    config: DownloaderConfig<T>\n  ) {\n    const publishedAfter = entity.type === 'post' ? config.include.postsPublished.after : config.include.productsPublished.after;\n    const publishedBefore = entity.type === 'post' ? config.include.postsPublished.before : config.include.productsPublished.before;\n    if (publishedAfter || publishedBefore) {\n      const targetPublishedAt = entity.publishedAt;\n      let parsedPublishedAt: Date | null = null;\n      if (!targetPublishedAt) {\n        this.log('warn', `config.include.productsPublished: ignored - ${entity.type} #${entity.id} missing publish date`);\n      }\n      else {\n        try {\n          parsedPublishedAt = new Date(targetPublishedAt);\n        }\n        catch (error: any) {\n          this.log('error', `Failed to parse publish date of ${entity.type} #${entity.id} (\"${targetPublishedAt}\"): `, error);\n          this.log('warn', `config.include.productsPublished: ignored - publish date of ${entity.type} #${entity.id} could not be parsed`);\n        }\n      }\n      let skip = false;\n      if (parsedPublishedAt) {\n        const isAfter = publishedAfter ? parsedPublishedAt.getTime() >= publishedAfter.valueOf().getTime() : true;\n        const isBefore = publishedBefore ? parsedPublishedAt.getTime() < publishedBefore.valueOf().getTime() : true;\n        skip = !isAfter || !isBefore;\n        let eq: string | null = null;\n        if (publishedAfter && publishedBefore) {\n          eq = `${publishedAfter.toString()} <= *${targetPublishedAt}* < ${publishedBefore.toString()}`;\n        }\n        else if (publishedAfter) {\n          eq = `${publishedAfter.toString()} <= *${targetPublishedAt}*`;\n        }\n        else if (publishedBefore) {\n          eq = `*${targetPublishedAt}* < ${publishedBefore.toString()}`;\n        }\n        if (eq) {\n          if (skip) {\n            // this.log('warn', `Skipped downloading ${entity.type} #${entity.id}: publish date out of range`);\n            this.log('debug', `Publish date test failed for ${entity.type} #${entity.id}: ${eq}`);\n          }\n          else {\n            this.log('debug', `Publish date test OK for ${entity.type} #${entity.id}: ${eq}`);\n          }\n        }\n        return skip;\n      }\n    }\n    return false;\n  }\n\n  protected log(level: LogLevel, ...msg: any[]) {\n    commonLog(this.logger, level, this.name, ...msg);\n  }\n}"]}

package/dist/downloaders/InitialData.js

@@ -37,15 +37,29 @@ export class InitialData {
             this.log('debug', `Fetch initial data from "${url}"`);
             let page;
             try {
-                const { html, lastUrl } = await this.fetcher.get({ url, type: 'html', maxRetries: this.config.request.maxRetries, signal });
-                page = html;
-                if (new URL(lastUrl).pathname === '/login-sync-domains') {
-                    this.log('debug', `Detected Cloudflare challenge flow at "${lastUrl}"`);
+                // For custom domains (non-patreon.com), skip the cookie-bearing fetch —
+                // sending patreon session cookies to a third-party domain can invalidate
+                // the session. Use Puppeteer directly instead.
+                const isCustomDomain = !URLHelper.isPatreonURL(url);
+                if (isCustomDomain) {
+                    this.log('debug', `Custom domain detected - using Puppeteer to avoid sending cookies to third-party domain`);
                     page = await __classPrivateFieldGet(this, _InitialData_instances, "m", _InitialData_fetchPageWithPuppeteer).call(this, url);
-                    // Because cookie not available to Puppeteer, we need to fetch 
-                    // current user ID separately
                     fetchCurrentUserIdFromAPI = !!this.config.cookie;
                 }
+                else {
+                    const { html, lastUrl } = await this.fetcher.get({ url, type: 'html', maxRetries: this.config.request.maxRetries, signal });
+                    page = html;
+                    const isCloudflareChallenge = new URL(lastUrl).pathname === '/login-sync-domains' ||
+                        html.includes('window._cf_chl_opt') ||
+                        html.includes('challenge-platform');
+                    if (isCloudflareChallenge) {
+                        this.log('debug', `Detected Cloudflare challenge flow - using Puppeteer`);
+                        page = await __classPrivateFieldGet(this, _InitialData_instances, "m", _InitialData_fetchPageWithPuppeteer).call(this, url);
+                        // Because cookie not available to Puppeteer, we need to fetch
+                        // current user ID separately
+                        fetchCurrentUserIdFromAPI = !!this.config.cookie;
+                    }
+                }
             }
             catch (error) {
                 if (signal?.aborted) {

package/dist/downloaders/InitialData.js.map

@@ -1 +1 @@
-{"version":3,"file":"InitialData.js","sourceRoot":"","sources":["../../src/downloaders/InitialData.ts"],"names":[],"mappings":"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","sourcesContent":["import PageParser from \"../parsers/PageParser.js\";\nimport { URLHelper } from \"../utils/index.js\";\nimport type Fetcher from \"../utils/Fetcher.js\";\nimport { type Logger, type LogLevel } from \"../utils/logging/index.js\";\nimport { commonLog } from \"../utils/logging/Logger.js\";\nimport ObjectHelper from \"../utils/ObjectHelper.js\";\nimport { type DownloaderConfig } from \"./Downloader.js\";\n\nexport class InitialData {\n  name = 'InitialData';\n\n  protected config: DownloaderConfig<any>;\n  protected fetcher: Fetcher;\n  protected logger?: Logger | null;\n\n  constructor(config: DownloaderConfig<any>, fetcher: Fetcher, logger?: Logger | null) {\n    this.config = config;\n    this.fetcher = fetcher;\n    this.logger = logger;\n  }\n\n  async get(url: string, signal?: AbortSignal) {\n    let campaignId: string | null = null;\n    let currentUserId: string | undefined = undefined;\n    let fetchCurrentUserIdFromAPI = false;\n    if (this.config.type === 'post' &&\n      this.config.postFetch.type !== 'single' &&\n      this.config.postFetch.type !== 'byFile' &&\n      this.config.postFetch.campaignId\n    ) {\n      campaignId = this.config.postFetch.campaignId;\n      fetchCurrentUserIdFromAPI = true;\n    }\n    else if (this.config.type === 'product' &&\n      this.config.productFetch.type === 'byShop' &&\n      this.config.productFetch.campaignId\n    ) {\n      campaignId = this.config.productFetch.campaignId;\n      fetchCurrentUserIdFromAPI = true;\n    }\n    if (!campaignId) {\n      this.log('debug', `Fetch initial data from \"${url}\"`);\n      let page;\n      try {\n        const { html, lastUrl } = await this.fetcher.get({ url, type: 'html', maxRetries: this.config.request.maxRetries, signal });\n        page = html;\n        if (new URL(lastUrl).pathname === '/login-sync-domains') {\n          this.log('debug', `Detected Cloudflare challenge flow at \"${lastUrl}\"`);\n          page = await this.#fetchPageWithPuppeteer(url);\n          // Because cookie not available to Puppeteer, we need to fetch \n          // current user ID separately\n          fetchCurrentUserIdFromAPI = !!this.config.cookie;\n        }\n      }\n      catch (error) {\n        if (signal?.aborted) {\n          throw error;\n        }\n        const e = Error(`Error requesting \"${url}\"`);\n        e.cause = error;\n        throw e;\n      }\n      const pageParser = new PageParser(this.logger);\n      let initialData;\n      try {\n        initialData = pageParser.parseInitialData(page, url);\n      }\n      catch (error) {\n        const e = Error(`Error parsing initial data from \"${url}\"`);\n        e.cause = error;\n        throw e;\n      }\n      campaignId = ObjectHelper.getProperty(initialData, 'pageBootstrap.campaign.data.id');\n      currentUserId = ObjectHelper.getProperty(initialData, 'commonBootstrap.currentUser.data.id');\n      if (!campaignId) {\n        throw Error(`Campaign ID not found in initial data of \"${url}\"`);\n      }\n    }\n    if (fetchCurrentUserIdFromAPI) {\n      this.log('debug', `Fetch current user ID from API`);\n      const currentUserAPIURL = URLHelper.constructCurrentUserAPIURL();\n      const { json: currentUserJson } = await this.fetcher.get({\n        url: currentUserAPIURL,\n        type: 'json',\n        maxRetries: this.config.request.maxRetries,\n        signal\n      });\n      currentUserId = ObjectHelper.getProperty(currentUserJson, 'data.id') || undefined;\n    }\n    this.log('debug', `Initial data: campaign ID '${campaignId}'; current user ID '${currentUserId}'`);\n    return { campaignId, currentUserId };\n  }\n\n  async #fetchPageWithPuppeteer(url: string) {\n    return this.fetcher.getPageWithPuppeteer(url);\n  }\n\n  protected log(level: LogLevel, ...msg: any[]) {\n    commonLog(this.logger, level, this.name, ...msg);\n  }\n}"]}
+{"version":3,"file":"InitialData.js","sourceRoot":"","sources":["../../src/downloaders/InitialData.ts"],"names":[],"mappings":"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","sourcesContent":["import PageParser from \"../parsers/PageParser.js\";\nimport { URLHelper } from \"../utils/index.js\";\nimport type Fetcher from \"../utils/Fetcher.js\";\nimport { type Logger, type LogLevel } from \"../utils/logging/index.js\";\nimport { commonLog } from \"../utils/logging/Logger.js\";\nimport ObjectHelper from \"../utils/ObjectHelper.js\";\nimport { type DownloaderConfig } from \"./Downloader.js\";\n\nexport class InitialData {\n  name = 'InitialData';\n\n  protected config: DownloaderConfig<any>;\n  protected fetcher: Fetcher;\n  protected logger?: Logger | null;\n\n  constructor(config: DownloaderConfig<any>, fetcher: Fetcher, logger?: Logger | null) {\n    this.config = config;\n    this.fetcher = fetcher;\n    this.logger = logger;\n  }\n\n  async get(url: string, signal?: AbortSignal) {\n    let campaignId: string | null = null;\n    let currentUserId: string | undefined = undefined;\n    let fetchCurrentUserIdFromAPI = false;\n    if (this.config.type === 'post' &&\n      this.config.postFetch.type !== 'single' &&\n      this.config.postFetch.type !== 'byFile' &&\n      this.config.postFetch.campaignId\n    ) {\n      campaignId = this.config.postFetch.campaignId;\n      fetchCurrentUserIdFromAPI = true;\n    }\n    else if (this.config.type === 'product' &&\n      this.config.productFetch.type === 'byShop' &&\n      this.config.productFetch.campaignId\n    ) {\n      campaignId = this.config.productFetch.campaignId;\n      fetchCurrentUserIdFromAPI = true;\n    }\n    if (!campaignId) {\n      this.log('debug', `Fetch initial data from \"${url}\"`);\n      let page;\n      try {\n        // For custom domains (non-patreon.com), skip the cookie-bearing fetch —\n        // sending patreon session cookies to a third-party domain can invalidate\n        // the session. Use Puppeteer directly instead.\n        const isCustomDomain = !URLHelper.isPatreonURL(url);\n        if (isCustomDomain) {\n          this.log('debug', `Custom domain detected - using Puppeteer to avoid sending cookies to third-party domain`);\n          page = await this.#fetchPageWithPuppeteer(url);\n          fetchCurrentUserIdFromAPI = !!this.config.cookie;\n        }\n        else {\n          const { html, lastUrl } = await this.fetcher.get({ url, type: 'html', maxRetries: this.config.request.maxRetries, signal });\n          page = html;\n          const isCloudflareChallenge = new URL(lastUrl).pathname === '/login-sync-domains' ||\n            html.includes('window._cf_chl_opt') ||\n            html.includes('challenge-platform');\n          if (isCloudflareChallenge) {\n            this.log('debug', `Detected Cloudflare challenge flow - using Puppeteer`);\n            page = await this.#fetchPageWithPuppeteer(url);\n            // Because cookie not available to Puppeteer, we need to fetch\n            // current user ID separately\n            fetchCurrentUserIdFromAPI = !!this.config.cookie;\n          }\n        }\n      }\n      catch (error) {\n        if (signal?.aborted) {\n          throw error;\n        }\n        const e = Error(`Error requesting \"${url}\"`);\n        e.cause = error;\n        throw e;\n      }\n      const pageParser = new PageParser(this.logger);\n      let initialData;\n      try {\n        initialData = pageParser.parseInitialData(page, url);\n      }\n      catch (error) {\n        const e = Error(`Error parsing initial data from \"${url}\"`);\n        e.cause = error;\n        throw e;\n      }\n      campaignId = ObjectHelper.getProperty(initialData, 'pageBootstrap.campaign.data.id');\n      currentUserId = ObjectHelper.getProperty(initialData, 'commonBootstrap.currentUser.data.id');\n      if (!campaignId) {\n        throw Error(`Campaign ID not found in initial data of \"${url}\"`);\n      }\n    }\n    if (fetchCurrentUserIdFromAPI) {\n      this.log('debug', `Fetch current user ID from API`);\n      const currentUserAPIURL = URLHelper.constructCurrentUserAPIURL();\n      const { json: currentUserJson } = await this.fetcher.get({\n        url: currentUserAPIURL,\n        type: 'json',\n        maxRetries: this.config.request.maxRetries,\n        signal\n      });\n      currentUserId = ObjectHelper.getProperty(currentUserJson, 'data.id') || undefined;\n    }\n    this.log('debug', `Initial data: campaign ID '${campaignId}'; current user ID '${currentUserId}'`);\n    return { campaignId, currentUserId };\n  }\n\n  async #fetchPageWithPuppeteer(url: string) {\n    return this.fetcher.getPageWithPuppeteer(url);\n  }\n\n  protected log(level: LogLevel, ...msg: any[]) {\n    commonLog(this.logger, level, this.name, ...msg);\n  }\n}"]}

package/dist/downloaders/PostDownloader.js

@@ -23,6 +23,7 @@ import PostsFetcher from './PostsFetcher.js';
 import CommentParser from '../parsers/CommentParser.js';
 import { generatePostCommentsSummary } from './templates/CommentInfo.js';
 import { generateCollectionSummary } from './templates/CollectionInfo.js';
+import { IncludeCriteriaHelper } from './IncludeCriteriaHelper.js';
 class PostDownloader extends Downloader {
     constructor(config, db, logger, context) {
         super(config, db, logger);
@@ -69,7 +70,7 @@ class PostDownloader extends Downloader {
             signal
         });
         const { campaignId } = await postsFetcher.getInitialData(url);
-        const postsParser = new PostParser(this.logger);
+        const postsParser = new PostParser(this.fetcher, this.logger);
         const res = await this.fetchCampaign(campaignId);
         if (signal?.aborted) {
             throw new Error('Aborted');
@@ -97,6 +98,9 @@ _PostDownloader_startPromise = new WeakMap(), _PostDownloader_context = new Weak
         else if (postFetch.type === 'byCollection') {
             this.log('info', `Targeting posts in collection #${postFetch.collectionId}`);
         }
+        else if (postFetch.type === 'byURL') {
+            this.log('info', `Targeting posts at '${postFetch.url}'`);
+        }
         else if (postFetch.type === 'byFile') {
             this.log('info', `Target post given by API data in "${postFetch.filePath}"`);
         }
@@ -132,7 +136,7 @@ _PostDownloader_startPromise = new WeakMap(), _PostDownloader_context = new Weak
         let campaignSaved = false;
         let stopConditionMet = false;
         const savedCollectionIds = [];
-        const postsParser = new PostParser(this.logger);
+        const postsParser = new PostParser(this.fetcher, this.logger);
         while (postsFetcher.hasNext()) {
             const { list, aborted, error } = await postsFetcher.next();
             if (!list || aborted) {
@@ -178,7 +182,7 @@ _PostDownloader_startPromise = new WeakMap(), _PostDownloader_context = new Weak
                     const { json } = await this.commonFetchAPI(postURL, signal);
                     let refreshed = null;
                     if (json) {
-                        refreshed = postsParser.parsePostsAPIResponse(json, postURL).items[0] || null;
+                        refreshed = (await postsParser.parsePostsAPIResponse(json, postURL)).items[0] || null;
                         if (!refreshed) {
                             this.log('warn', `Refreshed post #${_post.id} but got empty value - going to use existing data`);
                         }
@@ -267,6 +271,9 @@ _PostDownloader_startPromise = new WeakMap(), _PostDownloader_context = new Weak
         else if (postFetch.type === 'byCollection') {
             this.log('info', `Done downloading posts in collection #${postFetch.collectionId}`);
         }
+        else if (postFetch.type === 'byURL') {
+            this.log('info', `Done downloading posts at '${postFetch.url}'`);
+        }
         else if (postFetch.type === 'byFile') {
             this.log('info', `Done downloading post given in "${postFetch.filePath}"`);
         }
@@ -310,105 +317,62 @@ _PostDownloader_startPromise = new WeakMap(), _PostDownloader_context = new Weak
     const downloadPost = scope.includes('post');
     const downloadComments = scope.includes('comments');
     // Step 1: Check whether we should download post
-    // -- 1.1 Viewability
-    if (!post.isViewable) {
-        if (this.config.include.lockedContent) {
-            this.log('warn', `Post #${post.id} is not viewable by current user`);
-        }
-        else {
-            this.log('warn', `Skipped downloading post #${post.id}: not viewable by current user`);
-            this.emit('targetEnd', {
-                target: post,
-                isSkipped: true,
-                skipReason: TargetSkipReason.Inaccessible,
-                skipMessage: 'Target is not viewable by current user'
-            });
-            return {
-                status: 'skippedUnviewable'
-            };
-        }
-    }
-    // -- 1.2 Config option 'include.postsWithMediaType'
-    const postsWithMediaType = this.config.include.postsWithMediaType;
-    if (postsWithMediaType !== 'any') {
-        const hasAttachments = post.attachments.length > 0;
-        const hasAudio = !!post.audio || !!post.audioPreview;
-        const hasImages = post.images.length > 0;
-        const hasVideo = !!post.video || !!post.videoPreview || !!(post.embed && (post.embed.type === 'videoEmbed' || isYouTubeEmbed(post.embed)));
-        const isPodcast = post.postType === 'podcast';
-        let skip = false;
-        if (postsWithMediaType === 'none') {
-            skip = hasAttachments || hasAudio || hasImages || hasVideo;
-        }
-        else if (Array.isArray(postsWithMediaType)) {
-            skip = !((postsWithMediaType.includes('attachment') && hasAttachments) ||
-                (postsWithMediaType.includes('audio') && hasAudio) ||
-                (postsWithMediaType.includes('image') && hasImages) ||
-                (postsWithMediaType.includes('video') && hasVideo) ||
-                (postsWithMediaType.includes('podcast') && isPodcast && (hasAudio || hasVideo)));
-        }
-        if (skip) {
-            this.log('warn', `Skipped downloading post #${post.id}: unmet media type criteria`);
-            this.log('debug', 'Match criteria failed:', `config.include.postsWithMediaType: ${JSON.stringify(postsWithMediaType)} <-> post #${post.id}:`, {
-                hasAttachments,
-                hasAudio,
-                hasImages,
-                hasVideo
-            });
-            this.emit('targetEnd', {
-                target: post,
-                isSkipped: true,
-                skipReason: TargetSkipReason.UnmetMediaTypeCriteria,
-                skipMessage: 'Target does not meet media type criteria'
-            });
-            return {
-                status: 'skippedUnmetMediaTypeCriteria'
-            };
-        }
-    }
-    // -- 1.3 Config option 'include.postsInTier'
-    const postsInTier = this.config.include.postsInTier;
-    const isAnyTier = postsInTier === 'any' || postsInTier.includes('any');
-    if (!isAnyTier) {
-        const applicableTierIds = postsInTier.filter((id) => post.campaign?.rewards.find((r) => r.id === id));
-        if (!post.campaign) {
-            this.log('warn', 'config.include.postsInTier: ignored - post missing campaign info');
-        }
-        else {
-            this.log('debug', 'config.include.postsInTier: applicable tier IDs:', applicableTierIds);
-        }
-        let skip = false;
-        if (!post.campaign) {
-            skip = false;
-        }
-        else if (applicableTierIds.length === 0) {
-            skip = true;
-        }
-        else if (!post.tiers.find((tier) => tier.id === 'patrons')) {
-            skip = applicableTierIds.every((id) => !post.tiers.find((tier) => tier.id === id));
-        }
-        if (skip) {
-            this.log('warn', `Skipped downloading post #${post.id}: not in tier`);
-            this.log('debug', 'Match criteria failed:', `config.include.postsInTier: ${JSON.stringify(applicableTierIds)} <-> post #${post.id}:`, post.tiers);
-            this.emit('targetEnd', {
-                target: post,
-                isSkipped: true,
-                skipReason: TargetSkipReason.NotInTier,
-                skipMessage: 'Target not in tier'
-            });
-            return {
-                status: 'skippedNotInTier'
-            };
-        }
-        if (post.campaign) {
-            this.log('debug', 'Match criteria OK:', `config.include.postsInTier: ${JSON.stringify(applicableTierIds)} <-> post #${post.id}:`, post.tiers);
+    const criteriaHelper = new IncludeCriteriaHelper(this.logger);
+    const criteriaCheck = criteriaHelper.checkPost(post, this.config);
+    if (!criteriaCheck.ok) {
+        switch (criteriaCheck.reason) {
+            case 'unviewable': {
+                this.log('warn', `Skipped downloading post #${post.id}: not viewable by current user`);
+                this.emit('targetEnd', {
+                    target: post,
+                    isSkipped: true,
+                    skipReason: TargetSkipReason.Inaccessible,
+                    skipMessage: 'Target is not viewable by current user'
+                });
+                return {
+                    status: 'skippedUnviewable'
+                };
+            }
+            case 'unmetMediaTypeCriteria': {
+                this.log('warn', `Skipped downloading post #${post.id}: unmet media type criteria`);
+                this.emit('targetEnd', {
+                    target: post,
+                    isSkipped: true,
+                    skipReason: TargetSkipReason.UnmetMediaTypeCriteria,
+                    skipMessage: 'Target does not meet media type criteria'
+                });
+                return {
+                    status: 'skippedUnmetMediaTypeCriteria'
+                };
+            }
+            case 'notInTier': {
+                this.log('warn', `Skipped downloading post #${post.id}: not in tier`);
+                this.emit('targetEnd', {
+                    target: post,
+                    isSkipped: true,
+                    skipReason: TargetSkipReason.NotInTier,
+                    skipMessage: 'Target not in tier'
+                });
+                return {
+                    status: 'skippedNotInTier'
+                };
+            }
+            case 'publishDateOutOfRange': {
+                this.log('warn', `Skipped downloading post #${post.id}: publish date out of range`);
+                this.emit('targetEnd', {
+                    target: post,
+                    isSkipped: true,
+                    skipReason: TargetSkipReason.PublishDateOutOfRange,
+                    skipMessage: 'Publish date out of range'
+                });
+                return {
+                    status: 'skippedPublishDateOutOfRange'
+                };
+            }
         }
     }
-    // -- 1.4 Config option 'include.postsPublished'
-    if (this.isPublishDateOutOfRange(post)) {
-        return {
-            status: 'skippedPublishDateOutOfRange'
-        };
+    if (!post.isViewable && this.config.include.lockedContent) {
+        this.log('warn', `Post #${post.id} is not viewable by current user`);
     }
     if (!downloadPost && downloadComments) {
         this.log('info', `Previously downloaded post #${post.id} - refresh comments only`);
@@ -590,7 +554,7 @@ _PostDownloader_startPromise = new WeakMap(), _PostDownloader_context = new Weak
         status: 'downloaded'
     };
 }, _PostDownloader_isFetchingMultiplePosts = function _PostDownloader_isFetchingMultiplePosts(postFetch) {
-    return postFetch.type === 'byUser' || postFetch.type === 'byUserId' || postFetch.type === 'byCollection';
+    return postFetch.type === 'byUser' || postFetch.type === 'byUserId' || postFetch.type === 'byCollection' || postFetch.type === 'byURL';
 }, _PostDownloader_createDownloadTaskBatchForPost = async function _PostDownloader_createDownloadTaskBatchForPost(post, postDirs, signal) {
     const incPreview = this.config.include.previewMedia;
     const incContent = this.config.include.contentMedia;
@@ -755,8 +719,8 @@ _PostDownloader_startPromise = new WeakMap(), _PostDownloader_context = new Weak
                 json = null;
             }
             if (json) {
-                const parser = new PostParser();
-                const parentPost = parser.parsePostsAPIResponse(json, apiURL).items[0];
+                const parser = new PostParser(this.fetcher);
+                const parentPost = (await parser.parsePostsAPIResponse(json, apiURL)).items[0];
                 if (!parentPost) {
                     this.log('error', `Error fetching linked attachment ${laStr} from parent post #${la.postId}: post data not found in response of "${apiURL}"`);
                 }