patreon-dl 3.1.0 → 3.2.0

package/README.md

@@ -267,6 +267,23 @@ Note the URL shown in the output. Open this URL in a web browser to begin viewin
 
 ## Changelog
 
+v3.2.0
+- Fix:
+  - "Initial data not found" error in `patreon.com/cw` pages ([#85](https://github.com/patrickkfkan/patreon-dl/issues/85)) and custom-domain pages
+  - FFmpeg v7.x compatibility issues ([#86](https://github.com/patrickkfkan/patreon-dl/issues/86))
+  - Dry-run mode executing ops that should have been skipped
+  - Wrong log file path returned in some cases
+  - Various YouTube downloading issues
+- Add:
+  - Support passing options to `yt-dlp` in Vimeo download script
+  - Support case-sensitivity flag in `config.include.mediaByFilename` options
+- Browse:
+  - Show inline images within post body
+  - Show YouTube embed HTML content if video not downloaded ([#87](https://github.com/patrickkfkan/patreon-dl/issues/87))
+  - Display "show more" toggle for long post bodies
+- API:
+  - `Downloader.getCampaign(params)`: enable lookup by `params.campaignId`
+
 v3.1.0
 - Defer database initialization until downloader starts
 - UI: fix post column width possibly exceeding screen width

package/bin/patreon-dl-vimeo.js

@@ -15,6 +15,10 @@
  * --video-password "<password>": for password-protected videos
  * --yt-dlp "</path/to/yt-dlp>": if yt-dlp is not in the PATH
  * 
+ * You can pass options directly to yt-dlp. To do so, add '--' to the end of the exec line, followed by the options.
+ * For example:
+ * exec = patreon-dl-vimeo -o "{dest.dir}/%(title)s.%(ext)s" --embed-html "{embed.html}" --embed-url "{embed.url}" -- --cookies-from-browser firefox
+ * 
  * Upon encountering a post with embedded Vimeo content, 'patreon-dl' will call this script. The following then happens:
  * - This script obtains the video URL from 'embed.html' or 'embed.url'. The former ("player URL") is always preferable 
  *   since it is what's actually played within the Patreon post, and furthermore 'embed.url' sometimes returns
@@ -81,18 +85,23 @@ function getCommandString(cmd, args) {
   ].join(' ');
 }
 
-async function download(url, o, videoPassword, ytdlpPath) {
+async function download(url, o, videoPassword, ytdlpPath, ytdlpArgs) {
   let proc;
   const ytdlp = ytdlpPath || 'yt-dlp';
+  const parsedYtdlpArgs = parseArgs(ytdlpArgs);
   try {
     return await new Promise((resolve, reject) => {
       let settled = false;
-      const args = [
-        '-o', o,
-        '--referer', 'https://patreon.com/'
-      ];
+      const args = [];
+      if (!parsedYtdlpArgs['o'] && !parsedYtdlpArgs['output']) {
+        args.push('-o', o);
+      }
+      if (!parsedYtdlpArgs['referrer']) {
+        args.push('--referer', 'https://patreon.com/');
+      }
+      args.push(...ytdlpArgs);
       const printArgs = [...args];
-      if (videoPassword) {
+      if (videoPassword && !parsedYtdlpArgs['video-password']) {
         args.push('--video-password', videoPassword);
         printArgs.push('--video-password', '******');
       }
@@ -147,6 +156,7 @@ const o = _o?.trim() ? path.resolve(_o.trim()) : null;
 const embedHTML = _embedHTML?.trim();
 const embedURL = _embedURL?.trim();
 const ytdlpPath = _ytdlpPath?.trim() ? path.resolve(_ytdlpPath.trim()) : null;
+const ytdlpArgs = args['_'];
 
 if (!o) {
   console.error('No output file specified');
@@ -166,7 +176,7 @@ if (!url) {
 }
 
 async function doDownload(_url) {
-  let code = await download(_url, o, videoPassword, ytdlpPath);
+  let code = await download(_url, o, videoPassword, ytdlpPath, ytdlpArgs);
   if (code !== 0 && _url !== embedURL && embedURL) {
     console.log(`Download failed - retrying with embed URL "${embedURL}"`);
     return await doDownload(embedURL);

package/dist/browse/api/CampaignAPIMixin.d.ts

@@ -11,9 +11,11 @@ export declare function CampaignAPIMixin<TBase extends APIConstructor>(Base: TBa
             withCounts?: false;
         }): Promise<Campaign | null>;
         getCampaign(params: GetCampaignParams): Promise<Campaign | CampaignWithCounts | null>;
+        "__#132@#sanitizeCampaign"(campaign: Campaign): void;
         name: string;
         db: import("../db").DBInstance;
         logger?: import("../..").Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: import("../..").LogLevel, ...msg: any[]): void;
     };
 } & TBase;

package/dist/browse/api/CampaignAPIMixin.js

@@ -1,18 +1,48 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
 const DEFAULT_CAMPAIGN_LIST_SIZE = 10;
 const DEFAULT_CAMPAIGN_LIST_SORT_BY = 'a-z';
 export function CampaignAPIMixin(Base) {
-    return class CampaignAPI extends Base {
-        getCampaignList(params) {
-            const { sortBy = DEFAULT_CAMPAIGN_LIST_SORT_BY, limit = DEFAULT_CAMPAIGN_LIST_SIZE, offset = 0 } = params;
-            return this.db.getCampaignList({
-                sortBy,
-                limit,
-                offset
-            });
-        }
-        getCampaign(params) {
-            return this.db.getCampaign(params);
-        }
-    };
+    var _CampaignAPI_instances, _CampaignAPI_sanitizeCampaign, _a;
+    return _a = class CampaignAPI extends Base {
+            constructor() {
+                super(...arguments);
+                _CampaignAPI_instances.add(this);
+            }
+            async getCampaignList(params) {
+                const { sortBy = DEFAULT_CAMPAIGN_LIST_SORT_BY, limit = DEFAULT_CAMPAIGN_LIST_SIZE, offset = 0 } = params;
+                const list = await this.db.getCampaignList({
+                    sortBy,
+                    limit,
+                    offset
+                });
+                for (const campaign of list.campaigns) {
+                    __classPrivateFieldGet(this, _CampaignAPI_instances, "m", _CampaignAPI_sanitizeCampaign).call(this, campaign);
+                }
+                return list;
+            }
+            async getCampaign(params) {
+                const campaign = await this.db.getCampaign(params);
+                if (campaign) {
+                    __classPrivateFieldGet(this, _CampaignAPI_instances, "m", _CampaignAPI_sanitizeCampaign).call(this, campaign);
+                }
+                return campaign;
+            }
+        },
+        _CampaignAPI_instances = new WeakSet(),
+        _CampaignAPI_sanitizeCampaign = function _CampaignAPI_sanitizeCampaign(campaign) {
+            if (campaign.summary) {
+                campaign.summary = this.sanitizeHTML(campaign.summary);
+            }
+            for (const reward of campaign.rewards) {
+                if (reward.description) {
+                    reward.description = this.sanitizeHTML(reward.description);
+                }
+            }
+        },
+        _a;
 }
 //# sourceMappingURL=CampaignAPIMixin.js.map

package/dist/browse/api/CampaignAPIMixin.js.map

@@ -1 +1 @@
-{"version":3,"file":"CampaignAPIMixin.js","sourceRoot":"","sources":["../../../src/browse/api/CampaignAPIMixin.ts"],"names":[],"mappings":"AAKA,MAAM,0BAA0B,GAAG,EAAE,CAAC;AACtC,MAAM,6BAA6B,GAAuB,KAAK,CAAC;AAGhE,MAAM,UAAU,gBAAgB,CAA+B,IAAW;IACxE,OAAO,MAAM,WAAY,SAAQ,IAAI;QACnC,eAAe,CAAC,MAA6B;YAC3C,MAAM,EAAE,MAAM,GAAG,6BAA6B,EAAE,KAAK,GAAG,0BAA0B,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC;YAC1G,OAAO,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC;gBAC7B,MAAM;gBACN,KAAK;gBACL,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QAKD,WAAW,CAAC,MAAyB;YACnC,OAAO,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;QACrC,CAAC;KACF,CAAA;AACH,CAAC","sourcesContent":["import { type APIConstructor } from \".\";\nimport { type Campaign } from \"../../entities/index.js\";\nimport { type CampaignList, type CampaignListSortBy, type CampaignWithCounts, type GetCampaignListParams, type GetCampaignParams } from \"../types/Campaign.js\";\n\n\nconst DEFAULT_CAMPAIGN_LIST_SIZE = 10;\nconst DEFAULT_CAMPAIGN_LIST_SORT_BY: CampaignListSortBy = 'a-z';\n\n\nexport function CampaignAPIMixin<TBase extends APIConstructor>(Base: TBase) {\n  return class CampaignAPI extends Base {\n    getCampaignList(params: GetCampaignListParams): Promise<CampaignList> {\n      const { sortBy = DEFAULT_CAMPAIGN_LIST_SORT_BY, limit = DEFAULT_CAMPAIGN_LIST_SIZE, offset = 0 } = params;\n      return this.db.getCampaignList({\n        sortBy,\n        limit,\n        offset\n      });\n    }\n\n    getCampaign(params: GetCampaignParams & { withCounts: true }): Promise<CampaignWithCounts | null>;\n    getCampaign(params: GetCampaignParams & { withCounts?: false }): Promise<Campaign | null>;\n    getCampaign(params: GetCampaignParams): Promise<Campaign | CampaignWithCounts | null>;\n    getCampaign(params: GetCampaignParams) {\n      return this.db.getCampaign(params);\n    }\n  }\n}"]}
+{"version":3,"file":"CampaignAPIMixin.js","sourceRoot":"","sources":["../../../src/browse/api/CampaignAPIMixin.ts"],"names":[],"mappings":";;;;;AAKA,MAAM,0BAA0B,GAAG,EAAE,CAAC;AACtC,MAAM,6BAA6B,GAAuB,KAAK,CAAC;AAGhE,MAAM,UAAU,gBAAgB,CAA+B,IAAW;;IACxE,YAAO,MAAM,WAAY,SAAQ,IAAI;YAA9B;;;YAmCP,CAAC;YAlCC,KAAK,CAAC,eAAe,CAAC,MAA6B;gBACjD,MAAM,EAAE,MAAM,GAAG,6BAA6B,EAAE,KAAK,GAAG,0BAA0B,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC;gBAC1G,MAAM,IAAI,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,eAAe,CAAC;oBACzC,MAAM;oBACN,KAAK;oBACL,MAAM;iBACP,CAAC,CAAC;gBACH,KAAK,MAAM,QAAQ,IAAI,IAAI,CAAC,SAAS,EAAE,CAAC;oBACtC,uBAAA,IAAI,6DAAkB,MAAtB,IAAI,EAAmB,QAAQ,CAAC,CAAC;gBACnC,CAAC;gBACD,OAAO,IAAI,CAAC;YACd,CAAC;YAKD,KAAK,CAAC,WAAW,CAAC,MAAyB;gBACzC,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,EAAE,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC;gBACnD,IAAI,QAAQ,EAAE,CAAC;oBACb,uBAAA,IAAI,6DAAkB,MAAtB,IAAI,EAAmB,QAAQ,CAAC,CAAC;gBACnC,CAAC;gBACD,OAAO,QAAQ,CAAC;YAClB,CAAC;SAYF;;+EAVmB,QAAkB;YAClC,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACrB,QAAQ,CAAC,OAAO,GAAG,IAAI,CAAC,YAAY,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;YACzD,CAAC;YACD,KAAK,MAAM,MAAM,IAAI,QAAQ,CAAC,OAAO,EAAE,CAAC;gBACtC,IAAI,MAAM,CAAC,WAAW,EAAE,CAAC;oBACvB,MAAM,CAAC,WAAW,GAAG,IAAI,CAAC,YAAY,CAAC,MAAM,CAAC,WAAW,CAAC,CAAC;gBAC7D,CAAC;YACH,CAAC;QACH,CAAC;WACF;AACH,CAAC","sourcesContent":["import { type APIConstructor } from \".\";\nimport { type Campaign } from \"../../entities/index.js\";\nimport { type CampaignList, type CampaignListSortBy, type CampaignWithCounts, type GetCampaignListParams, type GetCampaignParams } from \"../types/Campaign.js\";\n\n\nconst DEFAULT_CAMPAIGN_LIST_SIZE = 10;\nconst DEFAULT_CAMPAIGN_LIST_SORT_BY: CampaignListSortBy = 'a-z';\n\n\nexport function CampaignAPIMixin<TBase extends APIConstructor>(Base: TBase) {\n  return class CampaignAPI extends Base {\n    async getCampaignList(params: GetCampaignListParams): Promise<CampaignList> {\n      const { sortBy = DEFAULT_CAMPAIGN_LIST_SORT_BY, limit = DEFAULT_CAMPAIGN_LIST_SIZE, offset = 0 } = params;\n      const list = await this.db.getCampaignList({\n        sortBy,\n        limit,\n        offset\n      });\n      for (const campaign of list.campaigns) {\n        this.#sanitizeCampaign(campaign);\n      }\n      return list;\n    }\n\n    async getCampaign(params: GetCampaignParams & { withCounts: true }): Promise<CampaignWithCounts | null>;\n    async getCampaign(params: GetCampaignParams & { withCounts?: false }): Promise<Campaign | null>;\n    async getCampaign(params: GetCampaignParams): Promise<Campaign | CampaignWithCounts | null>;\n    async getCampaign(params: GetCampaignParams) {\n      const campaign = await this.db.getCampaign(params);\n      if (campaign) {\n        this.#sanitizeCampaign(campaign);\n      }\n      return campaign;\n    }\n\n    #sanitizeCampaign(campaign: Campaign) {\n      if (campaign.summary) {\n        campaign.summary = this.sanitizeHTML(campaign.summary);\n      }\n      for (const reward of campaign.rewards) {\n        if (reward.description) {\n          reward.description = this.sanitizeHTML(reward.description);\n        }\n      }\n    }\n  }\n}"]}

package/dist/browse/api/ContentAPIMixin.d.ts

@@ -1,13 +1,16 @@
 import { type APIConstructor } from ".";
+import { type Post } from "../../entities";
 import { type ContentType, type GetContentListParams } from "../types/Content.js";
 export declare function ContentAPIMixin<TBase extends APIConstructor>(Base: TBase): {
     new (...args: any[]): {
         getContentList<T extends ContentType>(params: GetContentListParams<T>): Promise<import("../types/Content.js").ContentList<T>>;
         getPost(id: string): Promise<import("../types/Content.js").PostWithComments | null>;
-        getProduct(id: string): Promise<import("../..").Product | null>;
+        getProduct(id: string): Promise<import("../../entities").Product | null>;
+        "__#133@#processPostContentInlineMedia"(post: Post): void;
         name: string;
         db: import("../db").DBInstance;
         logger?: import("../..").Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: import("../..").LogLevel, ...msg: any[]): void;
     };
 } & TBase;

package/dist/browse/api/ContentAPIMixin.js

@@ -1,22 +1,90 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+import { load as cheerioLoad } from 'cheerio';
+import RawDataExtractor from '../web/utils/RawDataExtractor.js';
 const DEFAULT_CONTENT_LIST_SIZE = 10;
 const DEFAULT_CONTENT_LIST_SORT_BY = 'a-z';
 export function ContentAPIMixin(Base) {
-    return class ContentAPI extends Base {
-        getContentList(params) {
-            const { sortBy = DEFAULT_CONTENT_LIST_SORT_BY, limit = DEFAULT_CONTENT_LIST_SIZE, offset = 0 } = params;
-            return this.db.getContentList({
-                ...params,
-                sortBy,
-                limit,
-                offset,
+    var _ContentAPI_instances, _ContentAPI_processPostContentInlineMedia, _a;
+    return _a = class ContentAPI extends Base {
+            constructor() {
+                super(...arguments);
+                _ContentAPI_instances.add(this);
+            }
+            async getContentList(params) {
+                const { sortBy = DEFAULT_CONTENT_LIST_SORT_BY, limit = DEFAULT_CONTENT_LIST_SIZE, offset = 0 } = params;
+                const list = await this.db.getContentList({
+                    ...params,
+                    sortBy,
+                    limit,
+                    offset,
+                });
+                for (const item of list.items) {
+                    switch (item.type) {
+                        case 'post':
+                            __classPrivateFieldGet(this, _ContentAPI_instances, "m", _ContentAPI_processPostContentInlineMedia).call(this, item);
+                            item.content = this.sanitizeHTML(item.content || '');
+                            break;
+                        case 'product': {
+                            const description = RawDataExtractor.getProductRichTextDescription(item);
+                            item.description = description ? this.sanitizeHTML(description) : null;
+                            break;
+                        }
+                    }
+                }
+                return list;
+            }
+            async getPost(id) {
+                const post = await this.db.getContent(id, 'post');
+                if (post) {
+                    __classPrivateFieldGet(this, _ContentAPI_instances, "m", _ContentAPI_processPostContentInlineMedia).call(this, post);
+                    post.content = this.sanitizeHTML(post.content || '');
+                }
+                return post;
+            }
+            getProduct(id) {
+                return this.db.getContent(id, 'product');
+            }
+        },
+        _ContentAPI_instances = new WeakSet(),
+        _ContentAPI_processPostContentInlineMedia = function _ContentAPI_processPostContentInlineMedia(post) {
+            const html = post.content || '';
+            if (!html || post.images.length === 0) {
+                return;
+            }
+            const $ = cheerioLoad(html);
+            const replacedMediaIds = [];
+            $('img').each((_, _el) => {
+                const el = $(_el);
+                const id = el.attr('data-media-id');
+                const matched = id ? post.images.find(img => img.id === id && img.downloaded) : null;
+                const src = matched ? `/media/${matched.id}` : el.attr('src');
+                const imgEl = $('<img>').attr('src', src);
+                const aEl = $('<a>')
+                    .attr('href', src)
+                    .attr('class', 'lightgallery-item')
+                    .append(imgEl);
+                const wrapperEl = $('<div>')
+                    .attr('class', 'post-card__inline-media-wrapper')
+                    .append(aEl);
+                if (!matched) {
+                    const caption = "(Externally hosted - not stored locally)";
+                    wrapperEl.append($('<span>').attr('class', 'post-card__inline-media-caption').append(caption));
+                }
+                el.replaceWith(wrapperEl);
+                if (id && matched) {
+                    replacedMediaIds.push(id);
+                }
             });
-        }
-        getPost(id) {
-            return this.db.getContent(id, 'post');
-        }
-        getProduct(id) {
-            return this.db.getContent(id, 'product');
-        }
-    };
+            if (replacedMediaIds.length > 0) {
+                post.content = $.html();
+                // Remove images that have been inlined
+                post.images = post.images.filter((img) => !replacedMediaIds.includes(img.id));
+            }
+        },
+        _a;
 }
 //# sourceMappingURL=ContentAPIMixin.js.map

package/dist/browse/api/ContentAPIMixin.js.map

@@ -1 +1 @@
-{"version":3,"file":"ContentAPIMixin.js","sourceRoot":"","sources":["../../../src/browse/api/ContentAPIMixin.ts"],"names":[],"mappings":"AAGA,MAAM,yBAAyB,GAAG,EAAE,CAAC;AACrC,MAAM,4BAA4B,GAAsB,KAAK,CAAC;AAE9D,MAAM,UAAU,eAAe,CAA+B,IAAW;IACvE,OAAO,MAAM,UAAW,SAAQ,IAAI;QAClC,cAAc,CAAwB,MAA+B;YACnE,MAAM,EAAE,MAAM,GAAG,4BAA4B,EAAE,KAAK,GAAG,yBAAyB,EAAE,MAAM,GAAG,CAAC,EAAE,GAAG,MAAM,CAAC;YACxG,OAAO,IAAI,CAAC,EAAE,CAAC,cAAc,CAAC;gBAC5B,GAAG,MAAM;gBACT,MAAM;gBACN,KAAK;gBACL,MAAM;aACP,CAAC,CAAC;QACL,CAAC;QAED,OAAO,CAAC,EAAU;YAChB,OAAO,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACxC,CAAC;QAED,UAAU,CAAC,EAAU;YACnB,OAAO,IAAI,CAAC,EAAE,CAAC,UAAU,CAAC,EAAE,EAAE,SAAS,CAAC,CAAC;QAC3C,CAAC;KACF,CAAA;AACH,CAAC","sourcesContent":["import { type APIConstructor } from \".\";\nimport { type ContentListSortBy, type ContentType, type GetContentListParams } from \"../types/Content.js\";\n\nconst DEFAULT_CONTENT_LIST_SIZE = 10;\nconst DEFAULT_CONTENT_LIST_SORT_BY: ContentListSortBy = 'a-z';\n\nexport function ContentAPIMixin<TBase extends APIConstructor>(Base: TBase) {\n  return class ContentAPI extends Base {\n    getContentList<T extends ContentType>(params: GetContentListParams<T>) {\n      const { sortBy = DEFAULT_CONTENT_LIST_SORT_BY, limit = DEFAULT_CONTENT_LIST_SIZE, offset = 0 } = params;\n      return this.db.getContentList({\n        ...params,\n        sortBy,\n        limit,\n        offset,\n      });\n    }\n\n    getPost(id: string) {\n      return this.db.getContent(id, 'post');\n    }\n\n    getProduct(id: string) {\n      return this.db.getContent(id, 'product');\n    }\n  }\n}"]}
+{"version":3,"file":"ContentAPIMixin.js","sourceRoot":"","sources":["../../../src/browse/api/ContentAPIMixin.ts"],"names":[],"mappings":"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","sourcesContent":["import { load as cheerioLoad } from 'cheerio';\nimport { type APIConstructor } from \".\";\nimport { type Post } from \"../../entities\";\nimport { type ContentListSortBy, type ContentType, type GetContentListParams } from \"../types/Content.js\";\nimport RawDataExtractor from '../web/utils/RawDataExtractor.js';\n\nconst DEFAULT_CONTENT_LIST_SIZE = 10;\nconst DEFAULT_CONTENT_LIST_SORT_BY: ContentListSortBy = 'a-z';\n\nexport function ContentAPIMixin<TBase extends APIConstructor>(Base: TBase) {\n  return class ContentAPI extends Base {\n    async getContentList<T extends ContentType>(params: GetContentListParams<T>) {\n      const { sortBy = DEFAULT_CONTENT_LIST_SORT_BY, limit = DEFAULT_CONTENT_LIST_SIZE, offset = 0 } = params;\n      const list = await this.db.getContentList({\n        ...params,\n        sortBy,\n        limit,\n        offset,\n      });\n      for (const item of list.items) {\n        switch (item.type) {\n          case 'post':\n            this.#processPostContentInlineMedia(item);\n            item.content = this.sanitizeHTML(item.content || '');\n            break;\n          case 'product': {\n            const description = RawDataExtractor.getProductRichTextDescription(item);\n            item.description = description ? this.sanitizeHTML(description) : null;\n            break;\n          }\n        }\n      }\n      return list;\n    }\n\n    async getPost(id: string) {\n      const post = await this.db.getContent(id, 'post');\n      if (post) {\n        this.#processPostContentInlineMedia(post);\n        post.content = this.sanitizeHTML(post.content || '');\n      }\n      return post;\n    }\n\n    getProduct(id: string) {\n      return this.db.getContent(id, 'product');\n    }\n\n    #processPostContentInlineMedia(post: Post) {\n      const html = post.content || '';\n      if (!html || post.images.length === 0) {\n        return;\n      }\n      const $ = cheerioLoad(html);\n      const replacedMediaIds: string[] = [];\n      $('img').each((_, _el) => {\n        const el = $(_el);\n        const id = el.attr('data-media-id');\n        const matched = id ? post.images.find(img => img.id === id && img.downloaded) : null;\n        const src = matched ? `/media/${matched.id}` : el.attr('src');\n        const imgEl = $('<img>').attr('src', src);\n        const aEl = $('<a>')\n          .attr('href', src)\n          .attr('class', 'lightgallery-item')\n          .append(imgEl);\n        const wrapperEl = $('<div>')\n          .attr('class', 'post-card__inline-media-wrapper')\n          .append(aEl);\n        if (!matched) {\n          const caption = \"(Externally hosted - not stored locally)\";\n          wrapperEl.append(\n            $('<span>').attr('class', 'post-card__inline-media-caption').append(caption)\n          );\n        }\n        el.replaceWith(wrapperEl);\n        if (id && matched) {\n          replacedMediaIds.push(id);\n        }\n      });\n      if (replacedMediaIds.length > 0) {\n        post.content = $.html();\n        // Remove images that have been inlined\n        post.images = post.images.filter((img) => !replacedMediaIds.includes(img.id));\n      }\n    }\n  }\n}"]}

package/dist/browse/api/FilterAPIMixin.d.ts

@@ -3,12 +3,13 @@ import { type FilterData, type MediaFilterSearchParams, type PostFilterSearchPar
 export declare function FilterAPIMixin<TBase extends APIConstructor>(Base: TBase): {
     new (...args: any[]): {
         getPostFilterData(campaignId: string): Promise<FilterData<PostFilterSearchParams>>;
-        "__#107@#getPostTypeTitle"(postType: string): "Link" | "Text" | "Audio" | "Image" | "Podcast" | "Poll" | "Video" | "Other";
+        "__#134@#getPostTypeTitle"(postType: string): "Link" | "Audio" | "Image" | "Video" | "Other" | "Text" | "Podcast" | "Poll";
         getProductFilterData(campaignId: string): Promise<FilterData<ProductFilterSearchParams>>;
         getMediaFilterData(campaignId: string): Promise<FilterData<MediaFilterSearchParams>>;
         name: string;
         db: import("../db").DBInstance;
         logger?: import("../..").Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: import("../..").LogLevel, ...msg: any[]): void;
     };
 } & TBase;

package/dist/browse/api/MediaAPIMixin.d.ts

@@ -7,6 +7,7 @@ export declare function MediaAPIMixin<TBase extends APIConstructor>(Base: TBase)
         name: string;
         db: import("../db").DBInstance;
         logger?: import("../..").Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: import("../..").LogLevel, ...msg: any[]): void;
     };
 } & TBase;

package/dist/browse/api/SettingsAPIMixin.d.ts

@@ -12,6 +12,7 @@ export declare function SettingsAPIMixin<TBase extends APIConstructor>(Base: TBa
         name: string;
         db: import("../db").DBInstance;
         logger?: import("../..").Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: import("../..").LogLevel, ...msg: any[]): void;
     };
 } & TBase;

package/dist/browse/api/index.d.ts

@@ -11,18 +11,20 @@ export declare class APIBase {
     constructor(db: DBInstance, logger?: Logger | null);
     static getInstance(db: DBInstance, logger?: Logger | null): {
         getPostFilterData(campaignId: string): Promise<import("../types/Filter.js").FilterData<import("../types/Filter.js").PostFilterSearchParams>>;
-        "__#107@#getPostTypeTitle"(postType: string): "Link" | "Text" | "Audio" | "Image" | "Podcast" | "Poll" | "Video" | "Other";
+        "__#134@#getPostTypeTitle"(postType: string): "Link" | "Audio" | "Image" | "Video" | "Other" | "Text" | "Podcast" | "Poll";
         getProductFilterData(campaignId: string): Promise<import("../types/Filter.js").FilterData<import("../types/Filter.js").ProductFilterSearchParams>>;
         getMediaFilterData(campaignId: string): Promise<import("../types/Filter.js").FilterData<import("../types/Filter.js").MediaFilterSearchParams>>;
         name: string;
         db: DBInstance;
         logger?: Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: LogLevel, ...msg: any[]): void;
     } & {
         getMediaList<T extends import("../types/Content.js").ContentType>(params: import("../types/Media.js").GetMediaListParams<T>): Promise<import("../types/Media.js").MediaList<T>>;
         name: string;
         db: DBInstance;
         logger?: Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: LogLevel, ...msg: any[]): void;
     } & {
         getBrowseSettings(): Promise<{
@@ -35,14 +37,17 @@ export declare class APIBase {
         name: string;
         db: DBInstance;
         logger?: Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: LogLevel, ...msg: any[]): void;
     } & {
         getContentList<T extends import("../types/Content.js").ContentType>(params: import("../types/Content.js").GetContentListParams<T>): Promise<import("../types/Content.js").ContentList<T>>;
         getPost(id: string): Promise<import("../types/Content.js").PostWithComments | null>;
         getProduct(id: string): Promise<import("../../index.js").Product | null>;
+        "__#133@#processPostContentInlineMedia"(post: import("../../index.js").Post): void;
         name: string;
         db: DBInstance;
         logger?: Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: LogLevel, ...msg: any[]): void;
     } & {
         getCampaignList(params: import("../types/Campaign.js").GetCampaignListParams): Promise<import("../types/Campaign.js").CampaignList>;
@@ -53,22 +58,26 @@ export declare class APIBase {
             withCounts?: false;
         }): Promise<import("../../index.js").Campaign | null>;
         getCampaign(params: import("../types/Campaign.js").GetCampaignParams): Promise<import("../../index.js").Campaign | import("../types/Campaign.js").CampaignWithCounts | null>;
+        "__#132@#sanitizeCampaign"(campaign: import("../../index.js").Campaign): void;
         name: string;
         db: DBInstance;
         logger?: Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: LogLevel, ...msg: any[]): void;
     } & APIBase;
+    sanitizeHTML(html: string): string;
     log(level: LogLevel, ...msg: any[]): void;
 }
 declare const API: {
     new (...args: any[]): {
         getPostFilterData(campaignId: string): Promise<import("../types/Filter.js").FilterData<import("../types/Filter.js").PostFilterSearchParams>>;
-        "__#107@#getPostTypeTitle"(postType: string): "Link" | "Text" | "Audio" | "Image" | "Podcast" | "Poll" | "Video" | "Other";
+        "__#134@#getPostTypeTitle"(postType: string): "Link" | "Audio" | "Image" | "Video" | "Other" | "Text" | "Podcast" | "Poll";
         getProductFilterData(campaignId: string): Promise<import("../types/Filter.js").FilterData<import("../types/Filter.js").ProductFilterSearchParams>>;
         getMediaFilterData(campaignId: string): Promise<import("../types/Filter.js").FilterData<import("../types/Filter.js").MediaFilterSearchParams>>;
         name: string;
         db: DBInstance;
         logger?: Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: LogLevel, ...msg: any[]): void;
     };
 } & {
@@ -77,6 +86,7 @@ declare const API: {
         name: string;
         db: DBInstance;
         logger?: Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: LogLevel, ...msg: any[]): void;
     };
 } & {
@@ -91,6 +101,7 @@ declare const API: {
         name: string;
         db: DBInstance;
         logger?: Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: LogLevel, ...msg: any[]): void;
     };
 } & {
@@ -98,9 +109,11 @@ declare const API: {
         getContentList<T extends import("../types/Content.js").ContentType>(params: import("../types/Content.js").GetContentListParams<T>): Promise<import("../types/Content.js").ContentList<T>>;
         getPost(id: string): Promise<import("../types/Content.js").PostWithComments | null>;
         getProduct(id: string): Promise<import("../../index.js").Product | null>;
+        "__#133@#processPostContentInlineMedia"(post: import("../../index.js").Post): void;
         name: string;
         db: DBInstance;
         logger?: Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: LogLevel, ...msg: any[]): void;
     };
 } & {
@@ -113,9 +126,11 @@ declare const API: {
             withCounts?: false;
         }): Promise<import("../../index.js").Campaign | null>;
         getCampaign(params: import("../types/Campaign.js").GetCampaignParams): Promise<import("../../index.js").Campaign | import("../types/Campaign.js").CampaignWithCounts | null>;
