From 31a1eaf3db9c46a68d7ef0d1be3a17618d4487c7 Mon Sep 17 00:00:00 2001 From: 10G Meow <10gmeow@gmail.com> Date: Sat, 6 May 2023 14:03:15 +0300 Subject: [PATCH 1/3] send multiple files at once --- src/components/Chat.vue | 257 +++++++++++++++++++++++----------------- 1 file changed, 146 insertions(+), 111 deletions(-) diff --git a/src/components/Chat.vue b/src/components/Chat.vue index 74f7ec7..d242d4f 100644 --- a/src/components/Chat.vue +++ b/src/components/Chat.vue @@ -186,26 +186,38 @@ + accept="image/*, audio/*, video/*, .pdf" class="d-none" multiple/> -
- +
+ - - -
- file: {{ currentImageInputPath.name }} - - {{ currentImageInput.scaledDimensions.width }} x {{ currentImageInput.scaledDimensions.height }} - - {{ currentImageInput.dimensions.width }} x {{ currentImageInput.dimensions.height }} - - ({{ formatBytes(currentImageInput.scaledSize) }}) - ({{ formatBytes(currentImageInputPath.size) }}) - -
+ + +
{{ currentSendError }}
{{ currentSendProgress }}
 @@ -338,8 +350,8 @@ export default { timelineWindowPaginating: false, scrollPosition: null, - currentImageInput: null, - currentImageInputPath: null, + currentImageInputs: null, + currentImageInputsPath: null, currentSendOperation: null, currentSendProgress: null, currentSendShowSendButton: true, @@ -423,6 +435,17 @@ export default { }, computed: { + isCurrentImageInputsPath() { + return Array.isArray(this.currentImageInputsPath) + }, + isCurrentImageInputsPathDialog: { + get() { + return this.isCurrentImageInputsPath + }, + set() { + this.currentImageInputsPath = null + } + }, chatContainer() { const container = this.$refs.chatContainer; if (this.useVoiceMode) { @@ -896,67 +919,73 @@ export default { this.$refs.attachment.click(); }, + optimizeImage(e,event,file) { + let currentImageInput = { + image: e.target.result, + dimensions: null, + }; + try { + currentImageInput.dimensions = sizeOf(dataUriToBuffer(e.target.result)); + + // Need to resize? + const w = currentImageInput.dimensions.width; + const h = currentImageInput.dimensions.height; + if (w > 640 || h > 640) { + var aspect = w / h; + var newWidth = parseInt((w > h ? 640 : 640 * aspect).toFixed()); + var newHeight = parseInt((w > h ? 640 / aspect : 640).toFixed()); + var imageResize = new ImageResize({ + format: "png", + width: newWidth, + height: newHeight, + outputType: "blob", + }); + imageResize + .play(event.target) + .then((img) => { + Vue.set( + currentImageInput, + "scaled", + new File([img], file.name, { + type: img.type, + lastModified: Date.now(), + }) + ); + Vue.set(currentImageInput, "useScaled", true); + Vue.set(currentImageInput, "scaledSize", img.size); + Vue.set(currentImageInput, "scaledDimensions", { + width: newWidth, + height: newHeight, + }); + }) + .catch((err) => { + console.error("Resize failed:", err); + }); + } + } catch (error) { + console.error("Failed to get image dimensions: " + error); + } + return currentImageInput + }, + handleFileReader(event, file) { + if (file) { + var reader = new FileReader(); + reader.onload = (e) => { + this.currentSendShowSendButton = true; + if (file.type.startsWith("image/")) { + const currentImageInput = this.optimizeImage(e, event, file) + this.currentImageInputs = Array.isArray(this.currentImageInputs) ? [...this.currentImageInputs, currentImageInput] : [currentImageInput] + } + this.currentImageInputsPath = Array.isArray(this.currentImageInputsPath) ? [...this.currentImageInputsPath, file] : [file]; + }; + reader.readAsDataURL(file); + } + }, /** * Handle picked attachment */ handlePickedAttachment(event) { - if (event.target.files && event.target.files[0]) { - var reader = new FileReader(); - reader.onload = (e) => { - const file = event.target.files[0]; - this.currentSendShowSendButton = true; - if (file.type.startsWith("image/")) { - this.currentImageInput = { - image: e.target.result, - dimensions: null, - }; - try { - this.currentImageInput.dimensions = sizeOf(dataUriToBuffer(e.target.result)); - - // Need to resize? - const w = this.currentImageInput.dimensions.width; - const h = this.currentImageInput.dimensions.height; - if (w > 640 || h > 640) { - var aspect = w / h; - var newWidth = parseInt((w > h ? 640 : 640 * aspect).toFixed()); - var newHeight = parseInt((w > h ? 640 / aspect : 640).toFixed()); - var imageResize = new ImageResize({ - format: "png", - width: newWidth, - height: newHeight, - outputType: "blob", - }); - imageResize - .play(event.target) - .then((img) => { - Vue.set( - this.currentImageInput, - "scaled", - new File([img], file.name, { - type: img.type, - lastModified: Date.now(), - }) - ); - Vue.set(this.currentImageInput, "useScaled", true); - Vue.set(this.currentImageInput, "scaledSize", img.size); - Vue.set(this.currentImageInput, "scaledDimensions", { - width: newWidth, - height: newHeight, - }); - }) - .catch((err) => { - console.error("Resize failed:", err); - }); - } - } catch (error) { - console.error("Failed to get image dimensions: " + error); - } - } - console.log(this.currentImageInput); - this.currentImageInputPath = file; - }; - reader.readAsDataURL(event.target.files[0]); - } + Object.values(event.target.files).forEach(file => this.handleFileReader(event, file)); }, showStickerPicker() { @@ -975,41 +1004,43 @@ export default { }); } }, - + sendImage(withText, inputFile) { + this.currentSendProgress = null; + this.currentSendOperation = util.sendImage( + this.$matrix.matrixClient, + this.roomId, + inputFile, + this.onUploadProgress + ); + this.currentSendOperation + .then(() => { + this.currentSendOperation = null; + this.currentImageInputs = null; + this.currentImageInputsPath = null; + this.currentSendProgress = null; + if (withText) { + this.sendMessage(withText); + } + }) + .catch((err) => { + if (err instanceof AbortError || err === "Abort") { + this.currentSendError = null; + } else { + this.currentSendError = err.LocaleString(); + } + this.currentSendOperation = null; + this.currentSendProgress = null; + }); + }, sendAttachment(withText) { this.$refs.attachment.value = null; - if (this.currentImageInputPath) { - var inputFile = this.currentImageInputPath; - if (this.currentImageInput && this.currentImageInput.scaled && this.currentImageInput.useScaled) { + if (this.isCurrentImageInputsPath) { + let inputFiles = this.currentImageInputsPath; + if (Array.isArray(this.currentImageInputs) && this.currentImageInputs.scaled && this.currentImageInputs.useScaled) { // Send scaled version of image instead! - inputFile = this.currentImageInput.scaled; + inputFiles = this.currentImageInputs.map(({scaled}) => scaled) } - this.currentSendProgress = null; - this.currentSendOperation = util.sendImage( - this.$matrix.matrixClient, - this.roomId, - inputFile, - this.onUploadProgress - ); - this.currentSendOperation - .then(() => { - this.currentSendOperation = null; - this.currentImageInput = null; - this.currentImageInputPath = null; - this.currentSendProgress = null; - if (withText) { - this.sendMessage(withText); - } - }) - .catch((err) => { - if (err instanceof AbortError || err === "Abort") { - this.currentSendError = null; - } else { - this.currentSendError = err.LocaleString(); - } - this.currentSendOperation = null; - this.currentSendProgress = null; - }); + inputFiles.forEach((inputFile) => this.sendImage(withText, inputFile)) } }, @@ -1019,8 +1050,8 @@ export default { this.currentSendOperation.abort(); } this.currentSendOperation = null; - this.currentImageInput = null; - this.currentImageInputPath = null; + this.currentImageInputs = null; + this.currentImageInputsPath = null; this.currentSendProgress = null; this.currentSendError = null; }, @@ -1399,8 +1430,12 @@ export default { }, onVoiceRecording(event) { + console.log('voice..') + console.log(event) + console.log(event.file) this.currentSendShowSendButton = false; - this.currentImageInputPath = event.file; + //this.currentImageInputsPath = event.file; + this.currentImageInputsPath = Array.isArray(this.currentImageInputsPath) ? [...this.currentImageInputsPath, event.file] : [event.file]; var text = undefined; if (this.currentInput && this.currentInput.length > 0) { text = this.currentInput; From 1282d6528c6a9cea6faab33fdc8b90466372b50a Mon Sep 17 00:00:00 2001 From: 10G Meow <10gmeow@gmail.com> Date: Thu, 18 May 2023 13:54:03 +0300 Subject: [PATCH 2/3] cleanup --- src/components/Chat.vue | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/components/Chat.vue b/src/components/Chat.vue index a551e1f..67e8f73 100644 --- a/src/components/Chat.vue +++ b/src/components/Chat.vue @@ -1472,11 +1472,7 @@ export default { }, onVoiceRecording(event) { - console.log('voice..') - console.log(event) - console.log(event.file) this.currentSendShowSendButton = false; - //this.currentImageInputsPath = event.file; this.currentImageInputsPath = Array.isArray(this.currentImageInputsPath) ? [...this.currentImageInputsPath, event.file] : [event.file]; var text = undefined; if (this.currentInput && this.currentInput.length > 0) { From 2b41e91908e21cedccb32cb79cc3f6f782ccc5f1 Mon Sep 17 00:00:00 2001 From: 10G Meow <10gmeow@gmail.com> Date: Sun, 28 May 2023 20:37:52 +0300 Subject: [PATCH 3/3] 1. review changes 2. improve different file type handling 3. File upload dialogue improvements which now shows all file type --- src/assets/translations/en.json | 6 +- src/components/Chat.vue | 113 ++++++++++++++++---------------- 2 files changed, 60 insertions(+), 59 deletions(-) diff --git a/src/assets/translations/en.json b/src/assets/translations/en.json index cc8c121..15fe496 100644 --- a/src/assets/translations/en.json +++ b/src/assets/translations/en.json @@ -90,7 +90,11 @@ "incoming_message_deleted_text": "This message was deleted.", "not_allowed_to_send": "Only admins and moderators are allowed to send to the room", "reaction_count_more": "{reactionCount} more", - "seen_by": "Seen by no members | Seen by 1 member | Seen by {count} members" + "seen_by": "Seen by no members | Seen by 1 member | Seen by {count} members", + "file": "File", + "files": "Files", + "images": "Images", + "send_attachements_dialog_title": "Do you want to send following attachments ?" }, "room": { "invitations": "You have no invitations | You have 1 invitation | You have {count} invitations", diff --git a/src/components/Chat.vue b/src/components/Chat.vue index 67e8f73..829f1e9 100644 --- a/src/components/Chat.vue +++ b/src/components/Chat.vue @@ -190,10 +190,13 @@ -
- +
+ -