summaryrefslogtreecommitdiff
path: root/src/api/common
diff options
context:
space:
mode:
authorotofune <otofune@gmail.com>2017-11-14 04:28:51 +0900
committerotofune <otofune@gmail.com>2017-11-14 04:29:30 +0900
commit47f98fbab76e8680f5a7c99037b3b237c7256ca2 (patch)
treeec58fd3b4541199ff70231fc9024fc9d35900add /src/api/common
parentadd-file-to-drive - hashがstreamを受ける時、hashもまたstreamなのだ (diff)
downloadsharkey-47f98fbab76e8680f5a7c99037b3b237c7256ca2.tar.gz
sharkey-47f98fbab76e8680f5a7c99037b3b237c7256ca2.tar.bz2
sharkey-47f98fbab76e8680f5a7c99037b3b237c7256ca2.zip
バグ修正
Diffstat (limited to 'src/api/common')
-rw-r--r--src/api/common/add-file-to-drive.ts35
1 files changed, 18 insertions, 17 deletions
diff --git a/src/api/common/add-file-to-drive.ts b/src/api/common/add-file-to-drive.ts
index 5f7d255e4b..1c8965e31d 100644
--- a/src/api/common/add-file-to-drive.ts
+++ b/src/api/common/add-file-to-drive.ts
@@ -214,7 +214,7 @@ export default (
const readable = fs.createReadStream(path);
- return addToGridFS(name, readable, mime, {
+ return addToGridFS(detectedName, readable, mime, {
user_id: user._id,
folder_id: folder !== null ? folder._id : null,
comment: comment,
@@ -224,25 +224,26 @@ export default (
.then(file => {
log(`drive file has been created ${file._id}`);
resolve(file);
- return serialize(file);
- })
- .then(serializedFile => {
- // Publish drive_file_created event
- event(user._id, 'drive_file_created', fileObj);
- // Register to search database
- if (config.elasticsearch.enable) {
- const es = require('../../db/elasticsearch');
- es.index({
- index: 'misskey',
- type: 'drive_file',
- id: file._id.toString(),
- body: {
- name: file.name,
- user_id: user._id.toString()
+ serialize(file)
+ .then(serializedFile => {
+ // Publish drive_file_created event
+ event(user._id, 'drive_file_created', serializedFile);
+
+ // Register to search database
+ if (config.elasticsearch.enable) {
+ const es = require('../../db/elasticsearch');
+ es.index({
+ index: 'misskey',
+ type: 'drive_file',
+ id: file._id.toString(),
+ body: {
+ name: file.name,
+ user_id: user._id.toString()
+ }
+ });
}
});
- }
})
.catch(reject);
});