From 811956b79090fad7b7aeb32c58a981c91e08570f Mon Sep 17 00:00:00 2001
From: mei23 <m@m544.net>
Date: Sun, 14 Apr 2019 01:57:04 +0900
Subject: [PATCH] =?UTF-8?q?=E3=83=95=E3=82=A9=E3=83=AD=E3=83=BC/=E3=83=95?=
 =?UTF-8?q?=E3=82=A9=E3=83=AD=E3=83=AF=E3=83=BC=20=E3=83=AA=E3=82=B9?=
 =?UTF-8?q?=E3=83=88=E3=81=AB=E3=83=95=E3=82=A9=E3=83=AD=E3=83=BC=E3=81=95?=
 =?UTF-8?q?=E3=82=8C=E3=81=A6=E3=82=8B=E3=81=8B=E8=A1=A8=E7=A4=BA=E3=81=99?=
 =?UTF-8?q?=E3=82=8B=E3=82=88=E3=81=86=E3=81=AB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 locales/en-US.yml                             |  1 +
 locales/ja-JP.yml                             |  1 +
 .../app/common/views/components/user-list.vue | 22 +++++++++++++++----
 .../app/common/views/pages/followers.vue      |  2 +-
 .../app/common/views/pages/following.vue      |  2 +-
 5 files changed, 22 insertions(+), 6 deletions(-)

diff --git a/locales/en-US.yml b/locales/en-US.yml
index 3dccd8489929..241848fcf2f2 100644
--- a/locales/en-US.yml
+++ b/locales/en-US.yml
@@ -317,6 +317,7 @@ common/views/components/url-preview.vue:
   disable-player: "Close the player"
 common/views/components/user-list.vue:
   no-users: "There are no users."
+  follows-you: "Follows you"
 common/views/components/games/reversi/reversi.vue:
   matching:
     waiting-for: "Waiting for {}"
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index f2d45b41af88..adda294876b4 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -338,6 +338,7 @@ common/views/components/url-preview.vue:
 
 common/views/components/user-list.vue:
   no-users: "ユーザーがいません"
+  follows-you: "あなたをフォローしています"
 
 common/views/components/games/reversi/reversi.vue:
   matching:
diff --git a/src/client/app/common/views/components/user-list.vue b/src/client/app/common/views/components/user-list.vue
index 2e23186811f3..65494dbe3758 100644
--- a/src/client/app/common/views/components/user-list.vue
+++ b/src/client/app/common/views/components/user-list.vue
@@ -14,6 +14,7 @@
 				<div class="name">
 					<router-link class="name" :to="user | userPage" v-user-preview="user.id"><mk-user-name :user="user"/></router-link>
 					<p class="username">@{{ user | acct }}</p>
+					<p class="followed" v-if="showFollows && user.isFollowed">{{ $t('follows-you') }}</p>
 				</div>
 				<div class="description" v-if="user.description" :title="user.description">
 					<mfm :text="user.description" :is-note="false" :author="user" :i="$store.state.i" :custom-emojis="user.emojis" :should-break="false" :plain-text="true"/>
@@ -42,7 +43,11 @@ export default Vue.extend({
 		iconOnly: {
 			type: Boolean,
 			default: false
-		}
+		},
+		showFollows: {
+			type: Boolean,
+			default: false
+		},
 	},
 
 	data() {
@@ -148,8 +153,17 @@ export default Vue.extend({
 				> .username
 					display block
 					margin 0
-					font-size 15px
-					line-height 16px
+					font-size 13px
+					line-height 13px
+					color var(--text)
+					opacity 0.7
+
+				> .followed
+					display inline-block
+					margin 0
+					font-size 11px
+					font-style italic
+					margin-top: 2px
 					color var(--text)
 					opacity 0.7
 
@@ -166,7 +180,7 @@ export default Vue.extend({
 
 			> .follow-button
 				position absolute
-				top 8px
+				top 0px
 				right 0px
 
 	> .more
diff --git a/src/client/app/common/views/pages/followers.vue b/src/client/app/common/views/pages/followers.vue
index 94d9c9b13c8e..7b8f846028ae 100644
--- a/src/client/app/common/views/pages/followers.vue
+++ b/src/client/app/common/views/pages/followers.vue
@@ -1,6 +1,6 @@
 <template>
 <div>
-	<mk-user-list :make-promise="makePromise">{{ $t('@.followers') }}</mk-user-list>
+	<mk-user-list :make-promise="makePromise" :showFollows="true">{{ $t('@.followers') }}</mk-user-list>
 </div>
 </template>
 
diff --git a/src/client/app/common/views/pages/following.vue b/src/client/app/common/views/pages/following.vue
index 39739fa3da6b..d28db61a8e40 100644
--- a/src/client/app/common/views/pages/following.vue
+++ b/src/client/app/common/views/pages/following.vue
@@ -1,6 +1,6 @@
 <template>
 <div>
-	<mk-user-list :make-promise="makePromise">{{ $t('@.following') }}</mk-user-list>
+	<mk-user-list :make-promise="makePromise" :showFollows="true">{{ $t('@.following') }}</mk-user-list>
 </div>
 </template>