10.21.2

オブジェクトストレージのURLに拡張子を含めるように
10.21.1
2018-10-16 20:59:49 +09:00 · 2018-10-16 20:59:36 +09:00 · 2018-10-16 20:34:32 +09:00 · 2018-10-16 20:33:13 +09:00 · 2018-10-16 20:29:35 +09:00
4 changed files with 8 additions and 6 deletions
@@ -1,8 +1,8 @@
 {
 	"name": "misskey",
 	"author": "syuilo <i@syuilo.com>",
-	"version": "10.21.0",
-	"clientVersion": "1.0.10615",
+	"version": "10.21.2",
+	"clientVersion": "1.0.10618",
 	"codename": "nighthike",
 	"main": "./built/index.js",
 	"private": true,
@@ -1,5 +1,5 @@
 <template>
-	<x-notes ref="timeline" :more="existMore ? more : null" :media-view="mediaView"/>
+<x-notes ref="timeline" :more="existMore ? more : null" :media-view="mediaView"/>
 </template>

 <script lang="ts">
@@ -15,7 +15,7 @@
 		<ui-switch v-model="column.isMediaView" @change="onChangeSettings">%i18n:@is-media-view%</ui-switch>
 	</div>
 	<x-list-tl v-if="column.type == 'list'" :list="column.list" :media-only="column.isMediaOnly" :media-view="column.isMediaView"/>
-	<x-hashtag-tl v-if="column.type == 'hashtag'" :tag-tl="$store.state.settings.tagTimelines.find(x => x.id == column.tagTlId)" :media-only="column.isMediaOnly" :media-view="column.isMediaView"/>
+	<x-hashtag-tl v-else-if="column.type == 'hashtag'" :tag-tl="$store.state.settings.tagTimelines.find(x => x.id == column.tagTlId)" :media-only="column.isMediaOnly" :media-view="column.isMediaView"/>
 	<x-tl v-else :src="column.type" :media-only="column.isMediaOnly" :media-view="column.isMediaView"/>
 </x-column>
 </template>
@@ -37,8 +37,10 @@ async function save(path: string, name: string, type: string, hash: string, size
 	if (config.drive && config.drive.storage == 'minio') {
 		const minio = new Minio.Client(config.drive.config);

-		const key = `${config.drive.prefix}/${uuid.v4()}`;
-		const thumbnailKey = `${config.drive.prefix}/${uuid.v4()}`;
+		const [ext] = (name.match(/\.([a-zA-Z0-9_-]+)$/) || ['']);
+
+		const key = `${config.drive.prefix}/${uuid.v4()}${ext}`;
+		const thumbnailKey = `${config.drive.prefix}/${uuid.v4()}.jpg`;

 		const baseUrl = config.drive.baseUrl
 			|| `${ config.drive.config.useSSL ? 'https' : 'http' }://${ config.drive.config.endPoint }${ config.drive.config.port ? `:${config.drive.config.port}` : '' }/${ config.drive.bucket }`;
Author	SHA1	Message	Date
syuilo	9703d613cf	10.21.2	2018-10-16 20:59:49 +09:00
syuilo	704e217dbb	オブジェクトストレージのURLに拡張子を含めるように	2018-10-16 20:59:36 +09:00
syuilo	a103032d94	10.21.1	2018-10-16 20:34:32 +09:00
syuilo	c7207a4bd7	Fix #2919	2018-10-16 20:33:13 +09:00
syuilo	35c65fe589	Clean up	2018-10-16 20:29:35 +09:00