summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-07-26 13:49:24 +0900
committerGitHub <noreply@github.com>2018-07-26 13:49:24 +0900
commit0995d5c5a2c4819b5b331ff1cf9ba809f5385745 (patch)
tree6ccf7b7d8536591019742d60d55d91e4ef28dc29 /src
parentMerge pull request #1983 from mei23/mei-osct (diff)
parentUpdate misskey-flavored-markdown.ts (diff)
downloadsharkey-0995d5c5a2c4819b5b331ff1cf9ba809f5385745.tar.gz
sharkey-0995d5c5a2c4819b5b331ff1cf9ba809f5385745.tar.bz2
sharkey-0995d5c5a2c4819b5b331ff1cf9ba809f5385745.zip
Merge pull request #1986 from acid-chicken/master
Resolves #1985
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/views/components/misskey-flavored-markdown.ts2
-rw-r--r--src/client/app/common/views/widgets/hashtags.vue2
2 files changed, 2 insertions, 2 deletions
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);
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 @@
<div>
<div v-for="stat in stats" :key="stat.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>
</div>
<x-chart class="chart" :src="stat.chart"/>