Add sendFile function (#562)

* sendFile

* Add default value to filename

* eslint

* (╯°□°)╯︵ ┻━┻
This commit is contained in:
Manuel Kraus
2016-08-29 20:01:05 +02:00
committed by Amish Shah
parent df934eccaf
commit d9ae732bfd
10 changed files with 87 additions and 9 deletions

View File

@@ -1,3 +1,7 @@
const path = require('path');
const fs = require('fs');
const request = require('superagent');
const getStructure = name => require(`../structures/${name}`);
const User = getStructure('User');
@@ -163,6 +167,41 @@ class ClientDataResolver {
return String(data);
}
/**
* Data that can be resolved to give a Buffer. This can be:
* * A Buffer
* * The path to a local file
* * An URL
* @typedef {String|Buffer} FileResolvable
*/
/**
* Resolves a FileResolvable to a Buffer
* @param {FileResolvable} fileResolvable the file resolvable to resolve
* @returns {String|Buffer}
*/
resolveFile(resource) {
if ($string(resource)) {
return new Promise((resolve, reject) => {
if (/^https?:\/\//.test(resource)) {
request.get(resource)
.set('Content-Type', 'blob')
.end((err, res) => err ? reject(err) : resolve(res.body));
} else {
const file = path.resolve(resource);
const stat = fs.statSync(file);
if (!stat.isFile()) {
return reject(new Error(`The file could not be found: ${file}`));
}
return resolve(fs.readFileSync(file));
}
});
}
return Promise.resolve(resource);
}
}
module.exports = ClientDataResolver;

View File

@@ -29,12 +29,14 @@ class APIRequest {
if (this.auth) {
apiRequest.set('authorization', this.getAuth());
}
if (this.file && this.file.file) {
apiRequest.set('Content-Type', 'multipart/form-data');
apiRequest.attach('file', this.file.file, this.file.name);
}
if (this.data) {
apiRequest.send(this.data);
}
if (this.file) {
apiRequest.attach('file', this.file.file, this.file.name);
}
apiRequest.set('User-Agent', this.rest.userAgentManager.userAgent);
return apiRequest;
}

View File

@@ -41,7 +41,7 @@ class RESTMethods {
});
}
sendMessage($channel, content, tts, nonce) {
sendMessage($channel, content, tts, nonce, file) {
return new Promise((resolve, reject) => {
const $this = this;
let channel = $channel;
@@ -49,7 +49,7 @@ class RESTMethods {
function req() {
$this.rest.makeRequest('post', Constants.Endpoints.channelMessages(channel.id), true, {
content, tts, nonce,
})
}, file)
.then(data => resolve($this.rest.client.actions.MessageCreate.handle(data).m))
.catch(reject);
}