podverse-orm 5.1.0-alpha.1 → 5.1.0-alpha.11

package/dist/config/index.d.ts

@@ -11,5 +11,10 @@ export declare const config: {
         database: string;
         ssl_connection: boolean;
     };
+    log: {
+        level: string;
+        dir: string;
+        timer: boolean;
+    };
 };
 //# sourceMappingURL=index.d.ts.map

package/dist/config/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM;;;;;;;;;;;;;CAalB,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/config/index.ts"],"names":[],"mappings":"AAAA,eAAO,MAAM,MAAM;;;;;;;;;;;;;;;;;;CAkBlB,CAAC"}

package/dist/config/index.js

@@ -13,5 +13,10 @@ exports.config = {
         read_write_password: process.env.DB_READ_WRITE_PASSWORD || '',
         database: process.env.DB_DATABASE || 'db',
         ssl_connection: process.env.DB_SSL_CONNECTION === 'true',
+    },
+    log: {
+        level: process.env.LOG_LEVEL || 'info',
+        dir: process.env.LOG_DIR || 'logs',
+        timer: process.env.LOG_TIMER === 'true',
     }
 };

package/dist/db/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/db/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqB,MAAM,SAAS,CAAC;AAiOxD,eAAO,MAAM,iBAAiB,YAA6B,CAAC;AAC5D,eAAO,MAAM,sBAAsB,YAAkC,CAAC;AAEtE,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,GAAG,YAAY,CAAC;CAC/B"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/db/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAqB,MAAM,SAAS,CAAC;AA+NxD,eAAO,MAAM,iBAAiB,YAA6B,CAAC;AAC5D,eAAO,MAAM,sBAAsB,YAAkC,CAAC;AAEtE,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,MAAM,GAAG,YAAY,CAAC;CAC/B"}

package/dist/db/index.js

@@ -5,7 +5,6 @@ const typeorm_1 = require("typeorm");
 const typeorm_naming_strategies_1 = require("typeorm-naming-strategies");
 const config_1 = require("@orm/config");
 const account_1 = require("@orm/entities/account/account");
-const accountAdminRoles_1 = require("@orm/entities/account/accountAdminRoles");
 const accountAppStorePurchase_1 = require("@orm/entities/account/accountAppStorePurchase");
 const accountCredentials_1 = require("@orm/entities/account/accountCredentials");
 const accountEmailChangeVerification_1 = require("@orm/entities/account/accountEmailChangeVerification");
