Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[FIX] Downloading files when running in sub directory #14485

Merged
merged 12 commits into from
May 20, 2019
Merged

[FIX] Downloading files when running in sub directory #14485

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4e9811c
fix uploading file (#14472)
May 13, 2019
46c30f3
[FIX] fix file-upload (#14472)
May 13, 2019
3455ad1
solved
May 14, 2019
be8c49e
Merge branch 'develop' into develop-uploadfile
miolane May 15, 2019
1312b17
Merge branch 'develop' into develop-uploadfile
miolane May 16, 2019
22b7848
fix some other url bugs
May 16, 2019
19a1707
Merge branch 'develop' into develop-uploadfile
miolane May 16, 2019
ec47140
..
May 19, 2019
488ef42
Merge branch 'develop' into develop-uploadfile
tassoevan May 20, 2019
8b06374
Merge branch 'develop' into develop-uploadfile
tassoevan May 20, 2019
9f52d5b
Add more fixes to download URLs
tassoevan May 20, 2019
bd5f8c1
Fix merge conflict
tassoevan May 20, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion app/file-upload/server/methods/sendFileMessage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ 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 = {}) {
Expand All @@ -30,7 +31,10 @@ Meteor.methods({

Uploads.updateFileComplete(file._id, Meteor.userId(), _.omit(file, '_id'));

const fileUrl = `/file-upload/${ file._id }/${ encodeURI(file.name) }`;
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 attachment = {
title: file.name,
Expand Down