From 38e80e4b1081be36a2ec4c9ae803fd1bb9013435 Mon Sep 17 00:00:00 2001
From: Travis Ralston <travpc@gmail.com>
Date: Sun, 7 Mar 2021 20:31:41 -0700
Subject: [PATCH] Return filename from remote downloads
Fixes https://github.com/turt2live/matrix-media-repo/issues/275
---
CHANGELOG.md | 1 +
.../download_controller/download_resource_handler.go | 6 +++++-
2 files changed, 6 insertions(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index d24b4cc1..627b1a1b 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -16,6 +16,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
* Fixed rich oEmbed URL previews (Twitter).
* Fixed photo oEmbed URL previews (Giphy).
* Fixed orientation parsing for some thumbnails.
+* Fixed file name being incorrect on the first download from remote servers.
## [1.2.4] - March 5th, 2021
diff --git a/controllers/download_controller/download_resource_handler.go b/controllers/download_controller/download_resource_handler.go
index 59e8349c..cbaad5d7 100644
--- a/controllers/download_controller/download_resource_handler.go
+++ b/controllers/download_controller/download_resource_handler.go
@@ -141,7 +141,11 @@ func downloadResourceWorkFn(request *resource_handler.WorkRequest) interface{} {
}
ctx.Log.Info("Remote media persisted under datastore ", media.DatastoreId, " at ", media.Location)
- return &workerDownloadResponse{media: media, contentType: media.ContentType}
+ return &workerDownloadResponse{
+ media: media,
+ contentType: media.ContentType,
+ filename: media.UploadName,
+ }
}
if info.blockForMedia {
--
GitLab