+        "__#132@#sanitizeCampaign"(campaign: import("../../index.js").Campaign): void;
         name: string;
         db: DBInstance;
         logger?: Logger | null;
+        sanitizeHTML(html: string): string;
         log(level: LogLevel, ...msg: any[]): void;
     };
 } & typeof APIBase;

package/dist/browse/api/index.js

@@ -1,9 +1,17 @@
+import _sanitizeHTML from 'sanitize-html';
 import { commonLog } from '../../utils/logging/Logger.js';
 import { CampaignAPIMixin } from './CampaignAPIMixin.js';
 import { ContentAPIMixin } from './ContentAPIMixin.js';
 import { SettingsAPIMixin } from './SettingsAPIMixin.js';
 import { MediaAPIMixin } from './MediaAPIMixin.js';
 import { FilterAPIMixin } from './FilterAPIMixin.js';
+const SANITIZE_HTML_OPTIONS = {
+    allowedTags: _sanitizeHTML.defaults.allowedTags.concat(['img']),
+    allowedAttributes: {
+        ..._sanitizeHTML.defaults.allowedAttributes,
+        '*': ['class']
+    }
+};
 export class APIBase {
     constructor(db, logger) {
         this.name = 'API';
@@ -16,6 +24,9 @@ export class APIBase {
         }
         return this.instance;
     }
+    sanitizeHTML(html) {
+        return _sanitizeHTML(html, SANITIZE_HTML_OPTIONS);
+    }
     log(level, ...msg) {
         const limiterStopOnError = msg.find((m) => m instanceof Error && m.message === 'LimiterStopOnError');
         if (limiterStopOnError) {

package/dist/browse/api/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browse/api/index.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAiB,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrD,MAAM,OAAO,OAAO;IAOlB,YAAY,EAAc,EAAE,MAAsB;QANlD,SAAI,GAAG,KAAK,CAAC;QAOX,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,EAAc,EAAE,MAAsB;QACvD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,GAAG,CAAC,KAAe,EAAE,GAAG,GAAU;QAChC,MAAM,kBAAkB,GAAG,GAAG,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,oBAAoB,CAChE,CAAC;QACF,IAAI,kBAAkB,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC;IACnD,CAAC;;AAxBgB,gBAAQ,GAAuB,IAAI,AAA3B,CAA4B;AA2BvD,MAAM,GAAG,GAAG,cAAc,CAAC,aAAa,CAAC,gBAAgB,CAAC,eAAe,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAExG,eAAe,GAAG,CAAC","sourcesContent":["import type Logger from '../../utils/logging/Logger.js';\nimport { commonLog, type LogLevel } from '../../utils/logging/Logger.js';\nimport { CampaignAPIMixin } from './CampaignAPIMixin.js';\nimport { type DBInstance } from '../db';\nimport { ContentAPIMixin } from './ContentAPIMixin.js';\nimport { SettingsAPIMixin } from './SettingsAPIMixin.js';\nimport { MediaAPIMixin } from './MediaAPIMixin.js';\nimport { FilterAPIMixin } from './FilterAPIMixin.js';\n\nexport type APIConstructor = new (...args: any[]) => APIBase;\nexport type APIInstance = InstanceType<typeof API>;\n\nexport class APIBase {\n  name = 'API';\n\n  protected static instance: APIInstance | null = null;\n  db: DBInstance;\n  logger?: Logger | null;\n\n  constructor(db: DBInstance, logger?: Logger | null) {\n    this.db = db;\n    this.logger = logger;\n  }\n\n  static getInstance(db: DBInstance, logger?: Logger | null) {\n    if (!this.instance) {\n      this.instance = new API(db, logger);\n    }\n    return this.instance;\n  }\n\n  log(level: LogLevel, ...msg: any[]) {\n    const limiterStopOnError = msg.find(\n      (m) => m instanceof Error && m.message === 'LimiterStopOnError'\n    );\n    if (limiterStopOnError) {\n      return;\n    }\n    commonLog(this.logger, level, this.name, ...msg);\n  }\n}\n\nconst API = FilterAPIMixin(MediaAPIMixin(SettingsAPIMixin(ContentAPIMixin(CampaignAPIMixin(APIBase)))));\n\nexport default API;\n"]}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/browse/api/index.ts"],"names":[],"mappings":"AAAA,OAAO,aAAa,MAAM,eAAe,CAAC;AAE1C,OAAO,EAAE,SAAS,EAAiB,MAAM,+BAA+B,CAAC;AACzE,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AAEzD,OAAO,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AACvD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AAKrD,MAAM,qBAAqB,GAAG;IAC5B,WAAW,EAAE,aAAa,CAAC,QAAQ,CAAC,WAAW,CAAC,MAAM,CAAC,CAAC,KAAK,CAAC,CAAC;IAC/D,iBAAiB,EAAE;QACjB,GAAG,aAAa,CAAC,QAAQ,CAAC,iBAAiB;QAC3C,GAAG,EAAE,CAAC,OAAO,CAAC;KACf;CACF,CAAC;AAEF,MAAM,OAAO,OAAO;IAOlB,YAAY,EAAc,EAAE,MAAsB;QANlD,SAAI,GAAG,KAAK,CAAC;QAOX,IAAI,CAAC,EAAE,GAAG,EAAE,CAAC;QACb,IAAI,CAAC,MAAM,GAAG,MAAM,CAAC;IACvB,CAAC;IAED,MAAM,CAAC,WAAW,CAAC,EAAc,EAAE,MAAsB;QACvD,IAAI,CAAC,IAAI,CAAC,QAAQ,EAAE,CAAC;YACnB,IAAI,CAAC,QAAQ,GAAG,IAAI,GAAG,CAAC,EAAE,EAAE,MAAM,CAAC,CAAC;QACtC,CAAC;QACD,OAAO,IAAI,CAAC,QAAQ,CAAC;IACvB,CAAC;IAED,YAAY,CAAC,IAAY;QACvB,OAAO,aAAa,CAAC,IAAI,EAAE,qBAAqB,CAAC,CAAC;IACpD,CAAC;IAED,GAAG,CAAC,KAAe,EAAE,GAAG,GAAU;QAChC,MAAM,kBAAkB,GAAG,GAAG,CAAC,IAAI,CACjC,CAAC,CAAC,EAAE,EAAE,CAAC,CAAC,YAAY,KAAK,IAAI,CAAC,CAAC,OAAO,KAAK,oBAAoB,CAChE,CAAC;QACF,IAAI,kBAAkB,EAAE,CAAC;YACvB,OAAO;QACT,CAAC;QACD,SAAS,CAAC,IAAI,CAAC,MAAM,EAAE,KAAK,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,GAAG,CAAC,CAAC;IACnD,CAAC;;AA5BgB,gBAAQ,GAAuB,IAAI,AAA3B,CAA4B;AA+BvD,MAAM,GAAG,GAAG,cAAc,CAAC,aAAa,CAAC,gBAAgB,CAAC,eAAe,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,CAAC,CAAC;AAExG,eAAe,GAAG,CAAC","sourcesContent":["import _sanitizeHTML from 'sanitize-html';\nimport type Logger from '../../utils/logging/Logger.js';\nimport { commonLog, type LogLevel } from '../../utils/logging/Logger.js';\nimport { CampaignAPIMixin } from './CampaignAPIMixin.js';\nimport { type DBInstance } from '../db';\nimport { ContentAPIMixin } from './ContentAPIMixin.js';\nimport { SettingsAPIMixin } from './SettingsAPIMixin.js';\nimport { MediaAPIMixin } from './MediaAPIMixin.js';\nimport { FilterAPIMixin } from './FilterAPIMixin.js';\n\nexport type APIConstructor = new (...args: any[]) => APIBase;\nexport type APIInstance = InstanceType<typeof API>;\n\nconst SANITIZE_HTML_OPTIONS = {\n  allowedTags: _sanitizeHTML.defaults.allowedTags.concat(['img']),\n  allowedAttributes: {\n    ..._sanitizeHTML.defaults.allowedAttributes,\n    '*': ['class']\n  }\n};\n\nexport class APIBase {\n  name = 'API';\n\n  protected static instance: APIInstance | null = null;\n  db: DBInstance;\n  logger?: Logger | null;\n\n  constructor(db: DBInstance, logger?: Logger | null) {\n    this.db = db;\n    this.logger = logger;\n  }\n\n  static getInstance(db: DBInstance, logger?: Logger | null) {\n    if (!this.instance) {\n      this.instance = new API(db, logger);\n    }\n    return this.instance;\n  }\n\n  sanitizeHTML(html: string) {\n    return _sanitizeHTML(html, SANITIZE_HTML_OPTIONS);\n  }\n\n  log(level: LogLevel, ...msg: any[]) {\n    const limiterStopOnError = msg.find(\n      (m) => m instanceof Error && m.message === 'LimiterStopOnError'\n    );\n    if (limiterStopOnError) {\n      return;\n    }\n    commonLog(this.logger, level, this.name, ...msg);\n  }\n}\n\nconst API = FilterAPIMixin(MediaAPIMixin(SettingsAPIMixin(ContentAPIMixin(CampaignAPIMixin(APIBase)))));\n\nexport default API;\n"]}

package/dist/browse/db/CampaignDBMixin.d.ts

@@ -7,10 +7,10 @@ export declare function CampaignDBMixin<TBase extends UserDBConstructor>(Base: T
     new (...args: any[]): {
         saveCampaign(campaign: Campaign | null, downloadDate: Date, overwriteIfExists?: boolean): Promise<void>;
         getCampaign(params: GetCampaignParams): Promise<Campaign | null>;
-        "__#93@#saveRewards"(campaign: Campaign): Promise<void>;
-        "__#93@#doSaveReward"(campaign: Campaign, reward: Reward): Promise<void>;
+        "__#118@#saveRewards"(campaign: Campaign): Promise<void>;
+        "__#118@#doSaveReward"(campaign: Campaign, reward: Reward): Promise<void>;
         getCampaignList(params: GetCampaignListParams): Promise<CampaignList>;
-        "__#93@#getCampaignWithCounts"(params: GetCampaignParams): Promise<CampaignWithCounts | null>;
+        "__#118@#getCampaignWithCounts"(params: GetCampaignParams): Promise<CampaignWithCounts | null>;
         checkCampaignExists(id: string): Promise<boolean>;
         saveUser(user: import("../../index.js").User | null): Promise<void>;
         getUserByID(id: string): Promise<import("../../index.js").User | null>;
@@ -51,7 +51,7 @@ export declare function CampaignDBMixin<TBase extends UserDBConstructor>(Base: T
         run(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<import("sqlite").ISqlite.RunResult<import("sqlite3").Statement>>;
         get<T = any>(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<T | undefined>;
         all<T = any[]>(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<T>;
-        "__#95@#interpolateSqlParams"(sql: import("sqlite").ISqlite.SqlType | string, params: any[]): string;
+        "__#120@#interpolateSqlParams"(sql: import("sqlite").ISqlite.SqlType | string, params: any[]): string;
         log(level: import("../../index.js").LogLevel, ...msg: any[]): void;
     };
 } & TBase;

package/dist/browse/db/ContentDBMixin.d.ts

@@ -4,13 +4,13 @@ import { type CampaignDBConstructor } from './CampaignDBMixin.js';
 export declare function ContentDBMixin<TBase extends CampaignDBConstructor>(Base: TBase): {
     new (...args: any[]): {
         saveContent(content: Post | Product): Promise<void>;
-        "__#94@#saveContentMedia"(content: Post | Product): Promise<void>;
-        "__#94@#savepostMedia"(post: Post): Promise<void>;
-        "__#94@#saveProductMedia"(product: Product): Promise<void>;
-        "__#94@#doSaveContentMedia"(content: Post | Product, media: Downloadable, mediaIndex: number, isPreview: boolean): Promise<void>;
-        "__#94@#publishedAtToTime"(publishedAt: string | null): number | null;
-        "__#94@#savePostTiers"(post: Post): Promise<void>;
-        "__#94@#doSaveTier"(post: Post, tier: Tier): Promise<void>;
+        "__#119@#saveContentMedia"(content: Post | Product): Promise<void>;
+        "__#119@#savepostMedia"(post: Post): Promise<void>;
+        "__#119@#saveProductMedia"(product: Product): Promise<void>;
+        "__#119@#doSaveContentMedia"(content: Post | Product, media: Downloadable, mediaIndex: number, isPreview: boolean): Promise<void>;
+        "__#119@#publishedAtToTime"(publishedAt: string | null): number | null;
+        "__#119@#savePostTiers"(post: Post): Promise<void>;
+        "__#119@#doSaveTier"(post: Post, tier: Tier): Promise<void>;
         savePostComments(post: Post, comments: Comment[]): Promise<void>;
         checkPostCommentsExist(post: Post): Promise<boolean>;
         getContent(id: string, contentType: "post"): Promise<PostWithComments | null>;
@@ -21,7 +21,7 @@ export declare function ContentDBMixin<TBase extends CampaignDBConstructor>(Base
          * @param row Must have `details`, `comment_count` and `comments`
          * @returns
          */
-        "__#94@#parseContentRowJoinedComments"(row: any): any;
+        "__#119@#parseContentRowJoinedComments"(row: any): any;
         getContentCountByDate(contentType: ContentType, groupBy: "year" | "month", filter?: {
             campaign?: Campaign | string | null;
             date?: Date | null;
@@ -42,10 +42,10 @@ export declare function ContentDBMixin<TBase extends CampaignDBConstructor>(Base
         getPostComments(post: Post | string): Promise<Comment[] | null>;
         saveCampaign(campaign: Campaign | null, downloadDate: Date, overwriteIfExists?: boolean): Promise<void>;
         getCampaign(params: import("../types/Campaign").GetCampaignParams): Promise<Campaign | null>;
-        "__#93@#saveRewards"(campaign: Campaign): Promise<void>;
-        "__#93@#doSaveReward"(campaign: Campaign, reward: import("../../entities").Reward): Promise<void>;
+        "__#118@#saveRewards"(campaign: Campaign): Promise<void>;
+        "__#118@#doSaveReward"(campaign: Campaign, reward: import("../../entities").Reward): Promise<void>;
         getCampaignList(params: import("../types/Campaign").GetCampaignListParams): Promise<import("../types/Campaign").CampaignList>;
-        "__#93@#getCampaignWithCounts"(params: import("../types/Campaign").GetCampaignParams): Promise<import("../types/Campaign").CampaignWithCounts | null>;
+        "__#118@#getCampaignWithCounts"(params: import("../types/Campaign").GetCampaignParams): Promise<import("../types/Campaign").CampaignWithCounts | null>;
         checkCampaignExists(id: string): Promise<boolean>;
         saveUser(user: import("../../entities").User | null): Promise<void>;
         getUserByID(id: string): Promise<import("../../entities").User | null>;
@@ -86,7 +86,7 @@ export declare function ContentDBMixin<TBase extends CampaignDBConstructor>(Base
         run(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<import("sqlite").ISqlite.RunResult<import("sqlite3").Statement>>;
         get<T = any>(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<T | undefined>;
         all<T = any[]>(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<T>;
-        "__#95@#interpolateSqlParams"(sql: import("sqlite").ISqlite.SqlType | string, params: any[]): string;
+        "__#120@#interpolateSqlParams"(sql: import("sqlite").ISqlite.SqlType | string, params: any[]): string;
         log(level: import("../..").LogLevel, ...msg: any[]): void;
     };
 } & TBase;

package/dist/browse/db/EnvDBMixin.d.ts

@@ -12,7 +12,7 @@ export declare function EnvDBMixin<TBase extends DBConstructor>(Base: TBase): {
         run(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<import("sqlite").ISqlite.RunResult<import("sqlite3").Statement>>;
         get<T = any>(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<T | undefined>;
         all<T = any[]>(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<T>;
-        "__#95@#interpolateSqlParams"(sql: import("sqlite").ISqlite.SqlType | string, params: any[]): string;
+        "__#120@#interpolateSqlParams"(sql: import("sqlite").ISqlite.SqlType | string, params: any[]): string;
         log(level: import("../..").LogLevel, ...msg: any[]): void;
     };
 } & TBase;

package/dist/browse/db/MediaDBMixin.d.ts

@@ -41,7 +41,7 @@ export declare function MediaDBMixin<TBase extends DBConstructor>(Base: TBase):
         run(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<import("sqlite").ISqlite.RunResult<import("sqlite3").Statement>>;
         get<T = any>(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<T | undefined>;
         all<T = any[]>(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<T>;
-        "__#95@#interpolateSqlParams"(sql: import("sqlite").ISqlite.SqlType | string, params: any[]): string;
+        "__#120@#interpolateSqlParams"(sql: import("sqlite").ISqlite.SqlType | string, params: any[]): string;
         log(level: import("../..").LogLevel, ...msg: any[]): void;
     };
 } & TBase;

package/dist/browse/db/UserDBMixin.d.ts

@@ -42,7 +42,7 @@ export declare function UserDBMixin<TBase extends MediaDBConstructor>(Base: TBas
         run(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<import("sqlite").ISqlite.RunResult<import("sqlite3").Statement>>;
         get<T = any>(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<T | undefined>;
         all<T = any[]>(sql: import("sqlite").ISqlite.SqlType, ...params: any[]): Promise<T>;
-        "__#95@#interpolateSqlParams"(sql: import("sqlite").ISqlite.SqlType | string, params: any[]): string;
+        "__#120@#interpolateSqlParams"(sql: import("sqlite").ISqlite.SqlType | string, params: any[]): string;
         log(level: import("../..").LogLevel, ...msg: any[]): void;
     };
 } & TBase;