@anitrack/patreon-wrapper 1.4.5 → 1.5.0

package/README.md

@@ -4,7 +4,7 @@
 
 🌄 You can also simulates sandbox of fake Patrons for development and code testing purposes
 
-🍊 This package was also used in [AniTrack](https://anitrack.co) Discord Bot
+🍊 This package was previously used in [AniTrack](https://anitrack.co) before switching to a real payment gateway
 
 ## Table of Contents
 

package/lib/index.d.ts

@@ -1,8 +1,9 @@
-declare type Auth = {
+export type PatronStatus = 'active_patron' | 'declined_patron' | 'former_patron';
+export type PatronAPIAuth = {
     AccessToken: string;
     CampaignID: string;
 };
-declare type PatronType = {
+export type PatronType = {
     displayId: string;
     displayName: string;
     emailAddress: string;
@@ -10,7 +11,7 @@ declare type PatronType = {
     subscription: {
         note: string;
         currentEntitled: {
-            status: 'active_patron' | 'declined_patron';
+            status: PatronStatus;
             tier: {
                 id: string;
                 title: string;
@@ -29,12 +30,12 @@ declare type PatronType = {
             url: string;
         };
         discord: {
-            id: string;
-            url: string;
+            id: string | null;
+            url: string | null;
         };
     };
 };
-declare type SandboxOptions = {
+export type SandboxOptions = {
     displayId: string;
     displayName: string;
     emailAddress: string;
@@ -45,7 +46,7 @@ declare type SandboxOptions = {
     cents: number;
     willPayCents: number;
     lifetimeCents: number;
-    patronStatus: 'active_patron' | 'declined_patron';
+    patronStatus: PatronStatus;
     firstCharge: string;
     nextCharge: string;
     lastCharge: string;
@@ -55,8 +56,8 @@ declare type SandboxOptions = {
             url: string;
         };
         discord: {
-            id: string;
-            url: string;
+            id: string | null;
+            url: string | null;
         };
     };
 };
@@ -65,16 +66,15 @@ export declare class Patreon {
     private static _AccessToken;
     private static _CampaignID;
     private static _SandboxPatrons;
-    static Authorization(AuthInformation: Auth): void;
+    static Authorization(AuthCredentials: PatronAPIAuth): void;
     private static FetchAPI;
-    private static CleanQueryURL;
-    static FetchPatrons(filters?: Array<'active_patron' | 'declined_patron'>, pageSize?: number): Promise<PatronType[]>;
-    protected static _SandboxAdd(Patron: SandboxOptions): void;
-    protected static _SandboxGet(): SandboxOptions[];
+    private static CleanURL;
+    static FetchPatrons(filters?: Array<PatronStatus>, pageSize?: number): Promise<PatronType[]>;
+    protected static _SandboxAddPatron(Patron: SandboxOptions): void;
+    protected static _SandboxGetPatron(): SandboxOptions[];
 }
 export declare class Sandbox extends Patreon {
-    static GetFakePatrons(): SandboxOptions[];
-    static AppendPatron(Patron: SandboxOptions): void;
+    static GetSandboxPatrons(): SandboxOptions[];
+    static AddSandboxPatron(Patron: SandboxOptions): void;
 }
-export {};
 //# sourceMappingURL=index.d.ts.map

package/lib/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,aAAK,IAAI,GAAG;IACR,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;CACrB,CAAA;AAED,aAAK,UAAU,GAAG;IACd,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,UAAU,EAAE,OAAO,CAAA;IACnB,YAAY,EAAE;QACV,IAAI,EAAE,MAAM,CAAA;QACZ,eAAe,EAAE;YACb,MAAM,EAAE,eAAe,GAAG,iBAAiB,CAAA;YAC3C,IAAI,EAAE;gBACF,EAAE,EAAE,MAAM,CAAA;gBACV,KAAK,EAAE,MAAM,CAAA;aAChB,CAAA;YACD,KAAK,EAAE,MAAM,CAAA;YACb,YAAY,EAAE,MAAM,CAAA;YACpB,aAAa,EAAE,MAAM,CAAA;YACrB,WAAW,EAAE,MAAM,CAAA;YACnB,UAAU,EAAE,MAAM,CAAA;YAClB,UAAU,EAAE,MAAM,CAAA;SACrB,CAAA;KACJ,CAAA;IACD,eAAe,EAAE;QACb,OAAO,EAAE;YACL,EAAE,EAAE,MAAM,CAAA;YACV,GAAG,EAAE,MAAM,CAAA;SACd,CAAA;QACD,OAAO,EAAE;YACL,EAAE,EAAE,MAAM,CAAA;YACV,GAAG,EAAE,MAAM,CAAA;SACd,CAAA;KACJ,CAAA;CACJ,CAAA;AAED,aAAK,cAAc,GAAG;IAClB,SAAS,EAAE,MAAM,CAAA;IACjB,WAAW,EAAE,MAAM,CAAA;IACnB,YAAY,EAAE,MAAM,CAAA;IACpB,IAAI,EAAE;QACF,EAAE,EAAE,MAAM,CAAA;QACV,KAAK,EAAE,MAAM,CAAA;KAChB,CAAA;IACD,KAAK,EAAE,MAAM,CAAA;IACb,YAAY,EAAE,MAAM,CAAA;IACpB,aAAa,EAAE,MAAM,CAAA;IACrB,YAAY,EAAE,eAAe,GAAG,iBAAiB,CAAA;IACjD,WAAW,EAAE,MAAM,CAAA;IACnB,UAAU,EAAE,MAAM,CAAA;IAClB,UAAU,EAAE,MAAM,CAAA;IAClB,eAAe,EAAE;QACb,OAAO,EAAE;YACL,EAAE,EAAE,MAAM,CAAA;YACV,GAAG,EAAE,MAAM,CAAA;SACd,CAAA;QACD,OAAO,EAAE;YAAE,EAAE,EAAE,MAAM,CAAC;YAAC,GAAG,EAAE,MAAM,CAAA;SAAE,CAAA;KACvC,CAAA;CACJ,CAAA;AAED,qBAAa,OAAO;IAChB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAmD;IAEtE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAQ;IACnC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAQ;IAElC,OAAO,CAAC,MAAM,CAAC,eAAe,CAA4B;WAE5C,aAAa,CAAC,eAAe,EAAE,IAAI;mBAgB5B,QAAQ;IAe7B,OAAO,CAAC,MAAM,CAAC,aAAa;WAOR,YAAY,CAC5B,OAAO,GAAE,KAAK,CAAC,eAAe,GAAG,iBAAiB,CAAqB,EACvE,QAAQ,GAAE,MAAY;IAuH1B,SAAS,CAAC,MAAM,CAAC,WAAW,CAAC,MAAM,EAAE,cAAc;IAInD,SAAS,CAAC,MAAM,CAAC,WAAW;CAO/B;AAED,qBAAa,OAAQ,SAAQ,OAAO;WAClB,cAAc;WAId,YAAY,CAAC,MAAM,EAAE,cAAc;CAGpD"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"AAEA,MAAM,MAAM,YAAY,GAClB,eAAe,GACf,iBAAiB,GACjB,eAAe,CAAC;AAEtB,MAAM,MAAM,aAAa,GAAG;IACxB,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;CACtB,CAAC;AAEF,MAAM,MAAM,UAAU,GAAG;IACrB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,UAAU,EAAE,OAAO,CAAC;IACpB,YAAY,EAAE;QACV,IAAI,EAAE,MAAM,CAAC;QACb,eAAe,EAAE;YACb,MAAM,EAAE,YAAY,CAAC;YACrB,IAAI,EAAE;gBACF,EAAE,EAAE,MAAM,CAAC;gBACX,KAAK,EAAE,MAAM,CAAC;aACjB,CAAC;YACF,KAAK,EAAE,MAAM,CAAC;YACd,YAAY,EAAE,MAAM,CAAC;YACrB,aAAa,EAAE,MAAM,CAAC;YACtB,WAAW,EAAE,MAAM,CAAC;YACpB,UAAU,EAAE,MAAM,CAAC;YACnB,UAAU,EAAE,MAAM,CAAC;SACtB,CAAC;KACL,CAAC;IACF,eAAe,EAAE;QACb,OAAO,EAAE;YACL,EAAE,EAAE,MAAM,CAAC;YACX,GAAG,EAAE,MAAM,CAAC;SACf,CAAC;QACF,OAAO,EAAE;YACL,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;YAClB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;SACtB,CAAC;KACL,CAAC;CACL,CAAC;AAEF,MAAM,MAAM,cAAc,GAAG;IACzB,SAAS,EAAE,MAAM,CAAC;IAClB,WAAW,EAAE,MAAM,CAAC;IACpB,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE;QACF,EAAE,EAAE,MAAM,CAAC;QACX,KAAK,EAAE,MAAM,CAAC;KACjB,CAAC;IACF,KAAK,EAAE,MAAM,CAAC;IACd,YAAY,EAAE,MAAM,CAAC;IACrB,aAAa,EAAE,MAAM,CAAC;IACtB,YAAY,EAAE,YAAY,CAAC;IAC3B,WAAW,EAAE,MAAM,CAAC;IACpB,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;IACnB,eAAe,EAAE;QACb,OAAO,EAAE;YACL,EAAE,EAAE,MAAM,CAAC;YACX,GAAG,EAAE,MAAM,CAAC;SACf,CAAC;QACF,OAAO,EAAE;YACL,EAAE,EAAE,MAAM,GAAG,IAAI,CAAC;YAClB,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;SACtB,CAAC;KACL,CAAC;CACL,CAAC;AAEF,qBAAa,OAAO;IAChB,OAAO,CAAC,MAAM,CAAC,IAAI,CAAoD;IAEvE,OAAO,CAAC,MAAM,CAAC,YAAY,CAAS;IACpC,OAAO,CAAC,MAAM,CAAC,WAAW,CAAS;IACnC,OAAO,CAAC,MAAM,CAAC,eAAe,CAA6B;WAE7C,aAAa,CAAC,eAAe,EAAE,aAAa;mBAWrC,QAAQ;IAe7B,OAAO,CAAC,MAAM,CAAC,QAAQ;WAOH,YAAY,CAC5B,OAAO,GAAE,KAAK,CAAC,YAAY,CAAqB,EAChD,QAAQ,GAAE,MAAY;IA8H1B,SAAS,CAAC,MAAM,CAAC,iBAAiB,CAAC,MAAM,EAAE,cAAc;IAIzD,SAAS,CAAC,MAAM,CAAC,iBAAiB;CAOrC;AAED,qBAAa,OAAQ,SAAQ,OAAO;WAClB,iBAAiB;WAIjB,gBAAgB,CAAC,MAAM,EAAE,cAAc;CAGxD"}

package/lib/index.js

@@ -6,16 +6,12 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.Sandbox = exports.Patreon = void 0;
 const axios_1 = __importDefault(require("axios"));
 class Patreon {
-    static Authorization(AuthInformation) {
-        if (!AuthInformation.AccessToken || !AuthInformation.CampaignID) {
+    static Authorization(AuthCredentials) {
+        if (!AuthCredentials.AccessToken || !AuthCredentials.CampaignID) {
             throw new Error('AccessToken and CampaignID are required on Authorization');
         }
-        else if (typeof AuthInformation.AccessToken != 'string' ||
-            typeof AuthInformation.CampaignID != 'string') {
-            throw new Error('Invalid input, not a type of String');
-        }
-        this._AccessToken = AuthInformation.AccessToken;
-        this._CampaignID = AuthInformation.CampaignID;
+        this._AccessToken = AuthCredentials.AccessToken;
+        this._CampaignID = AuthCredentials.CampaignID;
     }
     static async FetchAPI(URI) {
         if (!this._AccessToken || !this._CampaignID) {
@@ -28,90 +24,96 @@ class Patreon {
             throw new Error('Fetch API Failed...' + err);
         });
     }
-    static CleanQueryURL(query) {
+    static CleanURL(query) {
         query = query.replaceAll('[', '%5B').replaceAll(']', '%5D');
         query = query.replaceAll(' ', '');
         return query;
     }
     static async FetchPatrons(filters = ['active_patron'], pageSize = 450) {
-        const res = await this.FetchAPI(this.CleanQueryURL(`campaigns/${this._CampaignID}/` +
+        const { data } = await this.FetchAPI(this.CleanURL(`campaigns/${this._CampaignID}/` +
             `members ? include = user, currently_entitled_tiers & page[count] = ${pageSize} & fields[member] = campaign_lifetime_support_cents, currently_entitled_amount_cents, email, full_name, is_follower, last_charge_date, last_charge_status, lifetime_support_cents, next_charge_date, note, patron_status, pledge_cadence, pledge_relationship_start, will_pay_amount_cents & fields[user] = social_connections & fields[tier] = title`));
-        var Patrons = [];
-        if (!res?.data?.data)
-            return [];
-        if (res.data.data.length == 0)
+        const Patrons = [];
+        const PatreonAPIPatrons = data?.data || [];
+        if (PatreonAPIPatrons.length == 0)
             return [];
-        // Processing Fake Sandbox Patrons
-        this._SandboxPatrons.forEach((Patron) => Patrons.push({
-            displayId: Patron.displayId,
-            displayName: Patron.displayName,
-            emailAddress: Patron.emailAddress,
-            isFollower: false,
-            subscription: {
-                note: 'Sandbox',
-                currentEntitled: {
-                    status: Patron.patronStatus,
-                    tier: {
-                        id: Patron.tier.id,
-                        title: Patron.tier.title,
+        // Format Sandbox Patrons
+        for (let x = 0; x < this._SandboxPatrons.length; x++) {
+            const Patron = this._SandboxPatrons[x];
+            Patrons.push({
+                displayId: Patron.displayId,
+                displayName: Patron.displayName,
+                emailAddress: Patron.emailAddress,
+                isFollower: false,
+                subscription: {
+                    note: 'Sandbox',
+                    currentEntitled: {
+                        status: Patron.patronStatus,
+                        tier: {
+                            id: Patron.tier.id,
+                            title: Patron.tier.title,
+                        },
+                        cents: Patron.cents,
+                        willPayCents: Patron.willPayCents,
+                        lifetimeCents: Patron.lifetimeCents,
+                        firstCharge: Patron.firstCharge,
+                        nextCharge: Patron.nextCharge,
+                        lastCharge: Patron.lastCharge,
                     },
-                    cents: Patron.cents,
-                    willPayCents: Patron.willPayCents,
-                    lifetimeCents: Patron.lifetimeCents,
-                    firstCharge: Patron.firstCharge,
-                    nextCharge: Patron.nextCharge,
-                    lastCharge: Patron.lastCharge,
-                },
-            },
-            mediaConnection: {
-                patreon: {
-                    id: Patron.mediaConnection.patreon.id,
-                    url: Patron.mediaConnection.patreon.url,
                 },
-                discord: {
-                    id: Patron.mediaConnection.discord.id,
-                    url: Patron.mediaConnection.discord.url,
+                mediaConnection: {
+                    patreon: {
+                        id: Patron.mediaConnection.patreon.id,
+                        url: Patron.mediaConnection.patreon.url,
+                    },
+                    discord: {
+                        id: Patron?.mediaConnection?.discord?.id
+                            ? Patron?.mediaConnection?.discord?.id
+                            : null,
+                        url: Patron?.mediaConnection?.discord?.url
+                            ? Patron?.mediaConnection?.discord?.id
+                            : null,
+                    },
                 },
-            },
-        }));
-        // Processing Real Patrons
-        res.data.data.forEach((Patron) => {
-            if (!filters.includes(Patron.attributes.patron_status))
-                return;
-            var socialInfo = res.data.included.find((includePatron) => includePatron.id == Patron.relationships.user.data.id &&
-                includePatron.type === 'user');
-            var tierInfo = res.data.included.find((includePatron) => includePatron.id ==
-                Patron.relationships.currently_entitled_tiers?.data[0]
-                    ?.id && includePatron.type === 'tier');
+            });
+        }
+        // Format Real Patrons
+        for (let x = 0; x < PatreonAPIPatrons.length; x++) {
+            const Relationships = PatreonAPIPatrons[x].relationships;
+            const Attributes = PatreonAPIPatrons[x].attributes;
+            if (!filters.includes(Attributes.patron_status))
+                continue;
+            const socialInfo = data.included.find((patron) => patron.id == Relationships.user.data.id &&
+                patron.type === 'user');
+            const tierInfo = data.included.find((patron) => patron.id ==
+                Relationships.currently_entitled_tiers?.data[0]?.id &&
+                patron.type === 'tier');
             Patrons.push({
-                displayId: Patron.relationships.user.data.id,
-                displayName: Patron.attributes.full_name,
-                emailAddress: Patron.attributes.email,
-                isFollower: Patron.attributes.is_follower,
+                displayId: Relationships.user.data.id,
+                displayName: Attributes.full_name,
+                emailAddress: Attributes.email,
+                isFollower: Attributes.is_follower,
                 subscription: {
-                    note: Patron.attributes.note,
+                    note: Attributes.note,
                     currentEntitled: {
-                        status: Patron.attributes.patron_status,
+                        status: Attributes.patron_status,
                         tier: {
                             id: tierInfo ? tierInfo.id : null,
-                            title: tierInfo ? tierInfo.attributes.title : null,
+                            title: tierInfo ? tierInfo.Attributes.title : null,
                         },
-                        cents: Patron.attributes.currently_entitled_amount_cents !=
-                            0
-                            ? Patron.attributes
-                                .currently_entitled_amount_cents
+                        cents: Attributes.currently_entitled_amount_cents != 0
+                            ? Attributes.currently_entitled_amount_cents
                             : null,
-                        willPayCents: Patron.attributes.will_pay_amount_cents,
-                        lifetimeCents: Patron.attributes.lifetime_support_cents,
-                        firstCharge: Patron.attributes.pledge_relationship_start,
-                        nextCharge: Patron.attributes.next_charge_date,
-                        lastCharge: Patron.attributes.last_charge_date,
+                        willPayCents: Attributes.will_pay_amount_cents,
+                        lifetimeCents: Attributes.lifetime_support_cents,
+                        firstCharge: Attributes.pledge_relationship_start,
+                        nextCharge: Attributes.next_charge_date,
+                        lastCharge: Attributes.last_charge_date,
                     },
                 },
                 mediaConnection: {
                     patreon: {
-                        id: Patron.relationships.user.data.id,
-                        url: Patron.relationships.user.links.related,
+                        id: Relationships.user.data.id,
+                        url: Relationships.user.links.related,
                     },
                     discord: {
                         id: socialInfo?.attributes?.social_connections?.discord
@@ -128,13 +130,13 @@ class Patreon {
                     },
                 },
             });
-        });
+        }
         return Patrons;
     }
-    static _SandboxAdd(Patron) {
+    static _SandboxAddPatron(Patron) {
         this._SandboxPatrons.push(Patron);
     }
-    static _SandboxGet() {
+    static _SandboxGetPatron() {
         return this._SandboxPatrons;
     }
 }
@@ -142,11 +144,11 @@ exports.Patreon = Patreon;
 Patreon._URL = 'https://www.patreon.com/api/oauth2/v2/';
 Patreon._SandboxPatrons = [];
 class Sandbox extends Patreon {
-    static GetFakePatrons() {
-        return super._SandboxGet();
+    static GetSandboxPatrons() {
+        return super._SandboxGetPatron();
     }
-    static AppendPatron(Patron) {
-        super._SandboxAdd(Patron);
+    static AddSandboxPatron(Patron) {
+        super._SandboxAddPatron(Patron);
     }
 }
 exports.Sandbox = Sandbox;

package/lib/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../src/index.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,36 +1,36 @@
-{
-    "name": "@anitrack/patreon-wrapper",
-    "version": "1.4.5",
-    "description": "Universal Patron API v2 wrapper that simplifies the API's response for easier usage and lower response complexity",
-    "main": "lib/index.js",
-    "types": "lib",
-    "scripts": {
-        "build": "tsc -p .",
-        "dev": "tsc-watch --onSuccess \"node lib/devTEST.js\""
-    },
-    "repository": {
-        "type": "git",
-        "url": "git://github.com/AniTrack/patreon-wrapper.git"
-    },
-    "author": "AniTrack",
-    "keywords": [
-        "patreon",
-        "discord",
-        "api"
-    ],
-    "license": "MIT",
-    "bugs": {
-        "url": "https://github.com/AniTrack/patreon-wrapper/issues"
-    },
-    "homepage": "https://github.com/AniTrack/patreon-wrapper#readme",
-    "dependencies": {
-        "axios": "^0.27.2"
-    },
-    "publishConfig": {
-        "access": "public"
-    },
-    "devDependencies": {
-        "ts-node": "^10.7.0",
-        "typescript": "^4.6.4"
-    }
-}
+{
+    "name": "@anitrack/patreon-wrapper",
+    "version": "1.5.0",
+    "description": "Universal Patron API v2 wrapper that simplifies the API's response for easier usage and lower response complexity",
+    "main": "lib/index.js",
+    "types": "lib",
+    "scripts": {
+        "build": "tsc -p .",
+        "dev": "tsc-watch --onSuccess \"node lib/devTEST.js\""
+    },
+    "repository": {
+        "type": "git",
+        "url": "git://github.com/AniTrack/patreon-wrapper.git"
+    },
+    "author": "AniTrack",
+    "keywords": [
+        "patreon",
+        "discord",
+        "api"
+    ],
+    "license": "MIT",
+    "bugs": {
+        "url": "https://github.com/AniTrack/patreon-wrapper/issues"
+    },
+    "homepage": "https://github.com/AniTrack/patreon-wrapper#readme",
+    "dependencies": {
+        "axios": "^0.27.2"
+    },
+    "publishConfig": {
+        "access": "public"
+    },
+    "devDependencies": {
+        "ts-node": "^10.7.0",
+        "typescript": "^4.6.4"
+    }
+}

package/src/index.ts

@@ -1,131 +1,135 @@
-import axios from 'axios'
+import axios from 'axios';
 
-type Auth = {
-    AccessToken: string
-    CampaignID: string
-}
+export type PatronStatus =
+    | 'active_patron'
+    | 'declined_patron'
+    | 'former_patron';
+
+export type PatronAPIAuth = {
+    AccessToken: string;
+    CampaignID: string;
+};
 
-type PatronType = {
-    displayId: string
-    displayName: string
-    emailAddress: string
-    isFollower: boolean
+export type PatronType = {
+    displayId: string;
+    displayName: string;
+    emailAddress: string;
+    isFollower: boolean;
     subscription: {
-        note: string
+        note: string;
         currentEntitled: {
-            status: 'active_patron' | 'declined_patron'
+            status: PatronStatus;
             tier: {
-                id: string
-                title: string
-            }
-            cents: number
-            willPayCents: number
-            lifetimeCents: number
-            firstCharge: string
-            nextCharge: string
-            lastCharge: string
-        }
-    }
+                id: string;
+                title: string;
+            };
+            cents: number;
+            willPayCents: number;
+            lifetimeCents: number;
+            firstCharge: string;
+            nextCharge: string;
+            lastCharge: string;
+        };
+    };
     mediaConnection: {
         patreon: {
-            id: string
-            url: string
-        }
+            id: string;
+            url: string;
+        };
         discord: {
-            id: string
-            url: string
-        }
-    }
-}
+            id: string | null;
+            url: string | null;
+        };
+    };
+};
 
-type SandboxOptions = {
-    displayId: string
-    displayName: string
-    emailAddress: string
+export type SandboxOptions = {
+    displayId: string;
+    displayName: string;
+    emailAddress: string;
     tier: {
-        id: string
-        title: string
-    }
-    cents: number
-    willPayCents: number
-    lifetimeCents: number
-    patronStatus: 'active_patron' | 'declined_patron'
-    firstCharge: string
-    nextCharge: string
-    lastCharge: string
+        id: string;
+        title: string;
+    };
+    cents: number;
+    willPayCents: number;
+    lifetimeCents: number;
+    patronStatus: PatronStatus;
+    firstCharge: string;
+    nextCharge: string;
+    lastCharge: string;
     mediaConnection: {
         patreon: {
-            id: string
-            url: string
-        }
-        discord: { id: string; url: string }
-    }
-}
+            id: string;
+            url: string;
+        };
+        discord: {
+            id: string | null;
+            url: string | null;
+        };
+    };
+};
 
 export class Patreon {
-    private static _URL: string = 'https://www.patreon.com/api/oauth2/v2/'
+    private static _URL: string = 'https://www.patreon.com/api/oauth2/v2/';
 
-    private static _AccessToken: string
-    private static _CampaignID: string
+    private static _AccessToken: string;
+    private static _CampaignID: string;
+    private static _SandboxPatrons: Array<SandboxOptions> = [];
 
-    private static _SandboxPatrons: Array<SandboxOptions> = []
-
-    public static Authorization(AuthInformation: Auth) {
-        if (!AuthInformation.AccessToken || !AuthInformation.CampaignID) {
+    public static Authorization(AuthCredentials: PatronAPIAuth) {
+        if (!AuthCredentials.AccessToken || !AuthCredentials.CampaignID) {
             throw new Error(
                 'AccessToken and CampaignID are required on Authorization'
-            )
-        } else if (
-            typeof AuthInformation.AccessToken != 'string' ||
-            typeof AuthInformation.CampaignID != 'string'
-        ) {
-            throw new Error('Invalid input, not a type of String')
+            );
         }
 
-        this._AccessToken = AuthInformation.AccessToken
-        this._CampaignID = AuthInformation.CampaignID
+        this._AccessToken = AuthCredentials.AccessToken;
+        this._CampaignID = AuthCredentials.CampaignID;
     }
 
     private static async FetchAPI(URI: string) {
         if (!this._AccessToken || !this._CampaignID) {
             throw new Error(
                 'AccessToken and CampaignID are required on Authorization'
-            )
+            );
         }
 
         return await axios(this._URL + URI, {
             method: 'GET',
             headers: { Authorization: 'Bearer ' + this._AccessToken },
         }).catch((err: Error) => {
-            throw new Error('Fetch API Failed...' + err)
-        })
+            throw new Error('Fetch API Failed...' + err);
+        });
     }
 
-    private static CleanQueryURL(query: string) {
-        query = query.replaceAll('[', '%5B').replaceAll(']', '%5D')
-        query = query.replaceAll(' ', '')
+    private static CleanURL(query: string) {
+        query = query.replaceAll('[', '%5B').replaceAll(']', '%5D');
+        query = query.replaceAll(' ', '');
 
-        return query
+        return query;
     }
 
     public static async FetchPatrons(
-        filters: Array<'active_patron' | 'declined_patron'> = ['active_patron'],
+        filters: Array<PatronStatus> = ['active_patron'],
         pageSize: number = 450
     ) {
-        const res: any = await this.FetchAPI(
-            this.CleanQueryURL(
+        const { data } = await this.FetchAPI(
+            this.CleanURL(
                 `campaigns/${this._CampaignID}/` +
                     `members ? include = user, currently_entitled_tiers & page[count] = ${pageSize} & fields[member] = campaign_lifetime_support_cents, currently_entitled_amount_cents, email, full_name, is_follower, last_charge_date, last_charge_status, lifetime_support_cents, next_charge_date, note, patron_status, pledge_cadence, pledge_relationship_start, will_pay_amount_cents & fields[user] = social_connections & fields[tier] = title`
             )
-        )
+        );
 
-        var Patrons: Array<PatronType> = []
+        const Patrons: Array<PatronType> = [];
+        const PatreonAPIPatrons = data?.data || [];
 
-        if (!res?.data?.data) return []
-        if (res.data.data.length == 0) return []
+        if (PatreonAPIPatrons.length == 0) return [];
+
+        // Format Sandbox Patrons
+        for (let x = 0; x < this._SandboxPatrons.length; x++) {
+            const Patron = this._SandboxPatrons[x];
 
-        // Processing Fake Sandbox Patrons
-        this._SandboxPatrons.forEach((Patron: SandboxOptions) =>
             Patrons.push({
                 displayId: Patron.displayId,
                 displayName: Patron.displayName,
@@ -153,61 +157,65 @@ export class Patreon {
                         url: Patron.mediaConnection.patreon.url,
                     },
                     discord: {
-                        id: Patron.mediaConnection.discord.id,
-                        url: Patron.mediaConnection.discord.url,
+                        id: Patron?.mediaConnection?.discord?.id
+                            ? Patron?.mediaConnection?.discord?.id
+                            : null,
+                        url: Patron?.mediaConnection?.discord?.url
+                            ? Patron?.mediaConnection?.discord?.id
+                            : null,
                     },
                 },
-            })
-        )
+            });
+        }
 
-        // Processing Real Patrons
-        res.data.data.forEach((Patron: any) => {
-            if (!filters.includes(Patron.attributes.patron_status)) return
+        // Format Real Patrons
+        for (let x = 0; x < PatreonAPIPatrons.length; x++) {
+            const Relationships = PatreonAPIPatrons[x].relationships;
+            const Attributes = PatreonAPIPatrons[x].attributes;
 
-            var socialInfo = res.data.included.find(
-                (includePatron: any) =>
-                    includePatron.id == Patron.relationships.user.data.id &&
-                    includePatron.type === 'user'
-            )
+            if (!filters.includes(Attributes.patron_status)) continue;
 
-            var tierInfo = res.data.included.find(
-                (includePatron: any) =>
-                    includePatron.id ==
-                        Patron.relationships.currently_entitled_tiers?.data[0]
-                            ?.id && includePatron.type === 'tier'
-            )
+            const socialInfo = data.included.find(
+                (patron: any) =>
+                    patron.id == Relationships.user.data.id &&
+                    patron.type === 'user'
+            );
+
+            const tierInfo = data.included.find(
+                (patron: any) =>
+                    patron.id ==
+                        Relationships.currently_entitled_tiers?.data[0]?.id &&
+                    patron.type === 'tier'
+            );
 
             Patrons.push({
-                displayId: Patron.relationships.user.data.id,
-                displayName: Patron.attributes.full_name,
-                emailAddress: Patron.attributes.email,
-                isFollower: Patron.attributes.is_follower,
+                displayId: Relationships.user.data.id,
+                displayName: Attributes.full_name,
+                emailAddress: Attributes.email,
+                isFollower: Attributes.is_follower,
                 subscription: {
-                    note: Patron.attributes.note,
+                    note: Attributes.note,
                     currentEntitled: {
-                        status: Patron.attributes.patron_status,
+                        status: Attributes.patron_status,
                         tier: {
                             id: tierInfo ? tierInfo.id : null,
-                            title: tierInfo ? tierInfo.attributes.title : null,
+                            title: tierInfo ? tierInfo.Attributes.title : null,
                         },
                         cents:
-                            Patron.attributes.currently_entitled_amount_cents !=
-                            0
-                                ? Patron.attributes
-                                      .currently_entitled_amount_cents
+                            Attributes.currently_entitled_amount_cents != 0
+                                ? Attributes.currently_entitled_amount_cents
                                 : null,
-                        willPayCents: Patron.attributes.will_pay_amount_cents,
-                        lifetimeCents: Patron.attributes.lifetime_support_cents,
-                        firstCharge:
-                            Patron.attributes.pledge_relationship_start,
-                        nextCharge: Patron.attributes.next_charge_date,
-                        lastCharge: Patron.attributes.last_charge_date,
+                        willPayCents: Attributes.will_pay_amount_cents,
+                        lifetimeCents: Attributes.lifetime_support_cents,
+                        firstCharge: Attributes.pledge_relationship_start,
+                        nextCharge: Attributes.next_charge_date,
+                        lastCharge: Attributes.last_charge_date,
                     },
                 },
                 mediaConnection: {
                     patreon: {
-                        id: Patron.relationships.user.data.id,
-                        url: Patron.relationships.user.links.related,
+                        id: Relationships.user.data.id,
+                        url: Relationships.user.links.related,
                     },
                     discord: {
                         id: socialInfo?.attributes?.social_connections?.discord
@@ -224,17 +232,18 @@ export class Patreon {
                                 : null,
                     },
                 },
-            })
-        })
-        return Patrons
+            });
+        }
+
+        return Patrons;
     }
 
-    protected static _SandboxAdd(Patron: SandboxOptions) {
-        this._SandboxPatrons.push(Patron)
+    protected static _SandboxAddPatron(Patron: SandboxOptions) {
+        this._SandboxPatrons.push(Patron);
     }
 
-    protected static _SandboxGet() {
-        return this._SandboxPatrons
+    protected static _SandboxGetPatron() {
+        return this._SandboxPatrons;
     }
 
     // public static FetchPatron() {}
@@ -243,11 +252,11 @@ export class Patreon {
 }
 
 export class Sandbox extends Patreon {
-    public static GetFakePatrons() {
-        return super._SandboxGet()
+    public static GetSandboxPatrons() {
+        return super._SandboxGetPatron();
     }
 
-    public static AppendPatron(Patron: SandboxOptions) {
-        super._SandboxAdd(Patron)
+    public static AddSandboxPatron(Patron: SandboxOptions) {
+        super._SandboxAddPatron(Patron);
     }
 }