solved

RocketChat · May 14, 2019 · 3455ad1 · 3455ad1
1 parent 46c30f3
commit 3455ad1
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/app/file-upload/server/methods/sendFileMessage.js b/app/file-upload/server/methods/sendFileMessage.js
@@ -6,7 +6,6 @@ import _ from 'underscore';
 import { Uploads } from '../../../models';
 import { callbacks } from '../../../callbacks';
 import { FileUpload } from '../lib/FileUpload';
-import { settings } from '../../../settings';
 
 Meteor.methods({
 	async sendFileMessage(roomId, store, file, msgData = {}) {
@@ -31,10 +30,7 @@ Meteor.methods({
 
 		Uploads.updateFileComplete(file._id, Meteor.userId(), _.omit(file, '_id'));
 
-		const siteUrl = settings.get('Site_Url');
-		const prefix = siteUrl.replace(/http(s)?:\/\/[a-z]*(\.[a-z]*)*(:[0-9]*)?/g, '');
-
-		const fileUrl = `${ prefix }/file-upload/${ file._id }/${ encodeURI(file.name) }`;
+		const fileUrl = `/file-upload/${ file._id }/${ encodeURI(file.name) }`;
 
 		const attachment = {
 			title: file.name,

diff --git a/app/message-attachments/client/messageAttachment.html b/app/message-attachments/client/messageAttachment.html
@@ -57,7 +57,7 @@
 					{{#if title_link}}
 						<a href="{{title_link}}" target="_blank" rel="noopener noreferrer">{{title}}</a>
 						{{#if title_link_download}}
-							<a class="attachment-download-icon rc-tooltip" aria-label="{{_ 'Download'}}" href="{{title_link}}" target="_blank" download="" rel="noopener noreferrer">{{> icon icon="download"}}</a>
+							<a class="attachment-download-icon rc-tooltip" aria-label="{{_ 'Download'}}" href="{{ getURL title_link}}" target="_blank" download="" rel="noopener noreferrer">{{> icon icon="download"}}</a>
 						{{/if}}
 					{{else}}
 						{{title}}

diff --git a/app/ui-flextab/client/tabs/uploadedFilesList.js b/app/ui-flextab/client/tabs/uploadedFilesList.js
@@ -141,7 +141,7 @@ Template.uploadedFilesList.events({
 									name: t('Download'),
 									action: () => {
 										const a = document.createElement('a');
-										a.href = this.file.url;
+										a.href = getURL(this.file.url);
 										a.download = this.file.name;
 										document.body.appendChild(a);
 										a.click();