From 160f424466d38ec83a69301948116a7f8b3b7461 Mon Sep 17 00:00:00 2001
From: MeiMei <30769358+mei23@users.noreply.github.com>
Date: Sat, 19 Jan 2019 08:28:46 +0900
Subject: [PATCH] Fix missing username conversions (#3922)

---
 .../views/components/games/reversi/reversi.game.vue      | 9 +++++++--
 src/client/app/common/views/pages/follow.vue             | 6 ++++--
 .../app/desktop/views/pages/deck/deck.note-column.vue    | 8 +-------
 .../app/desktop/views/pages/deck/deck.user-column.vue    | 6 +-----
 src/client/app/mobile/views/pages/followers.vue          | 3 ++-
 src/client/app/mobile/views/pages/following.vue          | 3 ++-
 src/client/app/mobile/views/pages/settings.vue           | 6 ++++--
 7 files changed, 21 insertions(+), 20 deletions(-)

diff --git a/src/client/app/common/views/components/games/reversi/reversi.game.vue b/src/client/app/common/views/components/games/reversi/reversi.game.vue
index 71eb3d1c92..98eda88fe5 100644
--- a/src/client/app/common/views/components/games/reversi/reversi.game.vue
+++ b/src/client/app/common/views/components/games/reversi/reversi.game.vue
@@ -4,8 +4,13 @@
 	<header><b><router-link :to="blackUser | userPage"><mk-user-name :user="blackUser"/></router-link></b>({{ $t('@.reversi.black') }}) vs <b><router-link :to="whiteUser | userPage"><mk-user-name :user="whiteUser"/></router-link></b>({{ $t('@.reversi.white') }})</header>
 
 	<div style="overflow: hidden; line-height: 28px;">
-		<p class="turn" v-if="!iAmPlayer && !game.isEnded">{{ $t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) }) }}<mk-ellipsis/></p>
-		<p class="turn" v-if="logPos != logs.length">{{ $t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) }) }}</p>
+		<p class="turn" v-if="!iAmPlayer && !game.isEnded">
+			<misskey-flavored-markdown :text="$t('@.reversi.turn-of', { name: $options.filters.userName(turnUser) })" :shouldBreak="false" :plainText="true" :custom-emojis="turnUser.emojis"/>
+			<mk-ellipsis/>
+		</p>
+		<p class="turn" v-if="logPos != logs.length">
+			<misskey-flavored-markdown :text="$t('@.reversi.past-turn-of', { name: $options.filters.userName(turnUser) })" :shouldBreak="false" :plainText="true" :custom-emojis="turnUser.emojis"/>
+		</p>
 		<p class="turn1" v-if="iAmPlayer && !game.isEnded && !isMyTurn">{{ $t('@.reversi.opponent-turn') }}<mk-ellipsis/></p>
 		<p class="turn2" v-if="iAmPlayer && !game.isEnded && isMyTurn" v-animate-css="{ classes: 'tada', iteration: 'infinite' }">{{ $t('@.reversi.my-turn') }}</p>
 		<p class="result" v-if="game.isEnded && logPos == logs.length">
diff --git a/src/client/app/common/views/pages/follow.vue b/src/client/app/common/views/pages/follow.vue
index 6c945ab22d..efcdb4a3b2 100644
--- a/src/client/app/common/views/pages/follow.vue
+++ b/src/client/app/common/views/pages/follow.vue
@@ -1,7 +1,8 @@
 <template>
 <div class="syxhndwprovvuqhmyvveewmbqayniwkv" v-if="!fetching">
-	<div class="signed-in-as" v-html="this.$t('signed-in-as').replace('{}', `<b>${myName}`)"></div>
-
+	<div class="signed-in-as">
+		<misskey-flavored-markdown :text="$t('signed-in-as').replace('{}', myName)" :shouldBreak="false" :plainText="true" :custom-emojis="$store.state.i.emojis"/>
+	</div>
 	<main>
 		<div class="banner" :style="bannerStyle"></div>
 		<mk-avatar class="avatar" :user="user" :disable-preview="true"/>