@@ -111,7 +110,6 @@ const commonConfig = {
     logging: false,
     entities: [
         account_1.Account,
-        accountAdminRoles_1.AccountAdminRoles,
         accountAppStorePurchase_1.AccountAppStorePurchase,
         accountCredentials_1.AccountCredentials,
         accountEmailChangeVerification_1.AccountEmailChangeVerification,

package/dist/entities/account/account.d.ts

@@ -1,6 +1,5 @@
 import { AccountCredentials } from '@orm/entities/account/accountCredentials';
 import { SharableStatus } from '@orm/entities/sharableStatus';
-import { AccountAdminRoles } from './accountAdminRoles';
 import { AccountAppStorePurchase } from './accountAppStorePurchase';
 import { AccountFCMDevice } from './accountFCMDevice';
 import { AccountFollowingAccount } from './accountFollowingAccount';
@@ -20,7 +19,6 @@ export declare class Account {
     id_text: string;
     verified: boolean;
     sharable_status: SharableStatus;
-    account_admin_roles: AccountAdminRoles;
     account_app_store_purchases: AccountAppStorePurchase[];
     account_credentials: AccountCredentials;
     account_fcm_devices: AccountFCMDevice[];

package/dist/entities/account/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../src/entities/account/account.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,iBAAiB,EAAE,MAAM,qBAAqB,CAAC;AACxD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D,qBACa,OAAO;IAElB,EAAE,EAAG,MAAM,CAAC;IAGZ,OAAO,EAAG,MAAM,CAAC;IAGjB,QAAQ,EAAG,OAAO,CAAC;IAInB,eAAe,EAAG,cAAc,CAAC;IAGjC,mBAAmB,EAAG,iBAAiB,CAAC;IAGxC,2BAA2B,EAAG,uBAAuB,EAAE,CAAC;IAGxD,mBAAmB,EAAG,kBAAkB,CAAC;IAGzC,mBAAmB,EAAG,gBAAgB,EAAE,CAAC;IAGzC,0BAA0B,EAAG,uBAAuB,EAAE,CAAC;IAGvD,qCAAqC,EAAG,+BAA+B,EAAE,CAAC;IAG1E,0BAA0B,EAAG,uBAAuB,EAAE,CAAC;IAGvD,2BAA2B,EAAG,wBAAwB,EAAE,CAAC;IAGzD,6BAA6B,EAAG,yBAAyB,EAAE,CAAC;IAG5D,yBAAyB,EAAG,uBAAuB,CAAC;IAGpD,6BAA6B,EAAG,0BAA0B,EAAE,CAAC;IAG7D,qBAAqB,EAAG,kBAAkB,EAAE,CAAC;IAG7C,eAAe,EAAG,cAAc,CAAC;IAGjC,sBAAsB,EAAG,oBAAoB,CAAC;IAG9C,kBAAkB,EAAG,eAAe,EAAE,CAAC;IAGvC,oBAAoB,EAAG,mBAAmB,CAAC;IAG3C,cAAc;CAGf"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../src/entities/account/account.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAC9D,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,gBAAgB,EAAE,MAAM,oBAAoB,CAAC;AACtD,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,+BAA+B,EAAE,MAAM,mCAAmC,CAAC;AACpF,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,wBAAwB,EAAE,MAAM,4BAA4B,CAAC;AACtE,OAAO,EAAE,yBAAyB,EAAE,MAAM,6BAA6B,CAAC;AACxE,OAAO,EAAE,uBAAuB,EAAE,MAAM,2BAA2B,CAAC;AACpE,OAAO,EAAE,0BAA0B,EAAE,MAAM,8BAA8B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,MAAM,sBAAsB,CAAC;AAC1D,OAAO,EAAE,cAAc,EAAE,MAAM,kBAAkB,CAAC;AAClD,OAAO,EAAE,oBAAoB,EAAE,MAAM,wBAAwB,CAAC;AAC9D,OAAO,EAAE,eAAe,EAAE,MAAM,mBAAmB,CAAC;AACpD,OAAO,EAAE,mBAAmB,EAAE,MAAM,uBAAuB,CAAC;AAG5D,qBACa,OAAO;IAElB,EAAE,EAAG,MAAM,CAAC;IAGZ,OAAO,EAAG,MAAM,CAAC;IAGjB,QAAQ,EAAG,OAAO,CAAC;IAInB,eAAe,EAAG,cAAc,CAAC;IAGjC,2BAA2B,EAAG,uBAAuB,EAAE,CAAC;IAGxD,mBAAmB,EAAG,kBAAkB,CAAC;IAGzC,mBAAmB,EAAG,gBAAgB,EAAE,CAAC;IAGzC,0BAA0B,EAAG,uBAAuB,EAAE,CAAC;IAGvD,qCAAqC,EAAG,+BAA+B,EAAE,CAAC;IAG1E,0BAA0B,EAAG,uBAAuB,EAAE,CAAC;IAGvD,2BAA2B,EAAG,wBAAwB,EAAE,CAAC;IAGzD,6BAA6B,EAAG,yBAAyB,EAAE,CAAC;IAG5D,yBAAyB,EAAG,uBAAuB,CAAC;IAGpD,6BAA6B,EAAG,0BAA0B,EAAE,CAAC;IAG7D,qBAAqB,EAAG,kBAAkB,EAAE,CAAC;IAG7C,eAAe,EAAG,cAAc,CAAC;IAGjC,sBAAsB,EAAG,oBAAoB,CAAC;IAG9C,kBAAkB,EAAG,eAAe,EAAE,CAAC;IAGvC,oBAAoB,EAAG,mBAAmB,CAAC;IAG3C,cAAc;CAGf"}

package/dist/entities/account/account.js

@@ -13,7 +13,6 @@ exports.Account = void 0;
 const typeorm_1 = require("typeorm");
 const accountCredentials_1 = require("@orm/entities/account/accountCredentials");
 const sharableStatus_1 = require("@orm/entities/sharableStatus");
-const accountAdminRoles_1 = require("./accountAdminRoles");
 const accountAppStorePurchase_1 = require("./accountAppStorePurchase");
 const accountFCMDevice_1 = require("./accountFCMDevice");
 const accountFollowingAccount_1 = require("./accountFollowingAccount");
@@ -52,10 +51,6 @@ __decorate([
     (0, typeorm_1.JoinColumn)({ name: 'sharable_status_id' }),
     __metadata("design:type", sharableStatus_1.SharableStatus)
 ], Account.prototype, "sharable_status", void 0);
-__decorate([
-    (0, typeorm_1.OneToOne)(() => accountAdminRoles_1.AccountAdminRoles, accountAdminRoles => accountAdminRoles.account),
-    __metadata("design:type", accountAdminRoles_1.AccountAdminRoles)
-], Account.prototype, "account_admin_roles", void 0);
 __decorate([
     (0, typeorm_1.OneToMany)(() => accountAppStorePurchase_1.AccountAppStorePurchase, accountAppStorePurchase => accountAppStorePurchase.account),
     __metadata("design:type", Array)

package/dist/entities/clip.d.ts

@@ -5,6 +5,7 @@ export declare class Clip {
     id: number;
     id_text: string;
     account: Account;
+    item_id: string;
     item: Item;
     start_time: string;
     end_time?: string | null;

package/dist/entities/clip.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"clip.d.ts","sourceRoot":"","sources":["../../src/entities/clip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAK/C,qBACa,IAAI;IAEf,EAAE,EAAG,MAAM,CAAC;IAGZ,OAAO,EAAG,MAAM,CAAC;IAIjB,OAAO,EAAG,OAAO,CAAC;IAIlB,IAAI,EAAG,IAAI,CAAC;IAGZ,UAAU,EAAG,MAAM,CAAC;IAGpB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAGzB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAGtB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAI5B,eAAe,EAAG,kBAAkB,CAAC;IAGrC,cAAc;CAGf"}
+{"version":3,"file":"clip.d.ts","sourceRoot":"","sources":["../../src/entities/clip.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsB,kBAAkB,EAAE,MAAM,kBAAkB,CAAC;AAE1E,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAI/C,qBACa,IAAI;IAEf,EAAE,EAAG,MAAM,CAAC;IAGZ,OAAO,EAAG,MAAM,CAAC;IAIjB,OAAO,EAAG,OAAO,CAAC;IAGlB,OAAO,EAAG,MAAM,CAAC;IAIjB,IAAI,EAAG,IAAI,CAAC;IAGZ,UAAU,EAAG,MAAM,CAAC;IAGpB,QAAQ,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAGzB,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAGtB,WAAW,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAI5B,eAAe,EAAG,kBAAkB,CAAC;IAGrC,cAAc;CAGf"}

package/dist/entities/clip.js

@@ -35,6 +35,10 @@ __decorate([
     (0, typeorm_1.JoinColumn)({ name: 'account_id' }),
     __metadata("design:type", account_1.Account)
 ], Clip.prototype, "account", void 0);
+__decorate([
+    (0, typeorm_1.Column)(),
+    __metadata("design:type", String)
+], Clip.prototype, "item_id", void 0);
 __decorate([
     (0, typeorm_1.ManyToOne)(() => item_1.Item, item => item.id, { onDelete: 'CASCADE' }),
     (0, typeorm_1.JoinColumn)({ name: 'item_id' }),

package/dist/factories/loggerService.d.ts

@@ -0,0 +1,3 @@
+import { LoggerService } from 'podverse-helpers/dist/lib/backend/logger';
+export declare const loggerService: LoggerService;
+//# sourceMappingURL=loggerService.d.ts.map

package/dist/factories/loggerService.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"loggerService.d.ts","sourceRoot":"","sources":["../../src/factories/loggerService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,0CAA0C,CAAC;AAEzE,eAAO,MAAM,aAAa,eAGxB,CAAC"}

package/dist/factories/loggerService.js

@@ -0,0 +1,9 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.loggerService = void 0;
+const config_1 = require("@orm/config");
+const logger_1 = require("podverse-helpers/dist/lib/backend/logger");
+exports.loggerService = new logger_1.LoggerService({
+    logDir: config_1.config.log.dir,
+    logLevel: config_1.config.log.level
+});

package/dist/index.d.ts

@@ -2,7 +2,6 @@ import './module-alias-config';
 export * from './config';
 export * from './db';
 export * from './entities/account/account';
-export * from './entities/account/accountAdminRoles';
 export * from './entities/account/accountAppStorePurchase';
 export * from './entities/account/accountCredentials';
 export * from './entities/account/accountEmailChangeVerification';
@@ -126,6 +125,7 @@ export * from './services/channel/channelTxt';
 export * from './services/channel/channelValue';
 export * from './services/channel/channelValueRecipient';
 export * from './services/clip';
+export * from './services/deduplicator';
 export * from './services/feed/feed';
 export * from './services/feed/feedFlagStatus';
 export * from './services/feed/feedLog';

package/dist/index.d.ts.map

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

package/dist/index.js

@@ -18,7 +18,6 @@ require("./module-alias-config");
 __exportStar(require("./config"), exports);
 __exportStar(require("./db"), exports);
 __exportStar(require("./entities/account/account"), exports);
-__exportStar(require("./entities/account/accountAdminRoles"), exports);
 __exportStar(require("./entities/account/accountAppStorePurchase"), exports);
 __exportStar(require("./entities/account/accountCredentials"), exports);
 __exportStar(require("./entities/account/accountEmailChangeVerification"), exports);
@@ -142,6 +141,7 @@ __exportStar(require("./services/channel/channelTxt"), exports);
 __exportStar(require("./services/channel/channelValue"), exports);
 __exportStar(require("./services/channel/channelValueRecipient"), exports);
 __exportStar(require("./services/clip"), exports);
+__exportStar(require("./services/deduplicator"), exports);
 __exportStar(require("./services/feed/feed"), exports);
 __exportStar(require("./services/feed/feedFlagStatus"), exports);
 __exportStar(require("./services/feed/feedLog"), exports);

package/dist/lib/password.d.ts

@@ -0,0 +1,2 @@
+export declare function hashPassword(password: string): Promise<string>;
+//# sourceMappingURL=password.d.ts.map

package/dist/lib/password.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"password.d.ts","sourceRoot":"","sources":["../../src/lib/password.ts"],"names":[],"mappings":"AAEA,wBAAsB,YAAY,CAAC,QAAQ,EAAE,MAAM,GAAG,OAAO,CAAC,MAAM,CAAC,CAKpE"}

package/dist/lib/password.js

@@ -0,0 +1,24 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.hashPassword = hashPassword;
+const bcrypt_1 = __importDefault(require("bcrypt"));
+function hashPassword(password) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const saltRounds = 10;
+        const salt = yield bcrypt_1.default.genSalt(saltRounds);
+        const hashedPassword = yield bcrypt_1.default.hash(password, salt);
+        return hashedPassword;
+    });
+}

package/dist/services/account/account.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../src/services/account/account.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,OAAO,EAAyB,kBAAkB,EAAiD,MAAM,kBAAkB,CAAC;AAQ5H,KAAK,gBAAgB,GAAG;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,KAAK,gBAAgB,GAAG;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,kBAAkB,CAAC;CACtC,CAAC;AAEF,qBAAa,cAAc;IACzB,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9C,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;;IAO7C,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAO1E,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAUpF,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAOvF,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAI7D,MAAM,CAAC,GAAG,EAAE,gBAAgB;IA2C5B,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IA6B1E,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IActC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBpE,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAS/C"}
+{"version":3,"file":"account.d.ts","sourceRoot":"","sources":["../../../src/services/account/account.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,eAAe,EAAE,cAAc,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AACtE,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,OAAO,EAAyB,kBAAkB,EAAmC,MAAM,kBAAkB,CAAC;AAS9G,KAAK,gBAAgB,GAAG;IACtB,KAAK,EAAE,MAAM,CAAA;IACb,QAAQ,EAAE,MAAM,CAAA;CACjB,CAAA;AAED,KAAK,gBAAgB,GAAG;IACtB,YAAY,CAAC,EAAE,MAAM,CAAC;IACtB,GAAG,CAAC,EAAE,MAAM,CAAC;IACb,eAAe,CAAC,EAAE,kBAAkB,CAAC;CACtC,CAAC;AAEF,qBAAa,cAAc;IACzB,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9C,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;;IAO7C,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAO1E,UAAU,CAAC,KAAK,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAUpF,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAOvF,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAI7D,MAAM,CAAC,GAAG,EAAE,gBAAgB;IA2C5B,MAAM,CAAC,UAAU,EAAE,MAAM,EAAE,GAAG,EAAE,gBAAgB,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IA6B1E,WAAW,CAAC,EAAE,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IActC,aAAa,CAAC,SAAS,EAAE,MAAM,EAAE,WAAW,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBpE,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAS/C"}

package/dist/services/account/account.js

@@ -15,6 +15,7 @@ const account_1 = require("@orm/entities/account/account");
 const db_1 = require("@orm/db");
 const podverse_helpers_2 = require("podverse-helpers");
 const sharableStatus_1 = require("@orm/entities/sharableStatus");
+const password_1 = require("@orm/lib/password");
 const accountCredentials_1 = require("./accountCredentials");
 const accountMembershipStatus_1 = require("./accountMembershipStatus");
 const accountVerification_1 = require("./accountVerification");
@@ -79,7 +80,7 @@ class AccountService {
                 verified: false
             });
             const account = yield this.repositoryReadWrite.save(accountObj);
-            const saltedPassword = yield (0, podverse_helpers_2.hashPassword)(dto.password);
+            const saltedPassword = yield (0, password_1.hashPassword)(dto.password);
             yield accountCredentialsService.update(account, {
                 email: dto.email,
                 password: saltedPassword
@@ -137,7 +138,7 @@ class AccountService {
             if (!account) {
                 throw new Error('Account not found');
             }
-            const saltedPassword = yield (0, podverse_helpers_2.hashPassword)(newPassword);
+            const saltedPassword = yield (0, password_1.hashPassword)(newPassword);
             const accountCredentialsService = new accountCredentials_1.AccountCredentialsService();
             yield accountCredentialsService.update(account, {
                 password: saltedPassword

package/dist/services/archiver.d.ts

@@ -12,6 +12,8 @@ export declare class ArchiverService {
     private processItems;
     processPendingArchiveFeeds(): Promise<void>;
     processPendingArchiveItems(): Promise<void>;
+    getFeedsWithTakedownStatus(): Promise<Feed[]>;
+    removeAllItemsForTakedownFeeds(): Promise<void>;
     archiveAll(): Promise<void>;
 }
 //# sourceMappingURL=archiver.d.ts.map

package/dist/services/archiver.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/services/archiver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAK/C,qBAAa,eAAe;IAC1B,OAAO,CAAC,kBAAkB,CAAyC;IACnE,OAAO,CAAC,uBAAuB,CAA8C;IAC7E,OAAO,CAAC,kBAAkB,CAAyC;IACnE,OAAO,CAAC,uBAAuB,CAA8C;IAC7E,OAAO,CAAC,0BAA0B,CAAqD;IACvF,OAAO,CAAC,cAAc,CAAyC;IAEzD,sBAAsB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAsBzC,sBAAsB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YAWjC,YAAY;IAmBpB,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAkC3C,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAIlC"}
+{"version":3,"file":"archiver.d.ts","sourceRoot":"","sources":["../../src/services/archiver.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAE/C,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAK/C,qBAAa,eAAe;IAC1B,OAAO,CAAC,kBAAkB,CAAyC;IACnE,OAAO,CAAC,uBAAuB,CAA8C;IAC7E,OAAO,CAAC,kBAAkB,CAAyC;IACnE,OAAO,CAAC,uBAAuB,CAA8C;IAC7E,OAAO,CAAC,0BAA0B,CAAqD;IACvF,OAAO,CAAC,cAAc,CAAyC;IAMzD,sBAAsB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAsBzC,sBAAsB,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;YAWjC,YAAY;IAmBpB,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAqC3C,0BAA0B,IAAI,OAAO,CAAC,IAAI,CAAC;IAY3C,0BAA0B,IAAI,OAAO,CAAC,IAAI,EAAE,CAAC;IAW7C,8BAA8B,IAAI,OAAO,CAAC,IAAI,CAAC;IAc/C,UAAU,IAAI,OAAO,CAAC,IAAI,CAAC;CAKlC"}

package/dist/services/archiver.js

@@ -27,6 +27,8 @@ class ArchiverService {
         this.playlistResourceRepository = db_1.AppDataSourceRead.getRepository(playlistResource_1.PlaylistResource);
         this.clipRepository = db_1.AppDataSourceRead.getRepository(clip_1.Clip);
     }
+    // TODO: check if archived items no longer have clip or playlist resource relationships
+    // TODO: handle spam items
     getItemsPendingArchive() {
         return __awaiter(this, void 0, void 0, function* () {
             return this.itemRepositoryRead.find({
@@ -65,12 +67,12 @@ class ArchiverService {
     processItems(items, archivedStatus) {
         return __awaiter(this, void 0, void 0, function* () {
             for (const item of items) {
-                const hasPlaylistResource = yield this.playlistResourceRepository.findOne({
+                const hasPlaylistResource = !!(yield this.playlistResourceRepository.findOne({
                     where: { item: { id: item.id } },
-                });
-                const hasClip = yield this.clipRepository.findOne({
+                }));
+                const hasClip = !!(yield this.clipRepository.findOne({
                     where: { item: { id: item.id } },
-                });
+                }));
                 if (hasPlaylistResource || hasClip) {
                     item.item_flag_status = archivedStatus;
                     yield this.itemRepositoryReadWrite.save(item);
@@ -100,13 +102,14 @@ class ArchiverService {
                     },
                     relations: ['item_flag_status']
                 });
-                if (items.length === 0) {
-                    yield this.feedRepositoryReadWrite.delete(feed.id);
-                }
-                else {
-                    const activeOrPendingItems = items.filter(item => [itemFlagStatus_1.ItemFlagStatusStatusEnum.Active, itemFlagStatus_1.ItemFlagStatusStatusEnum.PendingArchive].includes(item.item_flag_status.id));
+                if (items.length > 0) {
+                    const activeOrPendingItems = items.filter(item => [itemFlagStatus_1.ItemFlagStatusStatusEnum.Active, itemFlagStatus_1.ItemFlagStatusStatusEnum.PendingArchive]
+                        .includes(item.item_flag_status.id));
                     yield this.processItems(activeOrPendingItems, archivedStatus);
                 }
+                feed.feed_flag_status = Object.assign(Object.assign({}, feed.feed_flag_status), { id: feedFlagStatus_1.FeedFlagStatusStatusEnum.Archived });
+                feed.last_parsed_file_hash = null;
+                yield this.feedRepositoryReadWrite.save(feed);
             }
         });
     }
@@ -121,10 +124,38 @@ class ArchiverService {
             yield this.processItems(items, archivedStatus);
         });
     }
+    getFeedsWithTakedownStatus() {
+        return __awaiter(this, void 0, void 0, function* () {
+            return this.feedRepositoryRead.find({
+                where: {
+                    feed_flag_status: {
+                        id: feedFlagStatus_1.FeedFlagStatusStatusEnum.Takedown,
+                    },
+                },
+                relations: ['channel', 'channel.items', 'feed_flag_status'],
+            });
+        });
+    }
+    removeAllItemsForTakedownFeeds() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const feeds = yield this.getFeedsWithTakedownStatus();
+            for (const feed of feeds) {
+                const channel = feed.channel;
+                if (!channel || !channel.items || channel.items.length === 0) {
+                    continue;
+                }
+                const itemIds = channel.items.map(item => item.id);
+                if (itemIds.length > 0) {
+                    yield this.itemRepositoryReadWrite.delete(itemIds);
+                }
+            }
+        });
+    }
     archiveAll() {
         return __awaiter(this, void 0, void 0, function* () {
             yield this.processPendingArchiveFeeds();
             yield this.processPendingArchiveItems();
+            yield this.removeAllItemsForTakedownFeeds();
         });
     }
 }

package/dist/services/base/baseManyService.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseManyService = void 0;
-const podverse_helpers_1 = require("podverse-helpers");
 const db_1 = require("@orm/db");
 const applyProperties_1 = require("@orm/lib/applyProperties");
 const hasDifferentValues_1 = require("@orm/lib/hasDifferentValues");
+const loggerService_1 = require("@orm/factories/loggerService");
 class BaseManyService {
     constructor(targetEntity, parentEntityKey, transactionalEntityManager) {
         this.targetEntity = targetEntity;
@@ -56,8 +56,8 @@ class BaseManyService {
                 return entity;
             }
             entity = (0, applyProperties_1.applyProperties)(entity, dto);
-            podverse_helpers_1.logger.debug(`Updating entity ${JSON.stringify(entity)}`);
-            podverse_helpers_1.logger.debug(`With DTO ${JSON.stringify(dto)}`);
+            loggerService_1.loggerService.debug(`Updating entity ${JSON.stringify(entity)}`);
+            loggerService_1.loggerService.debug(`With DTO ${JSON.stringify(dto)}`);
             return ((_a = this.transactionalEntityManager) !== null && _a !== void 0 ? _a : this.repositoryReadWrite).save(entity);
         });
     }

package/dist/services/base/baseOneService.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"baseOneService.d.ts","sourceRoot":"","sources":["../../../src/services/base/baseOneService.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAoB,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAKrG,qBAAa,cAAc,CAAC,CAAC,SAAS,aAAa,EAAE,CAAC,SAAS,MAAM,CAAC;IACpE,OAAO,CAAC,eAAe,CAAI;IAC3B,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACxC,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,0BAA0B,CAAC,CAAgB;gBAEvC,MAAM,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,EAAE,eAAe,EAAE,CAAC,EAAE,0BAA0B,CAAC,EAAE,aAAa;IAO3F,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAKvE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAkB7E,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAMxD"}
+{"version":3,"file":"baseOneService.d.ts","sourceRoot":"","sources":["../../../src/services/base/baseOneService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,cAAc,EAAoB,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAMrG,qBAAa,cAAc,CAAC,CAAC,SAAS,aAAa,EAAE,CAAC,SAAS,MAAM,CAAC;IACpE,OAAO,CAAC,eAAe,CAAI;IAC3B,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACxC,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7C,OAAO,CAAC,0BAA0B,CAAC,CAAgB;gBAEvC,MAAM,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,EAAE,eAAe,EAAE,CAAC,EAAE,0BAA0B,CAAC,EAAE,aAAa;IAO3F,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAKvE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,CAAC;IAkB7E,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAMxD"}

package/dist/services/base/baseOneService.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseOneService = void 0;
-const podverse_helpers_1 = require("podverse-helpers");
 const db_1 = require("@orm/db");
 const applyProperties_1 = require("@orm/lib/applyProperties");
 const hasDifferentValues_1 = require("@orm/lib/hasDifferentValues");
+const loggerService_1 = require("@orm/factories/loggerService");
 class BaseOneService {
     constructor(entity, parentEntityKey, transactionalEntityManager) {
         this.parentEntityKey = parentEntityKey;
@@ -39,8 +39,8 @@ class BaseOneService {
                 return entity;
             }
             entity = (0, applyProperties_1.applyProperties)(entity, dto);
-            podverse_helpers_1.logger.debug(`Updating entity ${JSON.stringify(entity)}`);
-            podverse_helpers_1.logger.debug(`With DTO ${JSON.stringify(dto)}`);
+            loggerService_1.loggerService.debug(`Updating entity ${JSON.stringify(entity)}`);
+            loggerService_1.loggerService.debug(`With DTO ${JSON.stringify(dto)}`);
             return ((_a = this.transactionalEntityManager) !== null && _a !== void 0 ? _a : this.repositoryReadWrite).save(entity);
         });
     }

package/dist/services/channel/channel.d.ts

@@ -25,10 +25,11 @@ export declare class ChannelService {
     get(id: number, relations?: FindOptionsRelations<Channel>): Promise<Channel | null>;
     getByIdText(id_text: string, relations?: FindOptionsRelations<Channel>): Promise<Channel | null>;
     getByIdOrIdText(idOrIdText: string, relations?: FindOptionsRelations<Channel>): Promise<Channel | null>;
-    getByPodcastIndexId(podcast_index_id: number): Promise<Channel | null>;
+    getByPodcastIndexId(podcast_index_id: number, relations?: FindOptionsRelations<Channel>): Promise<Channel | null>;
     getMany(config: FindManyOptions<Channel>): Promise<Channel[]>;
     getOrCreateByPodcastIndexId(dto: ChannelInitializeDto): Promise<Channel>;
     update(id: number, dto: ChannelDto): Promise<Channel>;
+    updatePodcastIndexId(id: number, podcast_index_id: number): Promise<Channel>;
 }
 export {};
 //# sourceMappingURL=channel.d.ts.map

package/dist/services/channel/channel.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/services/channel/channel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,gBAAgB,EAAM,UAAU,EAAE,MAAM,SAAS,CAAC;AAClG,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAgB/C,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,IAAI,CAAC;IACX,gBAAgB,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAA;IAC1B,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,uBAAuB,UAUnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,oBAAoB,CAAC,OAAO,CAmBhE,CAAC;AAiBF,qBAAa,cAAc;IACzB,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9C,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;;IAO7C,uBAAuB,CAC3B,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAChC,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAsFpB,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAOvF,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAOpG,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAa3G,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAItE,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAW7D,2BAA2B,CAAC,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAaxE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;CAW5D"}
+{"version":3,"file":"channel.d.ts","sourceRoot":"","sources":["../../../src/services/channel/channel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,kBAAkB,CAAC;AAC9C,OAAO,EAAE,eAAe,EAAE,oBAAoB,EAAE,gBAAgB,EAAM,UAAU,EAAE,MAAM,SAAS,CAAC;AAClG,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAgB/C,KAAK,oBAAoB,GAAG;IAC1B,IAAI,EAAE,IAAI,CAAC;IACX,gBAAgB,EAAE,MAAM,CAAA;CACzB,CAAA;AAED,KAAK,UAAU,GAAG;IAChB,IAAI,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACpB,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC5B,KAAK,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IACrB,cAAc,CAAC,EAAE,MAAM,GAAG,IAAI,CAAA;IAC9B,MAAM,CAAC,EAAE,UAAU,GAAG,IAAI,CAAA;IAC1B,uBAAuB,CAAC,EAAE,OAAO,CAAA;IACjC,qBAAqB,CAAC,EAAE,OAAO,CAAA;CAChC,CAAA;AAED,eAAO,MAAM,uBAAuB,UAUnC,CAAC;AAEF,eAAO,MAAM,sBAAsB,EAAE,oBAAoB,CAAC,OAAO,CAmBhE,CAAC;AAiBF,qBAAa,cAAc;IACzB,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;IAC9C,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,OAAO,CAAC,CAAC;;IAO7C,uBAAuB,CAC3B,KAAK,EAAE,gBAAgB,CAAC,OAAO,CAAC,EAChC,SAAS,EAAE,oBAAoB,CAAC,OAAO,CAAC,GACvC,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAsFpB,GAAG,CAAC,EAAE,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAOvF,WAAW,CAAC,OAAO,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAOpG,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAa3G,mBAAmB,CAAC,gBAAgB,EAAE,MAAM,EAAE,SAAS,GAAE,oBAAoB,CAAC,OAAO,CAAM,GAAG,OAAO,CAAC,OAAO,GAAG,IAAI,CAAC;IAIrH,OAAO,CAAC,MAAM,EAAE,eAAe,CAAC,OAAO,CAAC,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAW7D,2BAA2B,CAAC,GAAG,EAAE,oBAAoB,GAAG,OAAO,CAAC,OAAO,CAAC;IAaxE,MAAM,CAAC,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,UAAU,GAAG,OAAO,CAAC,OAAO,CAAC;IAYrD,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,gBAAgB,EAAE,MAAM,GAAG,OAAO,CAAC,OAAO,CAAC;CAWnF"}

package/dist/services/channel/channel.js

@@ -169,16 +169,16 @@ class ChannelService {
             return channel;
         });
     }
-    getByPodcastIndexId(podcast_index_id) {
-        return __awaiter(this, void 0, void 0, function* () {
-            return this.repositoryRead.findOne({ where: { podcast_index_id } });
+    getByPodcastIndexId(podcast_index_id_1) {
+        return __awaiter(this, arguments, void 0, function* (podcast_index_id, relations = {}) {
+            return this.repositoryRead.findOne({ where: { podcast_index_id }, relations });
         });
     }
     getMany(config) {
         return __awaiter(this, void 0, void 0, function* () {
             return this.repositoryRead.find(Object.assign({ where: {
                     feed: {
-                        id: (0, typeorm_1.In)([feedFlagStatus_1.FeedFlagStatusStatusEnum.Active, feedFlagStatus_1.FeedFlagStatusStatusEnum.AlwaysParse])
+                        feed_flag_status: (0, typeorm_1.In)([feedFlagStatus_1.FeedFlagStatusStatusEnum.Active, feedFlagStatus_1.FeedFlagStatusStatusEnum.AlwaysParse])
                     }
                 } }, config));
         });
@@ -205,5 +205,15 @@ class ChannelService {
             return this.repositoryReadWrite.save(channel);
         });
     }
+    updatePodcastIndexId(id, podcast_index_id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let channel = yield this.get(id);
+            if (!channel) {
+                channel = new channel_1.Channel();
+            }
+            channel = (0, applyProperties_1.applyProperties)(channel, { podcast_index_id });
+            return this.repositoryReadWrite.save(channel);
+        });
+    }
 }
 exports.ChannelService = ChannelService;

package/dist/services/deduplicator.d.ts

@@ -0,0 +1,17 @@
+import { EntityManager } from 'typeorm';
+import { Item } from '@orm/entities/item/item';
+export declare class DeduplicatorService {
+    protected readWriteEntityManager: EntityManager;
+    constructor();
+    mergeChannels(id_to_archive: number, duplicate_id_to_keep: number): Promise<void>;
+    private updateAccountFollowingChannel;
+    private buildItemMaps;
+    private findDuplicateItem;
+    private updateClipAndPlaylistResource;
+    getChannelItems(channel_id: number): Promise<Item[]>;
+    getItemsForBothChannels(id_to_archive: number, duplicate_id_to_keep: number): Promise<{
+        itemsToArchive: Item[];
+        duplicateItemsToKeep: Item[];
+    }>;
+}
+//# sourceMappingURL=deduplicator.d.ts.map

package/dist/services/deduplicator.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"deduplicator.d.ts","sourceRoot":"","sources":["../../src/services/deduplicator.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAIxC,OAAO,EAAE,IAAI,EAAE,MAAM,yBAAyB,CAAC;AAG/C,qBAAa,mBAAmB;IAC9B,SAAS,CAAC,sBAAsB,EAAE,aAAa,CAAC;;IAM1C,aAAa,CAAC,aAAa,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;YAczE,6BAA6B;IAS3C,OAAO,CAAC,aAAa;IAUrB,OAAO,CAAC,iBAAiB;YAcX,6BAA6B;IAgBrC,eAAe,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,EAAE,CAAC;IAOpD,uBAAuB,CAAC,aAAa,EAAE,MAAM,EAAE,oBAAoB,EAAE,MAAM,GAAG,OAAO,CAAC;QAAE,cAAc,EAAE,IAAI,EAAE,CAAC;QAAC,oBAAoB,EAAE,IAAI,EAAE,CAAA;KAAE,CAAC;CAKtJ"}

package/dist/services/deduplicator.js

@@ -0,0 +1,97 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.DeduplicatorService = void 0;
+const db_1 = require("@orm/db");
+const accountFollowingChannel_1 = require("@orm/entities/account/accountFollowingChannel");
+const clip_1 = require("@orm/entities/clip");
+const item_1 = require("@orm/entities/item/item");
+const playlistResource_1 = require("@orm/entities/playlist/playlistResource");
+class DeduplicatorService {
+    constructor() {
+        this.readWriteEntityManager = db_1.AppDataSourceReadWrite.manager;
+    }
+    mergeChannels(id_to_archive, duplicate_id_to_keep) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.updateAccountFollowingChannel(id_to_archive, duplicate_id_to_keep);
+            const { itemsToArchive, duplicateItemsToKeep } = yield this.getItemsForBothChannels(id_to_archive, duplicate_id_to_keep);
+            const { guidMap, guidEnclosureUrlMap } = this.buildItemMaps(duplicateItemsToKeep);
+            for (const itemToArchive of itemsToArchive) {
+                const duplicateItemToKeep = this.findDuplicateItem(itemToArchive, guidMap, guidEnclosureUrlMap);
+                if (duplicateItemToKeep) {
+                    yield this.updateClipAndPlaylistResource(itemToArchive.id, duplicateItemToKeep.id);
+                }
+            }
+        });
+    }
+    updateAccountFollowingChannel(id_to_archive, duplicate_id_to_keep) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.readWriteEntityManager
+                .createQueryBuilder()
+                .update(accountFollowingChannel_1.AccountFollowingChannel)
+                .set({ channel_id: duplicate_id_to_keep })
+                .where("channel_id = :id_to_archive", { id_to_archive })
+                .execute();
+        });
+    }
+    buildItemMaps(items) {
+        const guidMap = new Map();
+        const guidEnclosureUrlMap = new Map();
+        for (const item of items) {
+            if (item.guid)
+                guidMap.set(item.guid, item);
+            if (item.guid_enclosure_url)
+                guidEnclosureUrlMap.set(item.guid_enclosure_url, item);
+        }
+        return { guidMap, guidEnclosureUrlMap };
+    }
+    findDuplicateItem(itemToArchive, guidMap, guidEnclosureUrlMap) {
+        if (itemToArchive.guid && guidMap.has(itemToArchive.guid)) {
+            return guidMap.get(itemToArchive.guid);
+        }
+        if (itemToArchive.guid_enclosure_url && guidEnclosureUrlMap.has(itemToArchive.guid_enclosure_url)) {
+            return guidEnclosureUrlMap.get(itemToArchive.guid_enclosure_url);
+        }
+        return undefined;
+    }
+    updateClipAndPlaylistResource(itemToArchiveId, duplicateItemToKeepId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            yield this.readWriteEntityManager
+                .createQueryBuilder()
+                .update(clip_1.Clip)
+                .set({ item_id: duplicateItemToKeepId })
+                .where("item_id = :itemToArchiveId", { itemToArchiveId })
+                .execute();
+            yield this.readWriteEntityManager
+                .createQueryBuilder()
+                .update(playlistResource_1.PlaylistResource)
+                .set({ item_id: duplicateItemToKeepId })
+                .where("item_id = :itemToArchiveId", { itemToArchiveId })
+                .execute();
+        });
+    }
+    getChannelItems(channel_id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const items = yield this.readWriteEntityManager
+                .getRepository(item_1.Item)
+                .find({ where: { channel: { id: channel_id } } });
+            return items;
+        });
+    }
+    getItemsForBothChannels(id_to_archive, duplicate_id_to_keep) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const itemsToArchive = yield this.getChannelItems(id_to_archive);
+            const duplicateItemsToKeep = yield this.getChannelItems(duplicate_id_to_keep);
+            return { itemsToArchive, duplicateItemsToKeep };
+        });
+    }
+}
+exports.DeduplicatorService = DeduplicatorService;

