From 7b29e7cf7e565923c1529d750530a03bbd9907e3 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 Apr 2019 20:41:32 +0900 Subject: [PATCH 1/3] Fix bug --- src/client/app/common/views/components/uploader.vue | 4 ++-- 1 file changed, 2 insertions(+), 2 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); }); }); }, From e8c8f67a0921f3a411767b397db69ea5c1380507 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 Apr 2019 20:47:47 +0900 Subject: [PATCH 2/3] Update post-form.vue Close #4792 Co-Authored-By: tamaina --- src/client/app/desktop/views/components/post-form.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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(() => { From 878cd18144c5e392acb5bfd15771ca2e1dc77360 Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 24 Apr 2019 20:51:14 +0900 Subject: [PATCH 3/3] 11.3.1 --- CHANGELOG.md | 5 +++++ package.json | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 96fb4c2098..e797664c12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -35,6 +35,11 @@ mongodb: 8. master ブランチに戻す 9. enjoy +11.3.1 (2019/04/24) +------------------- +### Fixes +* Webからファイルがアップロードできない問題を修正 + 11.3.0 (2019/04/24) ------------------- ### Improvements diff --git a/package.json b/package.json index 75532da2f9..00cbdc73c5 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "11.3.0", + "version": "11.3.1", "codename": "daybreak", "repository": { "type": "git",