Merge pull request #1277 from Kamuso/dev/v6-upload

upload: don't mask image.png
bakape · Apr 10, 2021 · 0125709 · 0125709
2 parents b00e7d8 + b2c79ef
commit 0125709
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 1 deletion.
diff --git a/client/posts/posting/paste.ts b/client/posts/posting/paste.ts
@@ -76,6 +76,7 @@ function onPaste(e: ClipboardEvent) {
 			return
 		}
 
+		files[0]["pasted"] = true;
 		if (threadForm) {
 			(threadForm.querySelector("input[type=file]") as any).files = files
 			return

diff --git a/client/posts/posting/upload.ts b/client/posts/posting/upload.ts
@@ -189,7 +189,8 @@ export default class UploadForm extends View<Post> {
         // the file thumbnailed and we don't need to upload.
         const sha1 = await getSHA(file);
         if (sha1 !== "") {
-            if (this.inputElement("mask").checked) {
+            // Don't mask pasted files
+            if (this.inputElement("mask").checked && file["pasted"] != true) {
                 uploadName = sha1;
             }
             const res = await fetch("/api/upload-hash", {
@@ -383,6 +384,10 @@ async function maskFile(input: HTMLInputElement) {
     if (input.files.length === 0) {
         return;
     }
+    // Don't mask pasted files
+    if (input.files[0]["pasted"] == true) {
+        return;
+    }
     // File.name is immutable, replace contents of input element
     // with cloned+renamed file
     const blob = input.files[0];