package/dist/services/stats/statsTrackAccountGuid.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"statsTrackAccountGuid.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsTrackAccountGuid.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAIlF,qBAAa,4BAA4B;IACvC,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,cAAc,CAAiB;;IAQjC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC;IAWzE,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAU1D,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAMhD"}
+{"version":3,"file":"statsTrackAccountGuid.d.ts","sourceRoot":"","sources":["../../../src/services/stats/statsTrackAccountGuid.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,qBAAqB,EAAE,MAAM,2CAA2C,CAAC;AAGlF,qBAAa,4BAA4B;IACvC,OAAO,CAAC,cAAc,CAAoC;IAC1D,OAAO,CAAC,mBAAmB,CAAoC;IAC/D,OAAO,CAAC,cAAc,CAAiB;;IAQjC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,GAAG,IAAI,CAAC;IAWzE,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,qBAAqB,CAAC;IAU1D,MAAM,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAMhD"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "podverse-orm",
-  "version": "5.1.0-alpha.1",
+  "version": "5.1.0-alpha.11",
   "description": "",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -16,9 +16,10 @@
   "author": "",
   "license": "AGPLv3",
   "dependencies": {
+    "bcrypt": "^5.1.1",
     "module-alias": "^2.2.3",
     "pg": "^8.12.0",
-    "podverse-helpers": "^5.1.2-alpha.2",
+    "podverse-helpers": "^5.1.2-alpha.7",
     "shortid": "^2.2.16",
     "typeorm": "^0.3.20",
     "typeorm-naming-strategies": "^4.1.0"
@@ -27,7 +28,8 @@
     "@eslint/config-array": "^0.18.0",
     "@eslint/eslintrc": "^3.1.0",
     "@eslint/js": "^9.8.0",
-    "@types/node": "^22.1.0",
+    "@types/bcrypt": "^5.0.2",
+    "@types/node": "^22.0.0",
     "eslint": "^9.9.0",
     "nodemon": "^3.1.4",
     "ts-node": "^10.9.2",

package/dist/entities/account/accountAdminRoles.d.ts

@@ -1,8 +0,0 @@
-import { Account } from '@orm/entities/account/account';
-export declare class AccountAdminRoles {
-    id: number;
-    account: Account;
-    dev_admin: boolean;
-    podping_admin: boolean;
-}
-//# sourceMappingURL=accountAdminRoles.d.ts.map

package/dist/entities/account/accountAdminRoles.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"accountAdminRoles.d.ts","sourceRoot":"","sources":["../../../src/entities/account/accountAdminRoles.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AAExD,qBACa,iBAAiB;IAE5B,EAAE,EAAG,MAAM,CAAC;IAIZ,OAAO,EAAG,OAAO,CAAC;IAGlB,SAAS,EAAG,OAAO,CAAC;IAGpB,aAAa,EAAG,OAAO,CAAC;CACzB"}

package/dist/entities/account/accountAdminRoles.js

@@ -1,37 +0,0 @@
-"use strict";
-var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
-    var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
-    if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
-    else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
-    return c > 3 && r && Object.defineProperty(target, key, r), r;
-};
-var __metadata = (this && this.__metadata) || function (k, v) {
-    if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
-};
-Object.defineProperty(exports, "__esModule", { value: true });
-exports.AccountAdminRoles = void 0;
-const typeorm_1 = require("typeorm");
-const account_1 = require("@orm/entities/account/account");
-let AccountAdminRoles = class AccountAdminRoles {
-};
-exports.AccountAdminRoles = AccountAdminRoles;
-__decorate([
-    (0, typeorm_1.PrimaryGeneratedColumn)(),
-    __metadata("design:type", Number)
-], AccountAdminRoles.prototype, "id", void 0);
-__decorate([
-    (0, typeorm_1.OneToOne)(() => account_1.Account, account => account.id, { onDelete: 'CASCADE' }),
-    (0, typeorm_1.JoinColumn)({ name: 'account_id' }),
-    __metadata("design:type", account_1.Account)
-], AccountAdminRoles.prototype, "account", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
-    __metadata("design:type", Boolean)
-], AccountAdminRoles.prototype, "dev_admin", void 0);
-__decorate([
-    (0, typeorm_1.Column)({ type: 'boolean', default: false }),
-    __metadata("design:type", Boolean)
-], AccountAdminRoles.prototype, "podping_admin", void 0);
-exports.AccountAdminRoles = AccountAdminRoles = __decorate([
-    (0, typeorm_1.Entity)()
-], AccountAdminRoles);