diff --git a/projects/ucap-webmessenger-api-common/src/lib/services/common-api.service.ts b/projects/ucap-webmessenger-api-common/src/lib/services/common-api.service.ts index 380f8adf..36c85f80 100644 --- a/projects/ucap-webmessenger-api-common/src/lib/services/common-api.service.ts +++ b/projects/ucap-webmessenger-api-common/src/lib/services/common-api.service.ts @@ -228,9 +228,18 @@ export class CommonApiService { ): Promise<{ accept: boolean; rejected: string[] }> { return new Promise<{ accept: boolean; rejected: string[] }>( async (resolve, reject) => { + const mediaFiles = this.mediaFiles(files); + if (!mediaFiles) { + resolve({ + accept: true, + rejected: undefined + }); + return; + } + let accept = true; const rejected: string[] = []; - for (const file of files) { + for (const file of mediaFiles) { const info = await MimeUtil.getMimeFromBlob(file); // console.log('mime info', info); if ( diff --git a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts index 6603e9c3..df24f98a 100644 --- a/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts +++ b/projects/ucap-webmessenger-app/src/app/layouts/messenger/components/messages.component.ts @@ -1140,41 +1140,35 @@ export class MessagesComponent implements OnInit, OnDestroy, AfterViewInit { return; } - const mediaFiles = this.commonApiService.mediaFiles( + const fakeMedia = await this.commonApiService.checkInvalidMediaMimeForFileTalk( fileUploadItems.map(fui => fui.file) ); - - if (!!mediaFiles) { - const fakeMedia = await this.commonApiService.checkInvalidMediaMimeForFileTalk( - mediaFiles - ); - if (!fakeMedia.accept) { - if (!!this.fileUploadQueue) { - this.fileUploadQueue.onUploadComplete(); - } - - this.snackBarService.openFromComponent< - AlertSnackbarComponent, - AlertSnackbarData - >(AlertSnackbarComponent, { - duration: 3000, - verticalPosition: 'bottom', - horizontalPosition: 'center', - data: { - html: this.translateService.instant( - 'common.file.errors.notAcceptableMime', - { - supporedType: - fakeMedia.rejected.length > 0 - ? fakeMedia.rejected.join(',') - : '' - } - ) - } - }); - - return; + if (!fakeMedia.accept) { + if (!!this.fileUploadQueue) { + this.fileUploadQueue.onUploadComplete(); } + + this.snackBarService.openFromComponent< + AlertSnackbarComponent, + AlertSnackbarData + >(AlertSnackbarComponent, { + duration: 3000, + verticalPosition: 'bottom', + horizontalPosition: 'center', + data: { + html: this.translateService.instant( + 'common.file.errors.notAcceptableMime', + { + supporedType: + fakeMedia.rejected.length > 0 + ? fakeMedia.rejected.join(',') + : '' + } + ) + } + }); + + return; } for (const fileUploadItem of fileUploadItems) {