From a9ea405c0c194cfedefabef9ade52c414c1005b4 Mon Sep 17 00:00:00 2001
From: syuilo <syuilotan@yahoo.co.jp>
Date: Sun, 15 Apr 2018 18:38:40 +0900
Subject: :v:

---
 .../app/desktop/views/pages/user/user.header.vue   | 33 ++++++++++++++++------
 src/client/app/mobile/views/pages/user.vue         | 13 +++++++++
 src/models/user.ts                                 |  1 +
 src/remote/activitypub/objects/person.ts           |  3 +-
 4 files changed, 41 insertions(+), 9 deletions(-)

(limited to 'src')

diff --git a/src/client/app/desktop/views/pages/user/user.header.vue b/src/client/app/desktop/views/pages/user/user.header.vue
index e026820b39..3ec0b92fe4 100644
--- a/src/client/app/desktop/views/pages/user/user.header.vue
+++ b/src/client/app/desktop/views/pages/user/user.header.vue
@@ -1,5 +1,6 @@
 <template>
 <div class="header" :data-is-dark-background="user.bannerUrl != null">
+	<div class="is-remote" v-if="user.host != null"><p>%fa:exclamation-triangle% %i18n:@is-remote% <a :href="user.url || user.uri" target="_blank">%i18n:@view-remote%</a></p></div>
 	<div class="banner-container" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl}?thumbnail&size=2048)` : ''">
 		<div class="banner" ref="banner" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl}?thumbnail&size=2048)` : ''" @click="onBannerClick"></div>
 	</div>
@@ -26,14 +27,18 @@ import Vue from 'vue';
 export default Vue.extend({
 	props: ['user'],
 	mounted() {
-		window.addEventListener('load', this.onScroll);
-		window.addEventListener('scroll', this.onScroll);
-		window.addEventListener('resize', this.onScroll);
+		if (this.user.bannerUrl) {
+			window.addEventListener('load', this.onScroll);
+			window.addEventListener('scroll', this.onScroll);
+			window.addEventListener('resize', this.onScroll);
+		}
 	},
 	beforeDestroy() {
-		window.removeEventListener('load', this.onScroll);
-		window.removeEventListener('scroll', this.onScroll);
-		window.removeEventListener('resize', this.onScroll);
+		if (this.user.bannerUrl) {
+			window.removeEventListener('load', this.onScroll);
+			window.removeEventListener('scroll', this.onScroll);
+			window.removeEventListener('resize', this.onScroll);
+		}
 	},
 	methods: {
 		onScroll() {
@@ -68,9 +73,21 @@ export default Vue.extend({
 	$footer-height = 58px
 
 	overflow hidden
-	background #f7f7f7
+	background #bfccd0
 	box-shadow 0 1px 1px rgba(0, 0, 0, 0.075)
 
+	> .is-remote
+		padding 16px
+		color #573c08
+		background #fff0db
+
+		> p
+			margin 0 auto
+			max-width 1024px
+
+			> a
+				font-weight bold
+
 	&[data-is-dark-background]
 		> .banner-container
 			> .banner
@@ -130,7 +147,7 @@ export default Vue.extend({
 			left 0
 			width 100%
 			padding 0 0 8px 195px
-			color #656565
+			color #5e6367
 			font-family '游ゴシック', 'YuGothic', 'ヒラギノ角ゴ ProN W3', 'Hiragino Kaku Gothic ProN', 'Meiryo', 'メイリオ', sans-serif
 
 			> .name
diff --git a/src/client/app/mobile/views/pages/user.vue b/src/client/app/mobile/views/pages/user.vue
index ea384308e9..ee7aabb1fd 100644
--- a/src/client/app/mobile/views/pages/user.vue
+++ b/src/client/app/mobile/views/pages/user.vue
@@ -2,6 +2,7 @@
 <mk-ui>
 	<span slot="header" v-if="!fetching">%fa:user% {{ user | userName }}</span>
 	<main v-if="!fetching">
+		<div class="is-remote" v-if="user.host != null"><p>%fa:exclamation-triangle% %i18n:@is-remote% <a :href="user.url || user.uri" target="_blank">%i18n:@view-remote%</a></p></div>
 		<header>
 			<div class="banner" :style="user.bannerUrl ? `background-image: url(${user.bannerUrl}?thumbnail&size=1024)` : ''"></div>
 			<div class="body">
@@ -109,6 +110,18 @@ export default Vue.extend({
 @import '~const.styl'
 
 main
+	> .is-remote
+		padding 16px
+		color #573c08
+		background #fff0db
+
+		> p
+			margin 0 auto
+			max-width 1024px
+
+			> a
+				font-weight bold
+
 	> header
 
 		> .banner
diff --git a/src/models/user.ts b/src/models/user.ts
index 1d23c21dbd..5b1a2d357b 100644
--- a/src/models/user.ts
+++ b/src/models/user.ts
@@ -88,6 +88,7 @@ export interface ILocalUser extends IUserBase {
 export interface IRemoteUser extends IUserBase {
 	inbox: string;
 	uri: string;
+	url?: string;
 	publicKey: {
 		id: string;
 		publicKeyPem: string;
diff --git a/src/remote/activitypub/objects/person.ts b/src/remote/activitypub/objects/person.ts
index 6c060f879c..b0539fd73b 100644
--- a/src/remote/activitypub/objects/person.ts
+++ b/src/remote/activitypub/objects/person.ts
@@ -96,7 +96,8 @@ export async function createPerson(value: any, resolver?: Resolver): Promise<IUs
 			publicKeyPem: person.publicKey.publicKeyPem
 		},
 		inbox: person.inbox,
-		uri: person.id
+		uri: person.id,
+		url: person.url
 	}) as IRemoteUser;
 
 	//#region アイコンとヘッダー画像をフェッチ
-- 
cgit v1.2.3-freya