@@ -127,6 +128,7 @@ export default Vue.extend({
 	> .signed-in-as
 		margin-bottom 16px
 		font-size 14px
+		font-weight bold
 
 	> main
 		margin-bottom 16px
diff --git a/src/client/app/desktop/views/pages/deck/deck.note-column.vue b/src/client/app/desktop/views/pages/deck/deck.note-column.vue
index 43db32c854..74da48bffc 100644
--- a/src/client/app/desktop/views/pages/deck/deck.note-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.note-column.vue
@@ -1,7 +1,7 @@
 <template>
 <x-column>
 	<span slot="header">
-		<fa :icon="['far', 'comment-alt']"/><span>{{ title }}</span>
+		<fa :icon="['far', 'comment-alt']"/><mk-user-name :user="note.user" v-if="note"/>
 	</span>
 
 	<div class="rvtscbadixhhbsczoorqoaygovdeecsx" v-if="note">
@@ -45,12 +45,6 @@ export default Vue.extend({
 		};
 	},
 
-	computed: {
-		title(): string {
-			return this.note ? Vue.filter('userName')(this.note.user) : '';
-		}
-	},
-
 	created() {
 		this.$root.api('notes/show', { noteId: this.noteId }).then(note => {
 			this.note = note;
diff --git a/src/client/app/desktop/views/pages/deck/deck.user-column.vue b/src/client/app/desktop/views/pages/deck/deck.user-column.vue
index b52c41394b..07da084b92 100644
--- a/src/client/app/desktop/views/pages/deck/deck.user-column.vue
+++ b/src/client/app/desktop/views/pages/deck/deck.user-column.vue
@@ -1,7 +1,7 @@
 <template>
 <x-column>
 	<span slot="header">
-		<fa icon="user"/><span>{{ title }}</span>
+		<fa icon="user"/><mk-user-name :user="user" v-if="user"/>
 	</span>
 
 	<div class="zubukjlciycdsyynicqrnlsmdwmymzqu" v-if="user">
@@ -137,10 +137,6 @@ export default Vue.extend({
 	},
 
 	computed: {
-		title(): string {
-			return this.user ? Vue.filter('userName')(this.user) : '';
-		},
-
 		bannerStyle(): any {
 			if (this.user == null) return {};
 			if (this.user.bannerUrl == null) return {};
diff --git a/src/client/app/mobile/views/pages/followers.vue b/src/client/app/mobile/views/pages/followers.vue
index e5efe185c8..a0d80d6273 100644
--- a/src/client/app/mobile/views/pages/followers.vue
+++ b/src/client/app/mobile/views/pages/followers.vue
@@ -1,7 +1,8 @@
 <template>
 <mk-ui>
 	<template slot="header" v-if="!fetching">
-		<img :src="user.avatarUrl" alt="">{{ $t('followers-of', { name }) }}
+		<img :src="user.avatarUrl" alt="">
+		<misskey-flavored-markdown :text="$t('followers-of', { name })" :shouldBreak="false" :plainText="true" :custom-emojis="user.emojis"/>
 	</template>
 	<mk-users-list
 		v-if="!fetching"
diff --git a/src/client/app/mobile/views/pages/following.vue b/src/client/app/mobile/views/pages/following.vue
index e55a3b4cd6..b0f2d5d8de 100644
--- a/src/client/app/mobile/views/pages/following.vue
+++ b/src/client/app/mobile/views/pages/following.vue
@@ -1,7 +1,8 @@
 <template>
 <mk-ui>
 	<template slot="header" v-if="!fetching">
-		<img :src="user.avatarUrl" alt="">{{ $t('following-of', { name }) }}
+		<img :src="user.avatarUrl" alt="">
+		<misskey-flavored-markdown :text="$t('following-of', { name })" :shouldBreak="false" :plainText="true" :custom-emojis="user.emojis"/>
 	</template>
 	<mk-users-list
 		v-if="!fetching"
diff --git a/src/client/app/mobile/views/pages/settings.vue b/src/client/app/mobile/views/pages/settings.vue
index e8bf0becbb..34dec3b959 100644
--- a/src/client/app/mobile/views/pages/settings.vue
+++ b/src/client/app/mobile/views/pages/settings.vue
@@ -2,8 +2,9 @@
 <mk-ui>
 	<span slot="header"><span style="margin-right:4px;"><fa icon="cog"/></span>{{ $t('settings') }}</span>
 	<main>
-		<div class="signin-as" v-html="this.$t('signed-in-as').replace('{}', `<b>${name}</b>`)"></div>
-
+		<div class="signed-in-as">
+			<misskey-flavored-markdown :text="$t('signed-in-as').replace('{}', name)" :shouldBreak="false" :plainText="true" :custom-emojis="$store.state.i.emojis"/>
+		</div>
 		<div>
 			<x-profile-editor/>
 
@@ -381,6 +382,7 @@ main
 		color var(--mobileSignedInAsFg)
 		background var(--mobileSignedInAsBg)
 		box-shadow 0 3px 1px -2px rgba(#000, 0.2), 0 2px 2px 0 rgba(#000, 0.14), 0 1px 5px 0 rgba(#000, 0.12)
+		font-weight bold
 
 	> .signout
 		margin 16px