podverse-orm 5.1.24-alpha.0 → 5.1.27-alpha.0

package/dist/services/account/account.js

@@ -11,6 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AccountService = void 0;
 const podverse_helpers_1 = require("podverse-helpers");
+const typeorm_1 = require("typeorm");
 const account_1 = require("@orm/entities/account/account");
 const db_1 = require("@orm/db");
 const sharableStatus_1 = require("@orm/entities/sharableStatus");
@@ -20,6 +21,7 @@ const accountMembershipStatus_1 = require("./accountMembershipStatus");
 const accountVerification_1 = require("./accountVerification");
 const accountResetPassword_1 = require("./accountResetPassword");
 const accountProfile_1 = require("./accountProfile");
+const accountProfile_2 = require("@orm/entities/account/accountProfile");
 const accountSettings_1 = require("@orm/entities/account/accountSettings/accountSettings");
 const accountSettingsLocale_1 = require("@orm/entities/account/accountSettings/accountSettingsLocale");
 const accountSettingsNotification_1 = require("@orm/entities/account/accountSettings/accountSettingsNotification");
@@ -78,6 +80,25 @@ class AccountService {
             return this.repositoryRead.find(config);
         });
     }
+    getManyPublic(config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sharableStatusIds = (0, podverse_helpers_1.getSharableStatusIdsForProfileType)('global');
+            return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: Object.assign(Object.assign({}, config.where), { sharable_status: { id: (0, typeorm_1.In)(sharableStatusIds) }, account_profile: {
+                        display_name: (0, typeorm_1.Not)((0, typeorm_1.IsNull)())
+                    } }) }));
+        });
+    }
+    getManySubscribed(accountIds, config) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accountIds.length === 0) {
+                return [];
+            }
+            const sharableStatusIds = (0, podverse_helpers_1.getSharableStatusIdsForProfileType)('subscribed');
+            return this.repositoryRead.find(Object.assign(Object.assign({}, config), { where: Object.assign(Object.assign({}, config.where), { id: (0, typeorm_1.In)(accountIds), sharable_status: { id: (0, typeorm_1.In)(sharableStatusIds) }, account_profile: {
+                        display_name: (0, typeorm_1.Not)((0, typeorm_1.IsNull)())
+                    } }) }));
+        });
+    }
     create(dto, qaVerified) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!(0, podverse_helpers_1.validateEmail)(dto.email)) {
@@ -102,6 +123,13 @@ class AccountService {
             });
             const account = yield this.repositoryReadWrite.save(accountObj);
             yield this.ensureAccountSettings(account, { alwaysCreate: true, locale: dto.locale });
