natty
/
misskey-awawa
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/syuilo/misskey

This commit is contained in:
syuilo 2018-07-26 16:51:00 +09:00
parent d8b9a8715b 0995d5c5a2
commit 93786aa510
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/client/app/common/views/components/misskey-flavored-markdown.ts
View File

@ -92,7 +92,7 @@ export default Vue.component('misskey-flavored-markdown', {
case 'hashtag': case 'hashtag':
return createElement('a', { return createElement('a', {
attrs: { attrs: {
href: `${url}/tags/${token.hashtag}`, href: `${url}/tags/${encodeURIComponent(token.hashtag)}`,
target: '_blank' target: '_blank'
} }
}, token.content); }, token.content);

2
src/client/app/common/views/widgets/hashtags.vue
View File

@ -11,7 +11,7 @@
<div> <div>
<div v-for="stat in stats" :key="stat.tag"> <div v-for="stat in stats" :key="stat.tag">
<div class="tag"> <div class="tag">
<router-link :to="`/tags/${ stat.tag }`" :title="stat.tag">#{{ stat.tag }}</router-link> <router-link :to="`/tags/${ encodeURIComponent(stat.tag) }`" :title="stat.tag">#{{ stat.tag }}</router-link>
<p>{{ '%i18n:@count%'.replace('{}', stat.usersCount) }}</p> <p>{{ '%i18n:@count%'.replace('{}', stat.usersCount) }}</p>
</div> </div>
<x-chart class="chart" :src="stat.chart"/> <x-chart class="chart" :src="stat.chart"/>

2
src/services/drive/add-file.ts
View File

@ -25,7 +25,7 @@ async function save(readable: stream.Readable, name: string, type: string, hash:
const minio = new Minio.Client(config.drive.config); const minio = new Minio.Client(config.drive.config);
const id = uuid.v4(); const id = uuid.v4();
const obj = `${config.drive.prefix}/${id}`; 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, { Object.assign(metadata, {
withoutChunks: true, withoutChunks: true,