summaryrefslogtreecommitdiff
path: root/src/server/api
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2019-07-08 13:46:31 +0900
committersyuilo <Syuilotan@yahoo.co.jp>2019-07-08 13:46:31 +0900
commit5343b005df9446c3cc13bdfb419db9b8720e5946 (patch)
treebc8c8bdf0da2d3d9237eed2a4f14309c6c26c410 /src/server/api
parentBetter display in narrow desktop and choosing client type; Fix #1442, Fix #21... (diff)
downloadsharkey-5343b005df9446c3cc13bdfb419db9b8720e5946.tar.gz
sharkey-5343b005df9446c3cc13bdfb419db9b8720e5946.tar.bz2
sharkey-5343b005df9446c3cc13bdfb419db9b8720e5946.zip
Improve paste uploading Resolve #3023 (#4542)
* resolve #3023 * fix * fix * better description * widget * fix text * Update post-form.vue * Fix enter-file-name dialog title text * Fix type * On messaging room * Replace moment.js to original one * Fix formatDateTimeString
Diffstat (limited to 'src/server/api')
-rw-r--r--src/server/api/endpoints/drive/files/create.ts10
1 files changed, 9 insertions, 1 deletions
diff --git a/src/server/api/endpoints/drive/files/create.ts b/src/server/api/endpoints/drive/files/create.ts
index 664a2b87b2..61055c5d18 100644
--- a/src/server/api/endpoints/drive/files/create.ts
+++ b/src/server/api/endpoints/drive/files/create.ts
@@ -35,6 +35,14 @@ export const meta = {
}
},
+ name: {
+ validator: $.optional.nullable.str,
+ default: null as any,
+ desc: {
+ 'ja-JP': 'ファイル名(拡張子があるなら含めて)'
+ }
+ },
+
isSensitive: {
validator: $.optional.either($.bool, $.str),
default: false,
@@ -72,7 +80,7 @@ export const meta = {
export default define(meta, async (ps, user, app, file, cleanup) => {
// Get 'name' parameter
- let name = file.originalname;
+ let name = ps.name || file.originalname;
if (name !== undefined && name !== null) {
name = name.trim();
if (name.length === 0) {