+            // Create account_profile row with null display_name and bio
+            const accountProfileRepo = db_1.AppDataSourceReadWrite.getRepository(accountProfile_2.AccountProfile);
+            const accountProfile = new accountProfile_2.AccountProfile();
+            accountProfile.account = account;
+            accountProfile.display_name = null;
+            accountProfile.bio = null;
+            yield accountProfileRepo.save(accountProfile);
             const saltedPassword = yield (0, password_1.hashPassword)(dto.password);
             yield accountCredentialsService.update(account, {
                 email: dto.email,
@@ -122,23 +150,22 @@ class AccountService {
             if (!account) {
                 throw new Error('Account not found');
             }
-            if (dto.display_name !== undefined || dto.bio !== undefined) {
-                const accountProfileService = new accountProfile_1.AccountProfileService();
-                const accountProfileDto = {
-                    display_name: dto.display_name,
-                    bio: dto.bio
-                };
-                yield accountProfileService.update(account, accountProfileDto);
-            }
-            if (dto.sharable_status !== undefined) {
-                const sharableStatusRepository = db_1.AppDataSourceRead.getRepository(sharableStatus_1.SharableStatus);
-                const sharableStatus = yield sharableStatusRepository.findOne({ where: { id: dto.sharable_status } });
-                if (!sharableStatus) {
-                    throw new Error('SharableStatus not found');
-                }
-                account.sharable_status = sharableStatus;
-                yield this.repositoryReadWrite.save(account);
+            // Always update account profile
+            const accountProfileService = new accountProfile_1.AccountProfileService();
+            const accountProfileDto = {
+                display_name: dto.display_name,
+                bio: dto.bio
+            };
+            yield accountProfileService.update(account, accountProfileDto);
+            // Always update sharable status
+            const sharableStatusRepository = db_1.AppDataSourceRead.getRepository(sharableStatus_1.SharableStatus);
+            const sharableStatus = yield sharableStatusRepository.findOne({ where: { id: dto.sharable_status } });
+            if (!sharableStatus) {
+                throw new Error('SharableStatus not found');
             }
+            account.sharable_status = sharableStatus;
+            yield this.repositoryReadWrite.save(account);
+            // Always update locale
             const accountSettings = yield db_1.AppDataSourceReadWrite.getRepository(accountSettings_1.AccountSettings).findOne({
                 where: { account_id },
                 relations: ['account_settings_locale']

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

@@ -0,0 +1,46 @@
+export declare class AccountDataExportService {
+    private accountService;
+    constructor();
+    exportUserData(account_id: number): Promise<{
+        export_date: string;
+        account: {
+            id: number;
+            id_text: string;
+            verified: boolean;
+            sharable_status_id: number | null;
+            account_profile?: {
+                display_name: string | null;
+                bio: string | null;
+            } | null;
+        };
+        following: {
+            accounts: Array<{
+                id_text: string;
+                verified: boolean;
+            }>;
+            channels: Array<{
+                id_text: string;
+                title: string | null;
+                feed: {
+                    url: string;
+                } | null;
+            }>;
+            playlists: Array<{
+                id_text: string;
+                title: string | null;
+                account: {
+                    id_text: string;
+                } | null;
+            }>;
+            add_by_rss_channels: Array<{
+                feed_url: string;
+                title: string | null;
+                image_url: string | null;
+            }>;
+        };
+        playlists: Array<unknown>;
+        clips: Array<unknown>;
+        queues: Array<unknown>;
+    }>;
+}
+//# sourceMappingURL=accountDataExport.d.ts.map

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

@@ -0,0 +1 @@
+{"version":3,"file":"accountDataExport.d.ts","sourceRoot":"","sources":["../../../src/services/account/accountDataExport.ts"],"names":[],"mappings":"AAeA,qBAAa,wBAAwB;IACnC,OAAO,CAAC,cAAc,CAAiB;;IAMjC,cAAc,CAAC,UAAU,EAAE,MAAM,GAAG,OAAO,CAAC;QAChD,WAAW,EAAE,MAAM,CAAC;QACpB,OAAO,EAAE;YACP,EAAE,EAAE,MAAM,CAAC;YACX,OAAO,EAAE,MAAM,CAAC;YAChB,QAAQ,EAAE,OAAO,CAAC;YAClB,kBAAkB,EAAE,MAAM,GAAG,IAAI,CAAC;YAClC,eAAe,CAAC,EAAE;gBAChB,YAAY,EAAE,MAAM,GAAG,IAAI,CAAC;gBAC5B,GAAG,EAAE,MAAM,GAAG,IAAI,CAAC;aACpB,GAAG,IAAI,CAAC;SACV,CAAC;QACF,SAAS,EAAE;YACT,QAAQ,EAAE,KAAK,CAAC;gBAAE,OAAO,EAAE,MAAM,CAAC;gBAAC,QAAQ,EAAE,OAAO,CAAA;aAAE,CAAC,CAAC;YACxD,QAAQ,EAAE,KAAK,CAAC;gBAAE,OAAO,EAAE,MAAM,CAAC;gBAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;gBAAC,IAAI,EAAE;oBAAE,GAAG,EAAE,MAAM,CAAA;iBAAE,GAAG,IAAI,CAAA;aAAE,CAAC,CAAC;YACzF,SAAS,EAAE,KAAK,CAAC;gBAAE,OAAO,EAAE,MAAM,CAAC;gBAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;gBAAC,OAAO,EAAE;oBAAE,OAAO,EAAE,MAAM,CAAA;iBAAE,GAAG,IAAI,CAAA;aAAE,CAAC,CAAC;YACjG,mBAAmB,EAAE,KAAK,CAAC;gBAAE,QAAQ,EAAE,MAAM,CAAC;gBAAC,KAAK,EAAE,MAAM,GAAG,IAAI,CAAC;gBAAC,SAAS,EAAE,MAAM,GAAG,IAAI,CAAA;aAAE,CAAC,CAAC;SAClG,CAAC;QACF,SAAS,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QAC1B,KAAK,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;QACtB,MAAM,EAAE,KAAK,CAAC,OAAO,CAAC,CAAC;KACxB,CAAC;CAkSH"}

package/dist/services/account/accountDataExport.js

@@ -0,0 +1,251 @@
+"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.AccountDataExportService = void 0;
+const accountFollowingAccount_1 = require("./accountFollowingAccount");
+const accountFollowingChannel_1 = require("./accountFollowingChannel");
+const accountFollowingPlaylist_1 = require("./accountFollowingPlaylist");
+const accountFollowingAddByRSSChannel_1 = require("./accountFollowingAddByRSSChannel");
+const playlist_1 = require("../playlist/playlist");
+const playlistResource_1 = require("../playlist/playlistResource");
+const clip_1 = require("../clip");
+const queue_1 = require("../queue/queue");
+const queueResource_1 = require("../queue/queueResource");
+const account_1 = require("./account");
+class AccountDataExportService {
+    constructor() {
+        this.accountService = new account_1.AccountService();
+    }
+    exportUserData(account_id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b, _c, _d;
+            const account = yield this.accountService.get(account_id, {
+                relations: [
+                    'account_profile'
+                ]
+            });
+            if (!account) {
+                throw new Error('Account not found');
+            }
+            const accountData = {
+                id: account.id,
+                id_text: account.id_text,
+                verified: account.verified,
+                sharable_status_id: (_b = (_a = account.sharable_status) === null || _a === void 0 ? void 0 : _a.id) !== null && _b !== void 0 ? _b : null,
+                account_profile: account.account_profile ? {
+                    display_name: (_c = account.account_profile.display_name) !== null && _c !== void 0 ? _c : null,
+                    bio: (_d = account.account_profile.bio) !== null && _d !== void 0 ? _d : null
+                } : null
+            };
+            // Get following relationships
+            const accountFollowingAccountService = new accountFollowingAccount_1.AccountFollowingAccountService();
+            const accountFollowingChannelService = new accountFollowingChannel_1.AccountFollowingChannelService();
+            const accountFollowingPlaylistService = new accountFollowingPlaylist_1.AccountFollowingPlaylistService();
+            const accountFollowingAddByRSSChannelService = new accountFollowingAddByRSSChannel_1.AccountFollowingAddByRSSChannelService();
+            const followingAccounts = yield accountFollowingAccountService.getFollowedAccountsPrivate(account_id, {
+                relations: ['following_account']
+            });
+            const followingChannels = yield accountFollowingChannelService.getFollowedChannels(account_id, null, {
+                relations: ['channel', 'channel.feed']
+            });
+            const followingPlaylists = yield accountFollowingPlaylistService.getFollowedPlaylistsPrivate(account_id, {
+                relations: ['playlist', 'playlist.account']
+            });
+            const followingAddByRSSChannels = yield accountFollowingAddByRSSChannelService.getFollowedAddByRSSChannels(account_id);
+            // Get user's playlists
+            const playlistService = new playlist_1.PlaylistService();
+            const playlistResourceService = new playlistResource_1.PlaylistResourceService();
+            const [playlists] = yield playlistService.getManyPrivate(account_id, null, {
+                relations: ['playlist_resources']
+            });
+            // Get user's clips
+            const clipService = new clip_1.ClipService();
+            const clips = yield clipService.getManyByAccount(account_id);
+            // Get user's queues
+            const queueService = new queue_1.QueueService();
+            const queueResourceService = new queueResource_1.QueueResourceService();
+            const queues = yield queueService.getAllPrivate(account_id);
+            const getMinimalItemInfo = (item) => {
+                var _a;
+                if (!item)
+                    return null;
+                return {
+                    id_text: item.id_text,
+                    title: (_a = item.title) !== null && _a !== void 0 ? _a : null,
+                    pub_date: item.pub_date ? item.pub_date.toISOString() : null,
+                    channel: item.channel ? {
+                        id_text: item.channel.id_text,
+                        title: item.channel.title,
+                        feed: item.channel.feed ? {
+                            url: item.channel.feed.url
+                        } : null
+                    } : null
+                };
+            };
+            const getMinimalClipInfo = (clip) => {
+                var _a, _b, _c;
+                if (!clip)
+                    return null;
+                return {
+                    id_text: clip.id_text,
+                    title: (_a = clip.title) !== null && _a !== void 0 ? _a : null,
+                    start_time: clip.start_time,
+                    end_time: (_b = clip.end_time) !== null && _b !== void 0 ? _b : null,
+                    created_at: clip.created_at.toISOString(),
+                    item: getMinimalItemInfo((_c = clip.item) !== null && _c !== void 0 ? _c : null)
+                };
+            };
+            // Process playlists with resources
+            const playlistsData = yield Promise.all(playlists.map((playlist) => __awaiter(this, void 0, void 0, function* () {
+                const resources = yield playlistResourceService.getManyByPlaylistIdText(playlist.id_text, account_id, {
+                    relations: [
+                        'item', 'item.channel', 'item.channel.feed',
+                        'clip', 'clip.item', 'clip.item.channel', 'clip.item.channel.feed',
+                        'item_soundbite', 'item_soundbite.item', 'item_soundbite.item.channel', 'item_soundbite.item.channel.feed'
+                    ]
+                });
+                const playlistResourcesData = resources.map((resource) => {
+                    const resourceData = {
+                        list_position: resource.list_position
+                    };
+                    if (resource.item) {
+                        resourceData.item = getMinimalItemInfo(resource.item);
+                    }
+                    if (resource.clip) {
+                        resourceData.clip = getMinimalClipInfo(resource.clip);
+                    }
+                    if (resource.item_soundbite) {
+                        resourceData.item_soundbite = {
+                            id: resource.item_soundbite.id,
+                            item: getMinimalItemInfo(resource.item_soundbite.item)
+                        };
+                    }
+                    if (resource.add_by_rss_hash_id) {
+                        resourceData.add_by_rss_hash_id = resource.add_by_rss_hash_id;
+                    }
+                    if (resource.add_by_rss_resource_data) {
+                        resourceData.add_by_rss_resource_data = resource.add_by_rss_resource_data;
+                    }
+                    return resourceData;
+                });
+                return {
+                    id_text: playlist.id_text,
+                    title: playlist.title,
+                    description: playlist.description,
+                    is_default_favorites: playlist.is_default_favorites,
+                    item_count: playlist.item_count,
+                    last_updated: playlist.last_updated,
+                    medium_id: playlist.medium_id,
+                    sharable_status_id: playlist.sharable_status_id,
+                    playlist_resources: playlistResourcesData
+                };
+            })));
+            // Process clips
+            const clipsData = yield Promise.all(clips.map((clip) => __awaiter(this, void 0, void 0, function* () {
+                // Need to load item with channel and feed
+                const clipWithRelations = yield clipService.getByIdText(clip.id_text, {
+                    relations: ['item', 'item.channel', 'item.channel.feed']
+                });
+                return {
+                    id_text: clip.id_text,
+                    title: clip.title,
+                    description: clip.description,
+                    start_time: clip.start_time,
+                    end_time: clip.end_time,
+                    created_at: clip.created_at,
+                    sharable_status_id: clip.sharable_status_id,
+                    item: (clipWithRelations === null || clipWithRelations === void 0 ? void 0 : clipWithRelations.item) ? getMinimalItemInfo(clipWithRelations.item) : null
+                };
+            })));
+            // Process queues with resources
+            const queuesData = yield Promise.all(queues.map((queue) => __awaiter(this, void 0, void 0, function* () {
+                // Get all queue resources for this queue (both history and upcoming)
+                const [historyResources] = yield queueResourceService.getHistoryResourcesByQueueIdText(queue.id_text, {
+                    relations: queueResource_1.listResourceRelations
+                });
+                const upcomingResources = yield queueResourceService.getAllUpcomingByQueueIdText(queue.id_text);
+                // Combine all resources, sorted by list_position
+                const allQueueResources = [...historyResources, ...upcomingResources].sort((a, b) => parseFloat(a.list_position) - parseFloat(b.list_position));
+                const queueResourcesData = allQueueResources.map((resource) => {
+                    const resourceData = {
+                        list_position: resource.list_position,
+                        playback_position: resource.playback_position,
+                        media_file_duration: resource.media_file_duration,
+                        completed: resource.completed
+                    };
+                    if (resource.item) {
+                        resourceData.item = getMinimalItemInfo(resource.item);
+                    }
+                    if (resource.clip) {
+                        resourceData.clip = getMinimalClipInfo(resource.clip);
+                    }
+                    if (resource.item_soundbite) {
+                        resourceData.item_soundbite = {
+                            id: resource.item_soundbite.id,
+                            item: getMinimalItemInfo(resource.item_soundbite.item)
+                        };
+                    }
+                    if (resource.add_by_rss_hash_id) {
+                        resourceData.add_by_rss_hash_id = resource.add_by_rss_hash_id;
+                    }
+                    if (resource.add_by_rss_resource_data) {
+                        resourceData.add_by_rss_resource_data = resource.add_by_rss_resource_data;
+                    }
+                    return resourceData;
+                });
+                return {
+                    id_text: queue.id_text,
+                    medium_id: queue.medium_id,
+                    is_active_queue: queue.is_active_queue,
+                    queue_resources: queueResourcesData
+                };
+            })));
+            // Build export data
+            const exportData = {
+                export_date: new Date().toISOString(),
+                account: accountData,
+                following: {
+                    accounts: followingAccounts.map(fa => ({
+                        id_text: fa.following_account.id_text,
+                        verified: fa.following_account.verified
+                    })),
+                    channels: followingChannels.map(fc => ({
+                        id_text: fc.channel.id_text,
+                        title: fc.channel.title,
+                        feed: fc.channel.feed ? {
+                            url: fc.channel.feed.url
+                        } : null
+                    })),
+                    playlists: followingPlaylists.map(fp => {
+                        var _a;
+                        return ({
+                            id_text: fp.playlist.id_text,
+                            title: (_a = fp.playlist.title) !== null && _a !== void 0 ? _a : null,
+                            account: fp.playlist.account ? {
+                                id_text: fp.playlist.account.id_text
+                            } : null
+                        });
+                    }),
+                    add_by_rss_channels: followingAddByRSSChannels.map(fr => ({
+                        feed_url: fr.feed_url,
+                        title: fr.title,
+                        image_url: fr.image_url
+                    }))
+                },
+                playlists: playlistsData,
+                clips: clipsData,
+                queues: queuesData
+            };
+            return exportData;
+        });
+    }
+}
+exports.AccountDataExportService = AccountDataExportService;

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

@@ -13,5 +13,9 @@ export declare class AccountFollowingChannelService extends BaseManyService<Acco
     }>;
     followChannel(account_id: number, channel_id_text: string): Promise<AccountFollowingChannel>;
     unfollowChannel(account_id: number, channel_id_text: string): Promise<void>;
+    getFollowedChannelsByAccountIdTextWithCount(account_id_text: string, mediumType?: QueryParamsMedium | null, config?: FindManyOptions<AccountFollowingChannel>): Promise<{
+        count: number;
+        results: AccountFollowingChannel[];
+    }>;
 }
 //# sourceMappingURL=accountFollowingChannel.d.ts.map

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

@@ -1 +1 @@
-{"version":3,"file":"accountFollowingChannel.d.ts","sourceRoot":"","sources":["../../../src/services/account/accountFollowingChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAAwC,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC3F,OAAO,EAAE,aAAa,EAAS,eAAe,EAAM,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAIrE,qBAAa,8BAA+B,SAAQ,eAAe,CAAC,uBAAuB,EAAE,SAAS,CAAC;IACrG,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,cAAc,CAAiB;gBAE3B,0BAA0B,CAAC,EAAE,aAAa;IAMhD,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,GAAG,IAAI,EAChF,MAAM,CAAC,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAuBlF,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,GAAG,IAAI,EACzF,MAAM,CAAC,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC;QAC1D,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,uBAAuB,EAAE,CAAA;KAAE,CAAC;IAwBlD,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAoB5F,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;CAalF"}
+{"version":3,"file":"accountFollowingChannel.d.ts","sourceRoot":"","sources":["../../../src/services/account/accountFollowingChannel.ts"],"names":[],"mappings":"AAAA,OAAO,EAA4B,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAS,eAAe,EAAM,MAAM,SAAS,CAAC;AACpE,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AAKrE,qBAAa,8BAA+B,SAAQ,eAAe,CAAC,uBAAuB,EAAE,SAAS,CAAC;IACrG,OAAO,CAAC,cAAc,CAAiB;IACvC,OAAO,CAAC,cAAc,CAAiB;gBAE3B,0BAA0B,CAAC,EAAE,aAAa;IAMhD,mBAAmB,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,GAAG,IAAI,EAChF,MAAM,CAAC,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC,uBAAuB,EAAE,CAAC;IAuBlF,4BAA4B,CAAC,UAAU,EAAE,MAAM,EAAE,UAAU,EAAE,iBAAiB,GAAG,IAAI,EACzF,MAAM,CAAC,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAAG,OAAO,CAAC;QAC1D,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,uBAAuB,EAAE,CAAA;KAAE,CAAC;IA0BlD,aAAa,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,uBAAuB,CAAC;IAoB5F,eAAe,CAAC,UAAU,EAAE,MAAM,EAAE,eAAe,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAc3E,2CAA2C,CAC/C,eAAe,EAAE,MAAM,EACvB,UAAU,GAAE,iBAAiB,GAAG,IAAW,EAC3C,MAAM,CAAC,EAAE,eAAe,CAAC,uBAAuB,CAAC,GAChD,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,uBAAuB,EAAE,CAAA;KAAE,CAAC;CAyBlE"}

package/dist/services/account/accountFollowingChannel.js

@@ -16,6 +16,7 @@ const accountFollowingChannel_1 = require("@orm/entities/account/accountFollowin
 const baseManyService_1 = require("@orm/services/base/baseManyService");
 const account_1 = require("@orm/services/account/account");
 const channel_1 = require("../channel/channel");
+const feedFlagStatus_1 = require("@orm/entities/feed/feedFlagStatus");
 class AccountFollowingChannelService extends baseManyService_1.BaseManyService {
     constructor(transactionalEntityManager) {
         super(accountFollowingChannel_1.AccountFollowingChannel, 'account', transactionalEntityManager);
@@ -46,10 +47,10 @@ class AccountFollowingChannelService extends baseManyService_1.BaseManyService {
             }
             const where = {
                 account_id: (0, typeorm_1.Equal)(account.id),
+                channel: Object.assign({ feed: {
+                        feed_flag_status: (0, typeorm_1.In)([feedFlagStatus_1.FeedFlagStatusStatusEnum.Active, feedFlagStatus_1.FeedFlagStatusStatusEnum.AlwaysParse])
+                    } }, (medium_ids ? { medium_id: (0, typeorm_1.In)(medium_ids) } : {}))
             };
-            if (medium_ids) {
-                where['channel'] = { medium_id: (0, typeorm_1.In)(medium_ids) };
-            }
             const finalConfig = Object.assign(Object.assign({}, config), { where });
             return this._getAllWithCount(account, finalConfig);
         });
@@ -81,5 +82,22 @@ class AccountFollowingChannelService extends baseManyService_1.BaseManyService {
             return this._delete(account, { channel_id: channel.id });
         });
     }
+    getFollowedChannelsByAccountIdTextWithCount(account_id_text_1) {
+        return __awaiter(this, arguments, void 0, function* (account_id_text, mediumType = null, config) {
+            const medium_ids = mediumType ? (0, podverse_helpers_1.getMediumIdArrayFromType)(mediumType) : null;
+            const account = yield this.accountService.getByIdText(account_id_text);
+            if (!account) {
+                throw new Error("Account not found.");
+            }
+            const where = {
+                account_id: (0, typeorm_1.Equal)(account.id),
+                channel: Object.assign({ feed: {
+                        feed_flag_status: (0, typeorm_1.In)([feedFlagStatus_1.FeedFlagStatusStatusEnum.Active, feedFlagStatus_1.FeedFlagStatusStatusEnum.AlwaysParse])
+                    } }, (medium_ids ? { medium_id: (0, typeorm_1.In)(medium_ids) } : {}))
+            };
+            const finalConfig = Object.assign(Object.assign({}, config), { where });
+            return this._getAllWithCount(account, finalConfig);
+        });
+    }
 }
 exports.AccountFollowingChannelService = AccountFollowingChannelService;

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

@@ -1 +1 @@
-{"version":3,"file":"accountProfile.d.ts","sourceRoot":"","sources":["../../../src/services/account/accountProfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAC;AAEF,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,cAAc,EAAE,SAAS,CAAC;gBACtE,0BAA0B,CAAC,EAAE,aAAa;IAIhD,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC;CAQhF"}
+{"version":3,"file":"accountProfile.d.ts","sourceRoot":"","sources":["../../../src/services/account/accountProfile.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AACxC,OAAO,EAAE,OAAO,EAAE,MAAM,+BAA+B,CAAC;AACxD,OAAO,EAAE,cAAc,EAAE,MAAM,sCAAsC,CAAC;AACtE,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,YAAY,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;IAC7B,GAAG,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CACrB,CAAC;AAEF,qBAAa,qBAAsB,SAAQ,cAAc,CAAC,cAAc,EAAE,SAAS,CAAC;gBACtE,0BAA0B,CAAC,EAAE,aAAa;IAIhD,MAAM,CAAC,OAAO,EAAE,OAAO,EAAE,GAAG,EAAE,iBAAiB,GAAG,OAAO,CAAC,cAAc,CAAC;CAuBhF"}

package/dist/services/account/accountProfile.js

@@ -21,9 +21,23 @@ class AccountProfileService extends baseOneService_1.BaseOneService {
             _update: { get: () => super._update }
         });
         return __awaiter(this, void 0, void 0, function* () {
+            var _a, _b;
+            // Trim display_name and set to null if empty/whitespace
+            let display_name = (_a = dto.display_name) !== null && _a !== void 0 ? _a : null;
+            if (display_name !== null && typeof display_name === 'string') {
+                display_name = display_name.trim();
+                if (display_name === '') {
+                    display_name = null;
+                }
+            }
+            // Trim bio
+            let bio = (_b = dto.bio) !== null && _b !== void 0 ? _b : null;
+            if (bio !== null && typeof bio === 'string') {
+                bio = bio ? bio.trim() : null;
+            }
             const finalDto = {
-                display_name: dto.display_name,
-                bio: dto.bio
+                display_name,
+                bio
             };
             return _super._update.call(this, account, finalDto);
         });

package/dist/services/base/baseGetOnlyService.js

@@ -10,10 +10,10 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseGetOnlyService = void 0;
-const db_1 = require("@orm/db");
+const context_1 = require("@orm/context");
 class BaseGetOnlyService {
     constructor(entity) {
-        this.repositoryRead = db_1.AppDataSourceRead.getRepository(entity);
+        this.repositoryRead = (0, context_1.getDataSourceRead)().getRepository(entity);
     }
     get(id, config) {
         return __awaiter(this, void 0, void 0, function* () {

package/dist/services/base/baseManyService.d.ts

@@ -10,6 +10,7 @@ export declare class BaseManyService<T extends ObjectLiteral, K extends keyof T>
     constructor(targetEntity: {
         new (): T;
     }, parentEntityKey: K, transactionalEntityManager?: EntityManager);
+    private getParentWhereValue;
     _getAll(parentEntity: T[K], config?: FindManyOptions<T>): Promise<T[]>;
     _getAllWithCount(parentEntity: T[K], config?: FindManyOptions<T>): Promise<{
         count: number;

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

@@ -1 +1 @@
-{"version":3,"file":"baseManyService.d.ts","sourceRoot":"","sources":["../../../src/services/base/baseManyService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAoB,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAMtH,qBAAa,eAAe,CAAC,CAAC,SAAS,aAAa,EAAE,CAAC,SAAS,MAAM,CAAC;IACrE,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACxC,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7C,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC;IAC7B,SAAS,CAAC,YAAY,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,CAAC;IACtC,OAAO,CAAC,0BAA0B,CAAC,CAAgB;gBAEvC,YAAY,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,EAAE,eAAe,EAAE,CAAC,EAAE,0BAA0B,CAAC,EAAE,aAAa;IAQ1F,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAKtE,gBAAgB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,CAAC,EAAE,CAAA;KAAE,CAAC;IAM3G,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAQ/G,OAAO,CAClB,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAClB,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,4DAA4D;IACpF,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EACf,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,EAC1B,cAAc,CAAC,EAAE,CAAC,GAChB,OAAO,CAAC,CAAC,CAAC;IA6BD,WAAW,CACtB,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAClB,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EACtB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAClB,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GACzB,OAAO,CAAC,CAAC,EAAE,CAAC;IAsDF,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAcnF,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAOpD"}
+{"version":3,"file":"baseManyService.d.ts","sourceRoot":"","sources":["../../../src/services/base/baseManyService.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,cAAc,EAAoB,aAAa,EAAE,UAAU,EAAE,MAAM,SAAS,CAAC;AAKtH,qBAAa,eAAe,CAAC,CAAC,SAAS,aAAa,EAAE,CAAC,SAAS,MAAM,CAAC;IACrE,SAAS,CAAC,cAAc,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IACxC,SAAS,CAAC,mBAAmB,EAAE,UAAU,CAAC,CAAC,CAAC,CAAC;IAC7C,SAAS,CAAC,eAAe,EAAE,CAAC,CAAC;IAC7B,SAAS,CAAC,YAAY,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,CAAC;IACtC,OAAO,CAAC,0BAA0B,CAAC,CAAgB;gBAEvC,YAAY,EAAE;QAAE,QAAQ,CAAC,CAAA;KAAE,EAAE,eAAe,EAAE,CAAC,EAAE,0BAA0B,CAAC,EAAE,aAAa;IAQvG,OAAO,CAAC,mBAAmB;IAOd,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,EAAE,CAAC;IAMtE,gBAAgB,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,MAAM,CAAC,EAAE,eAAe,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC;QAAE,KAAK,EAAE,MAAM,CAAC;QAAC,OAAO,EAAE,CAAC,EAAE,CAAA;KAAE,CAAC;IAO3G,IAAI,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,MAAM,EAAC,OAAO,CAAC,EAAE,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,CAAC,GAAG,IAAI,CAAC;IAS/G,OAAO,CAClB,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAClB,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EAAE,4DAA4D;IACpF,GAAG,EAAE,OAAO,CAAC,CAAC,CAAC,EACf,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,EAC1B,cAAc,CAAC,EAAE,CAAC,GAChB,OAAO,CAAC,CAAC,CAAC;IA8BD,WAAW,CACtB,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAClB,SAAS,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,EACtB,IAAI,EAAE,OAAO,CAAC,CAAC,CAAC,EAAE,EAClB,MAAM,CAAC,EAAE,cAAc,CAAC,CAAC,CAAC,GACzB,OAAO,CAAC,CAAC,EAAE,CAAC;IAsDF,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,EAAE,cAAc,EAAE,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAcnF,UAAU,CAAC,KAAK,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAOpD"}

package/dist/services/base/baseManyService.js

@@ -10,34 +10,42 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.BaseManyService = void 0;
-const db_1 = require("@orm/db");
+const context_1 = require("@orm/context");
 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;
         this.parentEntityKey = parentEntityKey;
-        this.repositoryRead = db_1.AppDataSourceRead.getRepository(targetEntity);
-        this.repositoryReadWrite = db_1.AppDataSourceReadWrite.getRepository(targetEntity);
+        this.repositoryRead = (0, context_1.getDataSourceRead)().getRepository(targetEntity);
+        this.repositoryReadWrite = (0, context_1.getDataSourceReadWrite)().getRepository(targetEntity);
         this.transactionalEntityManager = transactionalEntityManager;
     }
+    getParentWhereValue(parentEntity) {
+        if (parentEntity && typeof parentEntity === 'object' && 'id' in parentEntity) {
+            return { id: parentEntity.id };
+        }
+        return parentEntity;
+    }
     _getAll(parentEntity, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const where = { [this.parentEntityKey]: parentEntity };
+            const parentWhereValue = this.getParentWhereValue(parentEntity);
+            const where = { [this.parentEntityKey]: parentWhereValue };
             return this.repositoryRead.find(Object.assign({ where }, config));
         });
     }
     _getAllWithCount(parentEntity, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const where = { [this.parentEntityKey]: parentEntity };
+            const parentWhereValue = this.getParentWhereValue(parentEntity);
+            const where = { [this.parentEntityKey]: parentWhereValue };
             const [results, count] = yield this.repositoryRead.findAndCount(Object.assign({ where }, config));
             return { count, results };
         });
     }
     _get(parentEntity, whereKeyValues, config) {
         return __awaiter(this, void 0, void 0, function* () {
-            const where = Object.assign({ [this.parentEntityKey]: parentEntity }, whereKeyValues);
+            const parentWhereValue = this.getParentWhereValue(parentEntity);
+            const where = Object.assign({ [this.parentEntityKey]: parentWhereValue }, whereKeyValues);
             return this.repositoryRead.findOne(Object.assign({ where }, config));
         });
     }
@@ -63,8 +71,9 @@ class BaseManyService {
                 return entity;
             }
             entity = (0, applyProperties_1.applyProperties)(entity, dto);
-            loggerService_1.loggerService.debug(`Updating entity ${JSON.stringify(entity)}`);
-            loggerService_1.loggerService.debug(`With DTO ${JSON.stringify(dto)}`);
+            const loggerService = (0, context_1.getLoggerService)();
+            loggerService.debug(`Updating entity ${JSON.stringify(entity)}`);
+            loggerService.debug(`With DTO ${JSON.stringify(dto)}`);
             return ((_a = this.transactionalEntityManager) !== null && _a !== void 0 ? _a : this.repositoryReadWrite).save(entity);
         });
     }
@@ -73,7 +82,7 @@ class BaseManyService {
             var _a, _b;
             const existingEntities = yield this._getAll(parentEntity);
             const existingIdentifiers = dtos.map((dto) => {
-                let identifier = {};
+                const identifier = {};
                 for (const whereKey of whereKeys) {
                     identifier[whereKey] = dto[whereKey];
                 }
@@ -100,7 +109,7 @@ class BaseManyService {
             }
             yield ((_a = this.transactionalEntityManager) !== null && _a !== void 0 ? _a : this.repositoryReadWrite).save(updatedEntities);
             const entitiesToDelete = existingEntities.filter(existingEntity => {
-                let identifier = {};
+                const identifier = {};
                 for (const whereKey of whereKeys) {
                     identifier[whereKey] = existingEntity[whereKey];
                 }

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":"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;IAwB7E,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;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;IAyB7E,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;CAMxD"}