+
@@ -24,6 +25,7 @@
+
@@ -39,7 +41,9 @@ export default Vue.extend({
components: {
XDraggable
},
+
props: ['reply'],
+
data() {
return {
posting: false,
@@ -47,21 +51,27 @@ export default Vue.extend({
uploadings: [],
files: [],
poll: false,
- geo: null
+ geo: null,
+ useCw: false,
+ cw: null
};
},
+
mounted() {
this.$nextTick(() => {
this.focus();
});
},
+
methods: {
focus() {
(this.$refs.text as any).focus();
},
+
chooseFile() {
(this.$refs.file as any).click();
},
+
chooseFileFromDrive() {
(this as any).apis.chooseDriveFile({
multiple: true
@@ -69,23 +79,29 @@ export default Vue.extend({
files.forEach(this.attachMedia);
});
},
+
attachMedia(driveFile) {
this.files.push(driveFile);
this.$emit('change-attached-media', this.files);
},
+
detachMedia(file) {
this.files = this.files.filter(x => x.id != file.id);
this.$emit('change-attached-media', this.files);
},
+
onChangeFile() {
Array.from((this.$refs.file as any).files).forEach(this.upload);
},
+
upload(file) {
(this.$refs.uploader as any).upload(file);
},
+
onChangeUploadings(uploads) {
this.$emit('change-uploadings', uploads);
},
+
setGeo() {
if (navigator.geolocation == null) {
alert('お使いの端末は位置情報に対応していません');
@@ -100,15 +116,18 @@ export default Vue.extend({
enableHighAccuracy: true
});
},
+
removeGeo() {
this.geo = null;
},
+
clear() {
this.text = '';
this.files = [];
this.poll = false;
this.$emit('change-attached-media');
},
+
post() {
this.posting = true;
const viaMobile = (this as any).os.i.clientSettings.disableViaMobile !== true;
@@ -117,6 +136,7 @@ export default Vue.extend({
mediaIds: this.files.length > 0 ? this.files.map(f => f.id) : undefined,
replyId: this.reply ? this.reply.id : undefined,
poll: this.poll ? (this.$refs.poll as any).get() : undefined,
+ cw: this.useCw ? this.cw || '' : undefined,
geo: this.geo ? {
coordinates: [this.geo.longitude, this.geo.latitude],
altitude: this.geo.altitude,
@@ -133,10 +153,12 @@ export default Vue.extend({
this.posting = false;
});
},
+
cancel() {
this.$emit('cancel');
this.$destroy();
},
+
kao() {
this.text += getKao();
}
@@ -236,14 +258,12 @@ export default Vue.extend({
> .file
display none
+ > input
> textarea
display block
padding 12px
margin 0
width 100%
- max-width 100%
- min-width 100%
- min-height 80px
font-size 16px
color #333
border none
@@ -253,6 +273,11 @@ export default Vue.extend({
&:disabled
opacity 0.5
+ > textarea
+ max-width 100%
+ min-width 100%
+ min-height 80px
+
> .upload
> .drive
> .kao
diff --git a/src/models/note.ts b/src/models/note.ts
index 02801b62d..3c835ed19 100644
--- a/src/models/note.ts
+++ b/src/models/note.ts
@@ -24,7 +24,7 @@ export function isValidText(text: string): boolean {
}
export function isValidCw(text: string): boolean {
- return text.length <= 100 && text.trim() != '';
+ return text.length <= 100;
}
export type INote = {
diff --git a/src/server/api/endpoints/notes/create.ts b/src/server/api/endpoints/notes/create.ts
index 14e906eb9..ea1f41aae 100644
--- a/src/server/api/endpoints/notes/create.ts
+++ b/src/server/api/endpoints/notes/create.ts
@@ -23,11 +23,11 @@ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res
if (visibilityErr) return rej('invalid visibility');
// Get 'text' parameter
- const [text, textErr] = $(params.text).optional.string().pipe(isValidText).$;
+ const [text = null, textErr] = $(params.text).optional.nullable.string().pipe(isValidText).$;
if (textErr) return rej('invalid text');
// Get 'cw' parameter
- const [cw, cwErr] = $(params.cw).optional.string().pipe(isValidCw).$;
+ const [cw, cwErr] = $(params.cw).optional.nullable.string().pipe(isValidCw).$;
if (cwErr) return rej('invalid cw');
// Get 'viaMobile' parameter
@@ -187,14 +187,14 @@ module.exports = (params, user: ILocalUser, app: IApp) => new Promise(async (res
const note = await create(user, {
createdAt: new Date(),
media: files,
- poll: poll,
- text: text,
+ poll,
+ text,
reply,
renote,
- cw: cw,
- tags: tags,
- app: app,
- viaMobile: viaMobile,
+ cw,
+ tags,
+ app,
+ viaMobile,
visibility,
geo
});
diff --git a/src/services/note/create.ts b/src/services/note/create.ts
index 2380e64ce..e5ad96898 100644
--- a/src/services/note/create.ts
+++ b/src/services/note/create.ts
@@ -63,7 +63,7 @@ export default async (user: IUser, data: {
renoteId: data.renote ? data.renote._id : null,
text: data.text,
poll: data.poll,
- cw: data.cw,
+ cw: data.cw == null ? null : data.cw,
tags,
userId: user._id,
viaMobile: data.viaMobile,