summaryrefslogtreecommitdiff
path: root/src/web/app/common
diff options
context:
space:
mode:
authorsyuilo <Syuilotan@yahoo.co.jp>2018-03-27 12:57:52 +0900
committerGitHub <noreply@github.com>2018-03-27 12:57:52 +0900
commitd0c875c1e0d398cc0939b2ce9fc77aed03909f29 (patch)
tree1c496aab092bea6ff6e14a649082c630fbaf521e /src/web/app/common
parentUpdate docs (diff)
parentReplace /:user endpoints with /@:user (diff)
downloadmisskey-d0c875c1e0d398cc0939b2ce9fc77aed03909f29.tar.gz
misskey-d0c875c1e0d398cc0939b2ce9fc77aed03909f29.tar.bz2
misskey-d0c875c1e0d398cc0939b2ce9fc77aed03909f29.zip
Merge pull request #1313 from akihikodaki/key
Replace /:user endpoints with /@:user
Diffstat (limited to 'src/web/app/common')
-rw-r--r--src/web/app/common/views/components/messaging-room.message.vue2
-rw-r--r--src/web/app/common/views/components/post-html.ts2
-rw-r--r--src/web/app/common/views/components/signup.vue2
-rw-r--r--src/web/app/common/views/components/welcome-timeline.vue6
4 files changed, 6 insertions, 6 deletions
diff --git a/src/web/app/common/views/components/messaging-room.message.vue b/src/web/app/common/views/components/messaging-room.message.vue
index 56854ca2ff..647e39a756 100644
--- a/src/web/app/common/views/components/messaging-room.message.vue
+++ b/src/web/app/common/views/components/messaging-room.message.vue
@@ -1,6 +1,6 @@
<template>
<div class="message" :data-is-me="isMe">
- <router-link class="avatar-anchor" :to="`/${message.user.username}`" :title="message.user.username" target="_blank">
+ <router-link class="avatar-anchor" :to="`/@${message.user.username}`" :title="message.user.username" target="_blank">
<img class="avatar" :src="`${message.user.avatar_url}?thumbnail&size=80`" alt=""/>
</router-link>
<div class="content">
diff --git a/src/web/app/common/views/components/post-html.ts b/src/web/app/common/views/components/post-html.ts
index dae118e826..56ee97d388 100644
--- a/src/web/app/common/views/components/post-html.ts
+++ b/src/web/app/common/views/components/post-html.ts
@@ -61,7 +61,7 @@ export default Vue.component('mk-post-html', {
case 'mention':
return (createElement as any)('a', {
attrs: {
- href: `${url}/${token.username}`,
+ href: `${url}/@${token.username}`,
target: '_blank',
dataIsMe: (this as any).i && (this as any).i.username == token.username
},
diff --git a/src/web/app/common/views/components/signup.vue b/src/web/app/common/views/components/signup.vue
index 2ca1687be1..c2e78aa8a3 100644
--- a/src/web/app/common/views/components/signup.vue
+++ b/src/web/app/common/views/components/signup.vue
@@ -3,7 +3,7 @@
<label class="username">
<p class="caption">%fa:at%%i18n:common.tags.mk-signup.username%</p>
<input v-model="username" type="text" pattern="^[a-zA-Z0-9-]{3,20}$" placeholder="a~z、A~Z、0~9、-" autocomplete="off" required @input="onChangeUsername"/>
- <p class="profile-page-url-preview" v-if="shouldShowProfileUrl">{{ `${url}/${username}` }}</p>
+ <p class="profile-page-url-preview" v-if="shouldShowProfileUrl">{{ `${url}/@${username}` }}</p>
<p class="info" v-if="usernameState == 'wait'" style="color:#999">%fa:spinner .pulse .fw%%i18n:common.tags.mk-signup.checking%</p>
<p class="info" v-if="usernameState == 'ok'" style="color:#3CB7B5">%fa:check .fw%%i18n:common.tags.mk-signup.available%</p>
<p class="info" v-if="usernameState == 'unavailable'" style="color:#FF1161">%fa:exclamation-triangle .fw%%i18n:common.tags.mk-signup.unavailable%</p>
diff --git a/src/web/app/common/views/components/welcome-timeline.vue b/src/web/app/common/views/components/welcome-timeline.vue
index 7e35e1f71b..062ccda324 100644
--- a/src/web/app/common/views/components/welcome-timeline.vue
+++ b/src/web/app/common/views/components/welcome-timeline.vue
@@ -1,15 +1,15 @@
<template>
<div class="mk-welcome-timeline">
<div v-for="post in posts">
- <router-link class="avatar-anchor" :to="`/${post.user.username}`" v-user-preview="post.user.id">
+ <router-link class="avatar-anchor" :to="`/@${post.user.username}`" v-user-preview="post.user.id">
<img class="avatar" :src="`${post.user.avatar_url}?thumbnail&size=96`" alt="avatar"/>
</router-link>
<div class="body">
<header>
- <router-link class="name" :to="`/${post.user.username}`" v-user-preview="post.user.id">{{ post.user.name }}</router-link>
+ <router-link class="name" :to="`/@${post.user.username}`" v-user-preview="post.user.id">{{ post.user.name }}</router-link>
<span class="username">@{{ post.user.username }}</span>
<div class="info">
- <router-link class="created-at" :to="`/${post.user.username}/${post.id}`">
+ <router-link class="created-at" :to="`/@${post.user.username}/${post.id}`">
<mk-time :time="post.created_at"/>
</router-link>
</div>