e621 2.1.7 → 2.1.11

package/README.md

@@ -8,7 +8,7 @@ See the [Features List](Features/README.md) for all of the things this module su
 
 <hr>
 
-This module is structures with submodules corresponding to separate areas of the site. All of these modules are on the primary class, which can be constructed like so:
+This module is structured with submodules corresponding to separate areas of the site. All of these modules are on the primary class, which can be constructed like so:
 ```typescript
 import E621 from "e621"; // or const E621 = require("e621");
 
@@ -31,9 +31,33 @@ Most of these options shouldn't be used unless you know what you're doing (you p
 |:---:|:---:|:---:|:---:|
 | `authUser` | String | None | User for authentication |
 | `authKey` | String | None | Token for authentication |
-| `userAgent` | String | [See Code](https://github.com/DonovanDMC/E621/blob/89d662f19dc76c77e28f40b18a96f9043c4e2a3a/src/types/index.d.ts#L57-L59) | UserAgent for requests |
-| `reconstructStaticURL` | [See Code](https://github.com/DonovanDMC/E621/blob/89d662f19dc76c77e28f40b18a96f9043c4e2a3a/src/util/RequestHandler.ts#L254-L256) | [See Code](https://github.com/DonovanDMC/E621/blob/89d662f19dc76c77e28f40b18a96f9043c4e2a3a/src/types/index.d.ts#L63-L65) | Override default url reconstruction |
-| `imageReconstructionType` | "e621" \| "yiffy" \| "local" \| null | [See Code](https://github.com/DonovanDMC/E621/blob/89d662f19dc76c77e28f40b18a96f9043c4e2a3a/src/types/index.d.ts#L39) | [See Code](https://github.com/DonovanDMC/E621/blob/89d662f19dc76c77e28f40b18a96f9043c4e2a3a/src/types/index.d.ts#L41) |
-| `instanceSSL` | Boolean | true | [See Code](https://github.com/DonovanDMC/E621/blob/89d662f19dc76c77e28f40b18a96f9043c4e2a3a/src/types/index.d.ts#L03) |
-| `instancePort` | Number | 443 | [See Code](https://github.com/DonovanDMC/E621/blob/89d662f19dc76c77e28f40b18a96f9043c4e2a3a/src/types/index.d.ts#L9) |
-| `instanceHost` | String | e621.net | [See Code](https://github.com/DonovanDMC/E621/blob/89d662f19dc76c77e28f40b18a96f9043c4e2a3a/src/types/index.d.ts#L15) |
+| `userAgent` | String | [See Code](https://github.com/DonovanDMC/E621/blob/4bc4e2db7cc8389635d710a852ab6a88a0570602/src/types/index.d.ts#L57-L59) | UserAgent for requests |
+
+#### Instance Options
+These are set via the `setInstance` function.
+| Option | Type | Default | Description |
+|:---:|:---:|:---:|:---:|
+| `reconstructStaticURL` | [See Code](https://github.com/DonovanDMC/E621/blob/4bc4e2db7cc8389635d710a852ab6a88a0570602/src/util/RequestHandler.ts#L254-L256) | [See Code](https://github.com/DonovanDMC/E621/blob/4bc4e2db7cc8389635d710a852ab6a88a0570602/src/types/index.d.ts#L19-L23) | Override default url reconstruction |
+| `imageReconstructionType` | "e621" \| "yiffy" \| "local" \| null | [See Code](https://github.com/DonovanDMC/E621/blob/4bc4e2db7cc8389635d710a852ab6a88a0570602/src/types/index.d.ts#L35) | [See Code](https://github.com/DonovanDMC/E621/blob/4bc4e2db7cc8389635d710a852ab6a88a0570602/src/types/index.d.ts#L37) |
+| `ssl` | Boolean | [^1] | [See Code](https://github.com/DonovanDMC/E621/blob/4bc4e2db7cc8389635d710a852ab6a88a0570602/src/types/index.d.ts#L5) |
+| `port` | Number | [^1] | [See Code](https://github.com/DonovanDMC/E621/blob/4bc4e2db7cc8389635d710a852ab6a88a0570602/src/types/index.d.ts#L11) |
+| `host` | String | [^1] | [See Code](https://github.com/DonovanDMC/E621/blob/4bc4e2db7cc8389635d710a852ab6a88a0570602/src/types/index.d.ts#L15) |
+
+[^1]: This is very dependent on where this function is used. If used on a subclass, like `Yiffy` or `Dev` the defaults will be set to something else, but otherwise they are: true, 443, e621.net
+
+### Using YiffyAPI or E621 Dev?
+We've got built in classes for both. E621 dev assumes you're using [e621ng@ce871e4](https://github.com/zwagoth/e621ng/commit/ce871e412c4d2e1e2478a0e5049d20c77cd3f4d7) or later, as they changed where the dev site is accessed in this commit.
+you can use the built in sub-classes `E621.YiffyAPI` `E621.Dev` to access these, and for anything else: there's `E621.Custom`
+```ts
+import E621 from "e621"; // or import { YiffyAPI, Dev, Custom } from "e621";
+
+// first and only parameter is Options
+const yapi = new E621.Yiffy();
+const dev = new E621.Dev();
+// first parameter is Options, second is InstanceOptions
+const custom = new E621.Custom({}, {
+	host: "example.com",
+	port: 443,
+	ssl: true
+});
+```

package/build/package.json

@@ -1,6 +1,6 @@
 {
     "name": "e621",
-    "version": "2.1.7",
+    "version": "2.1.11",
     "description": "A module for interfacing with e621.",
     "main": "build/src/index.js",
     "scripts": {
@@ -34,11 +34,11 @@
         "@uwu-codes/eslint-config": "^1.0.31",
         "@uwu-codes/tsconfig": "^1.0.1",
         "chai": "^4.3.4",
-        "mocha": "^9.1.3",
+        "mocha": "^9.1.4",
         "ts-node": "^10.4.0",
         "typescript": "^4.5.4"
     },
-    "dependencies": {
+    "optionalDependencies": {
         "debug": "^4.3.3"
     }
 }

package/build/src/index.d.ts

@@ -1,4 +1,4 @@
-import type { Options, InstanceOptions } from "./types";
+import type { Options, InstanceOptions, ConstructedOptions } from "./types";
 import RequestHandler from "./util/RequestHandler";
 import Artists from "./modules/Artists";
 import Notes from "./modules/Notes";
@@ -11,6 +11,7 @@ import Users from "./modules/Users";
 import WikiPages from "./modules/WikiPages";
 import Artist from "./structures/Artist";
 import ArtistHistory from "./structures/ArtistHistory";
+import Note from "./structures/Note";
 import NoteHistory from "./structures/NoteHistory";
 import AuthenticatedUser from "./structures/AuthenticatedUser";
 import Pool from "./structures/Pool";
@@ -25,6 +26,9 @@ import User from "./structures/User";
 import WikiPage from "./structures/WikiPage";
 import WikiPageHistory from "./structures/WikiPageHistory";
 export default class E621 {
+    static YiffyAPI: typeof YiffyAPI;
+    static Dev: typeof Dev;
+    static Custom: typeof Custom;
     POST_LIMIT_PER_REQUEST: number;
     request: RequestHandler;
     artists: Artists;
@@ -37,9 +41,19 @@ export default class E621 {
     users: Users;
     wikiPages: WikiPages;
     private readonly auth;
-    readonly options: InstanceOptions;
+    readonly options: ConstructedOptions;
     constructor(options?: Options);
+    setInstance(opt: InstanceOptions): void;
+}
+declare class YiffyAPI extends E621 {
+    constructor(options: Options);
+}
+declare class Dev extends E621 {
+    constructor(options: Options, ssl?: boolean);
+}
+declare class Custom extends E621 {
+    constructor(options: Options, instanceOptions: InstanceOptions);
 }
 export * from "./types";
 export { APIError } from "./util/RequestHandler";
-export { Artist, ArtistHistory, Notes, NoteHistory, AuthenticatedUser, Pool, PoolHistory, Post, PostApproval, PostHistory, PostSet, Tag, TagHistory, User, WikiPage, WikiPageHistory };
+export { Artist, ArtistHistory, Note, NoteHistory, AuthenticatedUser, Pool, PoolHistory, Post, PostApproval, PostHistory, PostSet, Tag, TagHistory, User, WikiPage, WikiPageHistory, YiffyAPI, Dev, Custom };

package/build/src/index.js

@@ -13,12 +13,11 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.WikiPageHistory = exports.WikiPage = exports.User = exports.TagHistory = exports.Tag = exports.PostSet = exports.PostHistory = exports.PostApproval = exports.Post = exports.PoolHistory = exports.Pool = exports.AuthenticatedUser = exports.NoteHistory = exports.Notes = exports.ArtistHistory = exports.Artist = exports.APIError = void 0;
+exports.Custom = exports.Dev = exports.YiffyAPI = exports.WikiPageHistory = exports.WikiPage = exports.User = exports.TagHistory = exports.Tag = exports.PostSet = exports.PostHistory = exports.PostApproval = exports.Post = exports.PoolHistory = exports.Pool = exports.AuthenticatedUser = exports.NoteHistory = exports.Note = exports.ArtistHistory = exports.Artist = exports.APIError = void 0;
 const RequestHandler_1 = __importDefault(require("./util/RequestHandler"));
 // Modules
 const Artists_1 = __importDefault(require("./modules/Artists"));
 const Notes_1 = __importDefault(require("./modules/Notes"));
-exports.Notes = Notes_1.default;
 const Pools_1 = __importDefault(require("./modules/Pools"));
 const Posts_1 = __importDefault(require("./modules/Posts"));
 const PostSets_1 = __importDefault(require("./modules/PostSets"));
@@ -31,6 +30,8 @@ const Artist_1 = __importDefault(require("./structures/Artist"));
 exports.Artist = Artist_1.default;
 const ArtistHistory_1 = __importDefault(require("./structures/ArtistHistory"));
 exports.ArtistHistory = ArtistHistory_1.default;
+const Note_1 = __importDefault(require("./structures/Note"));
+exports.Note = Note_1.default;
 const NoteHistory_1 = __importDefault(require("./structures/NoteHistory"));
 exports.NoteHistory = NoteHistory_1.default;
 const AuthenticatedUser_1 = __importDefault(require("./structures/AuthenticatedUser"));
@@ -61,6 +62,9 @@ const package_json_1 = __importDefault(require("../package.json"));
 // note for future reference (browser compatibility?)
 // POST with "_method=*" can be used in place of PUT/PATCH/DELETE
 class E621 {
+    static YiffyAPI;
+    static Dev;
+    static Custom;
     POST_LIMIT_PER_REQUEST = 320;
     request = new RequestHandler_1.default(this);
     artists = new Artists_1.default(this);
@@ -77,30 +81,6 @@ class E621 {
     constructor(options) {
         if (!options)
             options = {};
-        if (!options.instanceHost)
-            options.instanceHost = "e621.net";
-        options.instanceSSL = options.instanceSSL ?? ["e621.net", "yiff.rest"].includes(options.instanceHost);
-        if (!options.instancePort)
-            options.instancePort = options.instanceSSL ? 443 : 80;
-        if (!options.imageReconstructionType) {
-            switch (options.instanceHost) {
-                case "e621.net":
-                    options.imageReconstructionType = "e621";
-                    break;
-                case "yiff.rest":
-                    options.imageReconstructionType = "yiffy";
-                    break;
-                case "e621.local":
-                case "localhost":
-                    options.imageReconstructionType = "dev";
-                    break;
-                default: {
-                    options.imageReconstructionType = null;
-                    if (!options.reconstructStaticURL)
-                        process.emitWarning("You specified a host that wasn't in our known list (e621.net, yiff.rest, e621.local) and didn't also specify imageReconstructionType or reconstructStaticURL. This WILL cause an error if we see any null file urls.");
-                }
-            }
-        }
         Object.defineProperties(this, {
             auth: {
                 get() {
@@ -111,13 +91,8 @@ class E621 {
             },
             options: {
                 value: {
-                    instanceHost: options.instanceHost,
-                    instancePort: options.instancePort,
-                    instanceSSL: options.instanceSSL,
                     authUser: options.authUser ?? null,
                     authKey: options.authKey ?? null,
-                    reconstructStaticURL: options.reconstructStaticURL || null,
-                    imageReconstructionType: options.imageReconstructionType || "hierarchy",
                     userAgent: options.userAgent ?? `E621/${package_json_1.default.version} (https://github.com/DonovanDMC/E621${!options.authUser ? "" : `; "${options.authUser}"`})`,
                     requestTimeout: options.requestTimeout ?? 30
                 },
