matrix/matrix-js-sdk
1
0
Fork 0
mirror of https://github.com/matrix-org/matrix-js-sdk.git synced 2025-11-23 17:02:25 +03:00
Code Activity

invert argument to make it positive without breaking backwards compat

Browse Source 
Signed-off-by: Michael Telatynski <7t3chguy@gmail.com>
This commit is contained in:
Michael Telatynski
2018-06-18 12:27:25 +01:00
parent c0b2151929
commit 7fe3e2f90a
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/base-apis.js
View File

@@ -1071,9 +1071,9 @@ MatrixBaseApis.prototype.searchUserDirectory = function(opts) {
* @param {string=} opts.name Name to give the file on the server. Defaults * @param {string=} opts.name Name to give the file on the server. Defaults
* to <tt>file.name</tt>. * to <tt>file.name</tt>.
* *
* @param {boolean=} opts.omitFilename if true will not send the filename, * @param {boolean=} opts.includeFilename if false will not send the filename,
* e.g for encrypted file uploads where filename leaks are undesirable. * e.g for encrypted file uploads where filename leaks are undesirable.
* Defaults to false. * Defaults to true.
* *
* @param {string=} opts.type Content-type for the upload. Defaults to * @param {string=} opts.type Content-type for the upload. Defaults to
* <tt>file.type</tt>, or <tt>applicaton/octet-stream</tt>. * <tt>file.type</tt>, or <tt>applicaton/octet-stream</tt>.

11
src/http-api.js
View File

@@ -118,9 +118,9 @@ module.exports.MatrixHttpApi.prototype = {
* @param {string=} opts.name Name to give the file on the server. Defaults * @param {string=} opts.name Name to give the file on the server. Defaults
* to <tt>file.name</tt>. * to <tt>file.name</tt>.
* *
* @param {boolean=} opts.omitFilename if true will not send the filename, * @param {boolean=} opts.includeFilename if false will not send the filename,
* e.g for encrypted file uploads where filename leaks are undesirable. * e.g for encrypted file uploads where filename leaks are undesirable.
* Defaults to false. * Defaults to true.
* *
* @param {string=} opts.type Content-type for the upload. Defaults to * @param {string=} opts.type Content-type for the upload. Defaults to
* <tt>file.type</tt>, or <tt>applicaton/octet-stream</tt>. * <tt>file.type</tt>, or <tt>applicaton/octet-stream</tt>.
@@ -156,6 +156,9 @@ module.exports.MatrixHttpApi.prototype = {
opts = {}; opts = {};
} }
// default opts.includeFilename to true (ignoring falsey values)
const includeFilename = opts.includeFilename !== false;
// if the file doesn't have a mime type, use a default since // if the file doesn't have a mime type, use a default since
// the HS errors if we don't supply one. // the HS errors if we don't supply one.
const contentType = opts.type || file.type || 'application/octet-stream'; const contentType = opts.type || file.type || 'application/octet-stream';
@@ -279,7 +282,7 @@ module.exports.MatrixHttpApi.prototype = {
const queryArgs = []; const queryArgs = [];
if (!opts.omitFilename && fileName) { if (includeFilename && fileName) {
queryArgs.push("filename=" + encodeURIComponent(fileName)); queryArgs.push("filename=" + encodeURIComponent(fileName));
} }
@@ -305,7 +308,7 @@ module.exports.MatrixHttpApi.prototype = {
} else { } else {
const queryParams = {}; const queryParams = {};
if (!opts.omitFilename && fileName) { if (includeFilename && fileName) {
queryParams.filename = fileName; queryParams.filename = fileName;
} }