Merge branch 'develop'

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

package.json

@@ -1,7 +1,7 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "11.3.0",
+	"version": "11.3.1",
 	"codename": "daybreak",
 	"repository": {
 		"type": "git",

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);
 				});
 			});
 		},

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(() => {