@@ -126,9 +101,77 @@ class E621 {
                 writable: false
             }
         });
+        this.setInstance({});
+    }
+    setInstance(opt) {
+        if (!opt.host)
+            opt.host = "e621.net";
+        opt.ssl = opt.ssl ?? ["e621.net", "yiff.rest"].includes(opt.host);
+        if (!opt.port)
+            opt.port = opt.ssl ? 443 : 80;
+        if (!opt.imageReconstructionType) {
+            switch (opt.host) {
+                case "e621.net":
+                    opt.imageReconstructionType = "e621";
+                    break;
+                case "yiff.rest":
+                    opt.imageReconstructionType = "yiffy";
+                    break;
+                case "e621.local":
+                case "e621ng.local":
+                case "localhost":
+                    opt.imageReconstructionType = "dev";
+                    break;
+                default: {
+                    opt.imageReconstructionType = null;
+                    if (!opt.reconstructStaticURL)
+                        process.emitWarning("You specified a host that wasn't in our known list (e621.net, yiff.rest, e621.local) and didn't also specify imageReconstructionType or reconstructStaticURL. This WILL cause an error if we see any null file urls.");
+                }
+            }
+        }
+        Object.assign(this.options, {
+            instanceHost: opt.host,
+            instancePort: opt.port,
+            instanceSSL: opt.ssl,
+            reconstructStaticURL: opt.reconstructStaticURL || null,
+            imageReconstructionType: opt.imageReconstructionType || "hierarchy"
+        });
     }
 }
 exports.default = E621;
