From 308f357c4feb2e0911c33ce28af4c3a2fa7af869 Mon Sep 17 00:00:00 2001 From: mei23 Date: Thu, 26 Jul 2018 10:27:09 +0900 Subject: [PATCH 1/3] Set Content-Type to object-storage --- src/services/drive/add-file.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/services/drive/add-file.ts b/src/services/drive/add-file.ts index 91bf5b010c..dd41f4462f 100644 --- a/src/services/drive/add-file.ts +++ b/src/services/drive/add-file.ts @@ -25,7 +25,7 @@ async function save(readable: stream.Readable, name: string, type: string, hash: const minio = new Minio.Client(config.drive.config); const id = uuid.v4(); const obj = `${config.drive.prefix}/${id}`; - await minio.putObject(config.drive.bucket, obj, readable); + await minio.putObject(config.drive.bucket, obj, readable, size, { 'Content-Type': type }); Object.assign(metadata, { withoutChunks: true, From 04de0e9a500218851efbdee846dd083485e27f9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Thu, 26 Jul 2018 13:47:06 +0900 Subject: [PATCH 2/3] Update hashtags.vue --- src/client/app/common/views/widgets/hashtags.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/common/views/widgets/hashtags.vue b/src/client/app/common/views/widgets/hashtags.vue index 2065bd407c..56520400b6 100644 --- a/src/client/app/common/views/widgets/hashtags.vue +++ b/src/client/app/common/views/widgets/hashtags.vue @@ -11,7 +11,7 @@
- #{{ stat.tag }} + #{{ stat.tag }}

{{ '%i18n:@count%'.replace('{}', stat.usersCount) }}

From 085204592858202b28041b5427649ad1df62db24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Acid=20Chicken=20=28=E7=A1=AB=E9=85=B8=E9=B6=8F=29?= Date: Thu, 26 Jul 2018 13:48:08 +0900 Subject: [PATCH 3/3] Update misskey-flavored-markdown.ts --- .../app/common/views/components/misskey-flavored-markdown.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/client/app/common/views/components/misskey-flavored-markdown.ts b/src/client/app/common/views/components/misskey-flavored-markdown.ts index c93e09fb5f..1480c0325c 100644 --- a/src/client/app/common/views/components/misskey-flavored-markdown.ts +++ b/src/client/app/common/views/components/misskey-flavored-markdown.ts @@ -92,7 +92,7 @@ export default Vue.component('misskey-flavored-markdown', { case 'hashtag': return createElement('a', { attrs: { - href: `${url}/tags/${token.hashtag}`, + href: `${url}/tags/${encodeURIComponent(token.hashtag)}`, target: '_blank' } }, token.content);