Decrypt file info when restoring an e2e encrypted file, don't allow download of files with pending deletion

Author: Forceu

internal/storage/FileServing.go

@@ -774,7 +774,7 @@ func isPendingToBeDeleted(file models.File, timeNow int64) bool {
 // or if the provided timestamp is after the expiry timestamp
 func IsExpiredFile(file models.File, timeNow int64) bool {
 	return (file.ExpireAt < timeNow && !file.UnlimitedTime) ||
-		(file.DownloadsRemaining < 1 && !file.UnlimitedDownloads)
+		(file.DownloadsRemaining < 1 && !file.UnlimitedDownloads) || file.PendingDeletion != 0
 }
 
 // isExpiredFileWithoutDownload returns true if there is no active download for an expired file

internal/webserver/web/static/js/admin_ui_upload.js

@@ -959,6 +959,9 @@ function handleUndo(button) {
     apiFilesRestore(button.dataset.fileid)
         .then(data => {
             addRow(data.FileInfo);
+            if (isE2EEnabled) {
+            	GokapiE2EDecryptMenu();
+            }
         })
         .catch(error => {
             alert("Unable to restore file: " + error);