+class YiffyAPI extends E621 {
+    constructor(options) {
+        super(options);
+        this.setInstance({
+            host: "yiff.rest",
+            port: 443,
+            ssl: true
+        });
+    }
+}
+exports.YiffyAPI = YiffyAPI;
+class Dev extends E621 {
+    constructor(options, ssl = false) {
+        super(options);
+        this.setInstance({
+            host: "localhost",
+            port: 3000,
+            ssl
+        });
+    }
+}
+exports.Dev = Dev;
+class Custom extends E621 {
+    constructor(options, instanceOptions) {
+        super(options);
+        this.setInstance(instanceOptions);
+    }
+}
+exports.Custom = Custom;
+// due to extending the main class, neither of these (E621 class & sub-class) can happen "first", when both need to
+E621.YiffyAPI = YiffyAPI;
+E621.Dev = Dev;
+E621.Custom = Custom;
 var RequestHandler_2 = require("./util/RequestHandler");
 Object.defineProperty(exports, "APIError", { enumerable: true, get: function () { return RequestHandler_2.APIError; } });
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLDJFQUFtRDtBQUNuRCxVQUFVO0FBQ1YsZ0VBQXdDO0FBQ3hDLDREQUFvQztBQThGbkMsZ0JBOUZNLGVBQUssQ0E4Rk47QUE3Rk4sNERBQW9DO0FBQ3BDLDREQUFvQztBQUNwQyxrRUFBMEM7QUFDMUMsMERBQWtDO0FBQ2xDLDBFQUFrRDtBQUNsRCw0REFBb0M7QUFDcEMsb0VBQTRDO0FBQzVDLGFBQWE7QUFDYixpRUFBeUM7QUFtRnhDLGlCQW5GTSxnQkFBTSxDQW1GTjtBQWxGUCwrRUFBdUQ7QUFtRnRELHdCQW5GTSx1QkFBYSxDQW1GTjtBQWpGZCwyRUFBbUQ7QUFtRmxELHNCQW5GTSxxQkFBVyxDQW1GTjtBQWxGWix1RkFBK0Q7QUFtRjlELDRCQW5GTSwyQkFBaUIsQ0FtRk47QUFsRmxCLDZEQUFxQztBQW1GcEMsZUFuRk0sY0FBSSxDQW1GTjtBQWxGTCwyRUFBbUQ7QUFtRmxELHNCQW5GTSxxQkFBVyxDQW1GTjtBQWxGWiw2REFBcUM7QUFtRnBDLGVBbkZNLGNBQUksQ0FtRk47QUFsRkwsNkVBQXFEO0FBbUZwRCx1QkFuRk0sc0JBQVksQ0FtRk47QUFsRmIsMkVBQW1EO0FBbUZsRCxzQkFuRk0scUJBQVcsQ0FtRk47QUFsRlosbUVBQTJDO0FBbUYxQyxrQkFuRk0saUJBQU8sQ0FtRk47QUFsRlIsMkRBQW1DO0FBbUZsQyxjQW5GTSxhQUFHLENBbUZOO0FBbEZKLHlFQUFpRDtBQW1GaEQscUJBbkZNLG9CQUFVLENBbUZOO0FBbEZYLDZEQUFxQztBQW1GcEMsZUFuRk0sY0FBSSxDQW1GTjtBQWxGTCxxRUFBNkM7QUFtRjVDLG1CQW5GTSxrQkFBUSxDQW1GTjtBQWxGVCxtRkFBMkQ7QUFtRjFELDBCQW5GTSx5QkFBZSxDQW1GTjtBQWpGaEIsbUVBQWtDO0FBRWxDLHFEQUFxRDtBQUNyRCxpRUFBaUU7QUFDakUsTUFBcUIsSUFBSTtJQUN4QixzQkFBc0IsR0FBRyxHQUFHLENBQUM7SUFDN0IsT0FBTyxHQUFHLElBQUksd0JBQWMsQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUNuQyxPQUFPLEdBQUcsSUFBSSxpQkFBTyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQzVCLEtBQUssR0FBRyxJQUFJLGVBQUssQ0FBQyxJQUFJLENBQUMsQ0FBQztJQUN4QixLQUFLLEdBQUcsSUFBSSxlQUFLLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDeEIsS0FBSyxHQUFHLElBQUksZUFBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hCLFFBQVEsR0FBRyxJQUFJLGtCQUFRLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDOUIsSUFBSSxHQUFHLElBQUksY0FBSSxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3RCLFlBQVksR0FBRyxJQUFJLHNCQUFZLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDdEMsS0FBSyxHQUFHLElBQUksZUFBSyxDQUFDLElBQUksQ0FBQyxDQUFDO0lBQ3hCLFNBQVMsR0FBRyxJQUFJLG1CQUFTLENBQUMsSUFBSSxDQUFDLENBQUM7SUFDZixJQUFJLENBQWdCO0lBQzVCLE9BQU8sQ0FBa0I7SUFDbEMsWUFBWSxPQUFpQjtRQUM1QixJQUFJLENBQUMsT0FBTztZQUFFLE9BQU8sR0FBRyxFQUFFLENBQUM7UUFFM0IsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZO1lBQUUsT0FBTyxDQUFDLFlBQVksR0FBRyxVQUFVLENBQUM7UUFDN0QsT0FBTyxDQUFDLFdBQVcsR0FBRyxPQUFPLENBQUMsV0FBVyxJQUFJLENBQUMsVUFBVSxFQUFFLFdBQVcsQ0FBQyxDQUFDLFFBQVEsQ0FBQyxPQUFPLENBQUMsWUFBWSxDQUFDLENBQUM7UUFDdEcsSUFBSSxDQUFDLE9BQU8sQ0FBQyxZQUFZO1lBQUUsT0FBTyxDQUFDLFlBQVksR0FBRyxPQUFPLENBQUMsV0FBVyxDQUFDLENBQUMsQ0FBQyxHQUFHLENBQUMsQ0FBQyxDQUFDLEVBQUUsQ0FBQztRQUNqRixJQUFJLENBQUMsT0FBTyxDQUFDLHVCQUF1QixFQUFFO1lBQ3JDLFFBQVEsT0FBTyxDQUFDLFlBQVksRUFBRTtnQkFDN0IsS0FBSyxVQUFVO29CQUFFLE9BQU8sQ0FBQyx1QkFBdUIsR0FBRyxNQUFNLENBQUM7b0JBQUMsTUFBTTtnQkFDakUsS0FBSyxXQUFXO29CQUFFLE9BQU8sQ0FBQyx1QkFBdUIsR0FBRyxPQUFPLENBQUM7b0JBQUMsTUFBTTtnQkFDbkUsS0FBSyxZQUFZLENBQUM7Z0JBQUMsS0FBSyxXQUFXO29CQUFFLE9BQU8sQ0FBQyx1QkFBdUIsR0FBRyxLQUFLLENBQUM7b0JBQUMsTUFBTTtnQkFDcEYsT0FBTyxDQUFDLENBQUM7b0JBQ1IsT0FBTyxDQUFDLHVCQUF1QixHQUFHLElBQUksQ0FBQztvQkFDdkMsSUFBSSxDQUFDLE9BQU8sQ0FBQyxvQkFBb0I7d0JBQUUsT0FBTyxDQUFDLFdBQVcsQ0FBQyxzTkFBc04sQ0FBQyxDQUFDO2lCQUMvUTthQUNEO1NBQ0Q7UUFFRCxNQUFNLENBQUMsZ0JBQWdCLENBQUMsSUFBSSxFQUFFO1lBQzdCLElBQUksRUFBRTtnQkFDTCxHQUFHO29CQUNGLE9BQU8sQ0FBQyxJQUFJLENBQUMsT0FBTyxDQUFDLFFBQVEsSUFBSSxDQUFDLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLFNBQVMsTUFBTSxDQUFDLElBQUksQ0FBQyxHQUFHLElBQUksQ0FBQyxPQUFPLENBQUMsUUFBUSxJQUFJLElBQUksQ0FBQyxPQUFPLENBQUMsT0FBTyxFQUFFLENBQUMsQ0FBQyxRQUFRLENBQUMsUUFBUSxDQUFDLEVBQUUsQ0FBQztnQkFDL0osQ0FBQztnQkFDRCxZQUFZLEVBQUUsS0FBSztnQkFDbkIsVUFBVSxFQUFFLEtBQUs7YUFDakI7WUFDRCxPQUFPLEVBQUU7Z0JBQ1IsS0FBSyxFQUFFO29CQUNOLFlBQVksRUFBRSxPQUFPLENBQUMsWUFBWTtvQkFDbEMsWUFBWSxFQUFFLE9BQU8sQ0FBQyxZQUFZO29CQUNsQyxXQUFXLEVBQUUsT0FBTyxDQUFDLFdBQVc7b0JBQ2hDLFFBQVEsRUFBRSxPQUFPLENBQUMsUUFBUSxJQUFJLElBQUk7b0JBQ2xDLE9BQU8sRUFBRSxPQUFPLENBQUMsT0FBTyxJQUFJLElBQUk7b0JBQ2hDLG9CQUFvQixFQUFFLE9BQU8sQ0FBQyxvQkFBb0IsSUFBSSxJQUFJO29CQUMxRCx1QkFBdUIsRUFBRSxPQUFPLENBQUMsdUJBQXVCLElBQUksV0FBVztvQkFDdkUsU0FBUyxFQUFFLE9BQU8sQ0FBQyxTQUFTLElBQUksUUFBUSxzQkFBRyxDQUFDLE9BQU8sdUNBQXVDLENBQUMsT0FBTyxDQUFDLFFBQVEsQ0FBQyxDQUFDLENBQUMsRUFBRSxDQUFDLENBQUMsQ0FBQyxNQUFNLE9BQU8sQ0FBQyxRQUFRLEdBQUcsR0FBRztvQkFDL0ksY0FBYyxFQUFFLE9BQU8sQ0FBQyxjQUFjLElBQUksRUFBRTtpQkFDNUM7Z0JBQ0QsWUFBWSxFQUFFLEtBQUs7Z0JBQ25CLFVBQVUsRUFBRSxLQUFLO2dCQUNqQixRQUFRLEVBQUUsS0FBSzthQUNmO1NBQ0QsQ0FBQyxDQUFDO0lBQ0osQ0FBQztDQUNEO0FBMURELHVCQTBEQztBQUNELDBDQUF3QjtBQUN4Qix3REFBaUQ7QUFBeEMsMEdBQUEsUUFBUSxPQUFBIn0=
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6Ijs7Ozs7Ozs7Ozs7Ozs7OztBQUNBLDJFQUFtRDtBQUNuRCxVQUFVO0FBQ1YsZ0VBQXdDO0FBQ3hDLDREQUFvQztBQUNwQyw0REFBb0M7QUFDcEMsNERBQW9DO0FBQ3BDLGtFQUEwQztBQUMxQywwREFBa0M7QUFDbEMsMEVBQWtEO0FBQ2xELDREQUFvQztBQUNwQyxvRUFBNEM7QUFDNUMsYUFBYTtBQUNiLGlFQUF5QztBQStIeEMsaUJBL0hNLGdCQUFNLENBK0hOO0FBOUhQLCtFQUF1RDtBQStIdEQsd0JBL0hNLHVCQUFhLENBK0hOO0FBOUhkLDZEQUFxQztBQStIcEMsZUEvSE0sY0FBSSxDQStITjtBQTlITCwyRUFBbUQ7QUErSGxELHNCQS9ITSxxQkFBVyxDQStITjtBQTlIWix1RkFBK0Q7QUErSDlELDRCQS9ITSwyQkFBaUIsQ0ErSE47QUE5SGxCLDZEQUFxQztBQStIcEMsZUEvSE0sY0FBSSxDQStITjtBQTlITCwyRUFBbUQ7QUErSGxELHNCQS9ITSxxQkFBVyxDQStITjtBQTlIWiw2REFBcUM7QUErSHBDLGVBL0hNLGNBQUksQ0ErSE47QUE5SEwsNkVBQXFEO0FBK0hwRCx1QkEvSE0sc0JBQVksQ0ErSE47QUE5SGIsMkVBQW1EO0FBK0hsRCxzQkEvSE0scUJBQVcsQ0ErSE47QUE5SFosbUVBQTJDO0FBK0gxQyxrQkEvSE0saUJBQU8sQ0ErSE47QUE5SFIsMkRBQW1DO0FBK0hsQyxjQS9ITSxhQUFHLENBK0hOO0FBOUhKLHlFQUFpRDtBQStIaEQscUJBL0hNLG9CQUFVLENBK0hOO0FBOUhYLDZEQUFxQztBQStIcEMsZUEvSE0sY0FBSSxDQStITjtBQTlITCxxRUFBNkM7QUErSDVDLG1CQS9ITSxrQkFBUSxDQStITjtBQTlIVCxtRkFBMkQ7QUErSDFELDBCQS9ITSx5QkFBZSxDQStITjtBQTdIaEIsbUVBQWtDO0FB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

