diff --git a/projects/main-site/src/api/controllers/mail-/mail-webhook.controller.ts b/projects/main-site/src/api/controllers/mail-/mail-webhook.controller.ts index e4e5a8b2..5f194260 100644 --- a/projects/main-site/src/api/controllers/mail-/mail-webhook.controller.ts +++ b/projects/main-site/src/api/controllers/mail-/mail-webhook.controller.ts @@ -72,7 +72,7 @@ export class MailWebhookController { { dest: environment.uploadFolder, limits: { - fileSize: CONSTANTS.fileSizeAttachmentChunkCloudflareLimit // Default Max Email 25 MB + fileSize: 25 * 1000 * 1000 // Default Max Email 25 MB } } ) diff --git a/projects/main-site/src/api/services/discord.service.ts b/projects/main-site/src/api/services/discord.service.ts index d1845467..91c5e711 100644 --- a/projects/main-site/src/api/services/discord.service.ts +++ b/projects/main-site/src/api/services/discord.service.ts @@ -253,19 +253,7 @@ export class DiscordService { async sendAttachment(attachment: AttachmentModel, user: UserModel = null, chunkIdx = null): Promise { let currentChunkIdx: number = 0; let chunkParent: string = attachment?.discord; - let chunkSize = CONSTANTS.fileSizeAttachmentChunkDiscordLimit; - // Fore Re-Fresh `.fetch()` - const botGuild = this.bot ? await this.bot.guilds.fetch(environment.discord.guild_id) : null; - if (botGuild) { - const totalBoosts = botGuild.premiumSubscriptionCount; - if (totalBoosts >= 14) { - chunkSize = 100 * 1000 * 1000; // Level 3 - } else if (totalBoosts >= 7) { - chunkSize = 50 * 1000 * 1000; // Level 2 - } else { - chunkSize = CONSTANTS.fileSizeAttachmentChunkDiscordLimit; - } - } + let chunkSize = CONSTANTS.fileSizeAttachmentChunkLimit; const crs = createReadStream( `${environment.uploadFolder}/${attachment.name}`, { diff --git a/projects/main-site/src/app/app.module.ts b/projects/main-site/src/app/app.module.ts index cfa20691..8191e396 100644 --- a/projects/main-site/src/app/app.module.ts +++ b/projects/main-site/src/app/app.module.ts @@ -81,15 +81,15 @@ import { environment } from '../environments/app/environment'; ), UploadxModule.withConfig({ autoUpload: false, - concurrency: 1, + concurrency: 2, endpoint: `${environment.apiUrl}/attachment`, headers: { 'ngsw-bypass': 'true' }, retryConfig: { - maxAttempts: 3 + maxAttempts: 8 }, - maxChunkSize: CONSTANTS.fileSizeAttachmentChunkCloudflareLimit + maxChunkSize: CONSTANTS.fileSizeAttachmentChunkLimit }) ], providers: [ diff --git a/projects/main-site/src/constants.ts b/projects/main-site/src/constants.ts index cb788f43..184d0dff 100644 --- a/projects/main-site/src/constants.ts +++ b/projects/main-site/src/constants.ts @@ -47,8 +47,7 @@ export const CONSTANTS = { 'application/x-zip', 'application/x-zip-compressed' ], - fileSizeAttachmentChunkCloudflareLimit: 32 * 1000 * 1000, // Cloudflare User Plan -- Free Is 100 MB ~ T.T - fileSizeAttachmentChunkDiscordLimit: 8 * 1000 * 1000, // Discord -- Without Nitro Is 8 MB ~ T.T + fileSizeAttachmentChunkLimit: 8 * 1000 * 1000, // Cloudflare User Plan -- Free Is 100 MB ~ T.T fileTypeAttachmentStreamable: [ 'mkv', 'mp4'