summaryrefslogtreecommitdiff
path: root/src/client/app
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2019-04-24 20:51:34 +0900
committersyuilo <syuilotan@yahoo.co.jp>2019-04-24 20:51:34 +0900
commitafe2037985a954c9499400bd1cc03630a39e8441 (patch)
tree0f87d49ce5ba2392809607c8c07f39d06ca2e761 /src/client/app
parentMerge branch 'develop' (diff)
parent11.3.1 (diff)
downloadmisskey-afe2037985a954c9499400bd1cc03630a39e8441.tar.gz
misskey-afe2037985a954c9499400bd1cc03630a39e8441.tar.bz2
misskey-afe2037985a954c9499400bd1cc03630a39e8441.zip
Merge branch 'develop'
Diffstat (limited to 'src/client/app')
-rw-r--r--src/client/app/common/views/components/uploader.vue4
-rw-r--r--src/client/app/desktop/views/components/post-form.vue2
2 files changed, 3 insertions, 3 deletions
diff --git a/src/client/app/common/views/components/uploader.vue b/src/client/app/common/views/components/uploader.vue
index 134243bbd7..78fbcbf6b8 100644
--- a/src/client/app/common/views/components/uploader.vue
+++ b/src/client/app/common/views/components/uploader.vue
@@ -38,10 +38,10 @@ export default Vue.extend({
const data = new FormData();
data.append('md5', getMD5(fileData));
- this.$root.api('drive/files/check_existence', {
+ this.$root.api('drive/files/find-by-hash', {
md5: getMD5(fileData)
}).then(resp => {
- resolve(resp.file);
+ resolve(resp.length > 0 ? resp[0] : null);
});
});
},
diff --git a/src/client/app/desktop/views/components/post-form.vue b/src/client/app/desktop/views/components/post-form.vue
index 7d3593d9c9..1f33ea01fe 100644
--- a/src/client/app/desktop/views/components/post-form.vue
+++ b/src/client/app/desktop/views/components/post-form.vue
@@ -228,7 +228,7 @@ export default Vue.extend({
const draft = JSON.parse(localStorage.getItem('drafts') || '{}')[this.draftId];
if (draft) {
this.text = draft.data.text;
- this.files = draft.data.files;
+ this.files = (draft.data.files || []).filter(e => e);
if (draft.data.poll) {
this.poll = true;
this.$nextTick(() => {