package/build/src/modules/Posts.js

@@ -176,21 +176,21 @@ class Posts {
         const qs = new FormHelper_1.default();
         let tagDiff = "", sourceDiff = "";
         if (typeof options.addTags === "string")
-            tagDiff += options.addTags;
+            tagDiff += `${options.addTags}\n`;
         if (Array.isArray(options.addTags) && options.addTags.length > 0)
-            tagDiff += options.addTags.join(" ");
+            tagDiff += `${options.addTags.join(" ")}\n`;
         if (typeof options.removeTags === "string")
-            tagDiff += options.removeTags.split(" ").map(t => `-${t}`).join(" ");
+            tagDiff += `${options.removeTags.split(" ").map(t => `-${t}`).join(" ")}\n`;
         if (Array.isArray(options.removeTags) && options.removeTags.length > 0)
-            tagDiff += ` ${options.removeTags.map(t => `-${t}`).join(" ")}`;
+            tagDiff += `${options.removeTags.map(t => `-${t}`).join(" ")}\n`;
         if (typeof options.addSources === "string")
-            sourceDiff += options.addSources;
+            sourceDiff += `${options.addSources}\n`;
         if (Array.isArray(options.addSources) && options.addSources.length > 0)
-            sourceDiff += options.addSources.join("\n");
+            sourceDiff += `${options.addSources.join("\n")}\n`;
         if (typeof options.removeSources === "string")
-            sourceDiff += options.removeSources.split("\n").map(s => `-${s}`).join("\n");
+            sourceDiff += `${options.removeSources.split("\n").map(s => `-${s}`).join("\n")}\n`;
         if (Array.isArray(options.removeSources) && options.removeSources.length > 0)
-            sourceDiff += ` ${options.removeSources.map(s => `-${s}`).join("\n")}`;
+            sourceDiff += `${options.removeSources.map(s => `-${s}`).join("\n")}\n`;
         if (tagDiff)
             qs.add("post[tag_string_diff]", tagDiff.trim());
         if (sourceDiff)
@@ -374,4 +374,4 @@ class Posts {
     }
 }
 exports.default = Posts;
