Webpack build for branch 11.1-dev: fd7cb41ee6

This commit is contained in:
Travis CI 2017-05-05 23:18:08 +00:00
parent 5ea6f19ae7
commit dc1d096fef
2 changed files with 18 additions and 10 deletions

View file

@ -7100,7 +7100,7 @@ class TextBasedChannel {
}
if (options.files) {
for (const i in options.files) {
for (let i = 0; i < options.files.length; i++) {
let file = options.files[i];
if (typeof file === 'string') file = { attachment: file };
if (!file.name) {
@ -9727,14 +9727,22 @@ class Webhook {
options = {};
}
if (options.file) {
if (typeof options.file === 'string') options.file = { attachment: options.file };
if (!options.file.name) {
if (typeof options.file.attachment === 'string') {
options.file.name = path.basename(options.file.attachment);
} else if (options.file.attachment && options.file.attachment.path) {
options.file.name = path.basename(options.file.attachment.path);
} else {
options.file.name = 'file.jpg';
if (options.files) options.files.push(options.file);
else options.files = [options.file];
}
if (options.files) {
for (let i = 0; i < options.files.length; i++) {
let file = options.files[i];
if (typeof file === 'string') file = { attachment: file };
if (!file.name) {
if (typeof file.attachment === 'string') {
file.name = path.basename(file.attachment);
} else if (file.attachment && file.attachment.path) {
file.name = path.basename(file.attachment.path);
} else {
file.name = 'file.jpg';
}
}
}
return this.client.resolver.resolveBuffer(options.file.attachment).then(file =>

File diff suppressed because one or more lines are too long