-//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Posts.js","sourceRoot":"","sources":["../../../src/modules/Posts.ts"],"names":[],"mappings":"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"}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"Posts.js","sourceRoot":"","sources":["../../../src/modules/Posts.ts"],"names":[],"mappings":"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"}

package/build/src/types/index.d.ts

@@ -1,32 +1,28 @@
-export interface Options {
+export interface InstanceOptions {
 	/**
 	 * If the instance you are targeting supports ssl
-	 *
-	 * Default: true if `instanceHost` is "e621.net", false otherwise
 	 */
-	instanceSSL?: boolean;
+	ssl?: boolean;
 	/**
 	 * The port of the instance you are targeting
 	 *
 	 * Default: 443 if `instanceSSL` is true, 80 otherwise
 	 */
-	instancePort?: number;
+	port?: number;
 	/**
 	 * The host of the instance you are targeting
-	 *
-	 * Default: e621.net
 	 */
-	instanceHost?: string;
+	host?: string;
 	/**
 	 * Override our default url reconstruction when we see a null file url
 	 *
-	 * Default (e621.net): https://static1.e621.net/data/(preview/|sample/)MD5[0,2]/MD5[2,4]/MD5.EXT
+	 * Default (E621): https://static1.e621.net/data/(preview/|sample/)MD5[0,2]/MD5[2,4]/MD5.EXT
 	 *
-	 * Default (yiff.rest): https://v3.yiff.media/(preview/|sample/)MD5[0,2]/MD5[2,4]/MD5.EXT
+	 * Default (YiffyAPI): https://v3.yiff.media/(preview/|sample/)MD5[0,2]/MD5[2,4]/MD5.EXT
 	 *
-	 * Default (e621.local): http://e621.local/data/(preview/|sample/)MD5.EXT
+	 * Default (Dev): http://e621ng.local/data/(preview/|sample/)MD5.EXT
 	 *
-	 * If you use a host that is not supported, and do not implement this, or set a construction type, an error will be thrown.
+	 * If you use a host that is not supported, and do not implement this, an error will be thrown.
 	 *
 	 * @param {string} md5 - the md5 of the image
 	 * @param {("original" | "preview" | "sample")} type - the type of url being constructed
@@ -36,9 +32,11 @@ export interface Options {
 	/**
 	 * The method to use for image reconstructon (if you are not using E621, YiffyAPI, or e621ng, you MUST override the reconstructStaticURL function, as the static urls are hardcoded for these)
 	 *
-	 * Default: based on `instanceHost` - e621.net = e621 | yiff.rest = yiffy | e621.local = dev | other = null
+	 * Default: based on `instanceHost` - e621.net = e621 | yiff.rest = yiffy | e621ng.local = dev | other = null
 	 */
 	imageReconstructionType?: "e621" | "yiffy" | "dev" | null;
+}
+export interface Options {
 	/**
 	 * The uername of the user you want to authenticate with
 	 *
@@ -67,7 +65,7 @@ export interface Options {
 	requestTimeout?: number;
 }
 
-export interface InstanceOptions {
+export interface ConstructedOptions {
 	instanceSSL: boolean;
 	instancePort: number;
 	instanceHost: string;

package/build/src/util/Debug.js

@@ -1,11 +1,16 @@
 "use strict";
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
-const debug_1 = __importDefault(require("debug"));
 function Debug(name, first, ...extra) {
-    return (0, debug_1.default)(!name ? "e621:general" : `e621:${name}`)(first, ...extra);
+    // eslint-disable-next-line @typescript-eslint/consistent-type-imports
+    let debug;
+    try {
+        // eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
+        debug = require("debug");
+    }
+    catch {
+        return;
+    }
+    return debug(!name ? "e621:general" : `e621:${name}`)(first, ...extra);
 }
 exports.default = Debug;
-//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVidWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbC9EZWJ1Zy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOzs7OztBQUFBLGtEQUEwQjtBQUUxQixTQUF3QixLQUFLLENBQUMsSUFBWSxFQUFFLEtBQWMsRUFBRSxHQUFHLEtBQXFCO0lBQ25GLE9BQU8sSUFBQSxlQUFLLEVBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsUUFBUSxJQUFJLEVBQUUsQ0FBQyxDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUssQ0FBQyxDQUFDO0FBQ3hFLENBQUM7QUFGRCx3QkFFQyJ9
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiRGVidWcuanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi8uLi8uLi9zcmMvdXRpbC9EZWJ1Zy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiOztBQUFBLFNBQXdCLEtBQUssQ0FBQyxJQUFZLEVBQUUsS0FBYyxFQUFFLEdBQUcsS0FBcUI7SUFDbkYsc0VBQXNFO0lBQ3RFLElBQUksS0FBNEIsQ0FBQztJQUNqQyxJQUFJO1FBQ0gsbUVBQW1FO1FBQ25FLEtBQUssR0FBRyxPQUFPLENBQUMsT0FBTyxDQUFDLENBQUM7S0FDekI7SUFBQyxNQUFNO1FBQ1AsT0FBTztLQUNQO0lBQ0QsT0FBTyxLQUFLLENBQUMsQ0FBQyxJQUFJLENBQUMsQ0FBQyxDQUFDLGNBQWMsQ0FBQyxDQUFDLENBQUMsUUFBUSxJQUFJLEVBQUUsQ0FBQyxDQUFDLEtBQUssRUFBRSxHQUFHLEtBQUssQ0FBQyxDQUFDO0FBQ3hFLENBQUM7QUFWRCx3QkFVQyJ9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "e621",
-  "version": "2.1.7",
+  "version": "2.1.11",
   "description": "A module for interfacing with e621.",
   "main": "build/src/index.js",
   "scripts": {
@@ -34,11 +34,11 @@
     "@uwu-codes/eslint-config": "^1.0.31",
     "@uwu-codes/tsconfig": "^1.0.1",
     "chai": "^4.3.4",
-    "mocha": "^9.1.3",
+    "mocha": "^9.1.4",
     "ts-node": "^10.4.0",
     "typescript": "^4.5.4"
   },
-  "dependencies": {
+  "optionalDependencies": {
     "debug": "^4.3.3"
   }
 }