メールサーバーの設定がオフの場合はメール設定を表示しないように

2 files changed, 9 insertions, 7 deletions

diff --git a/src/client/app/common/views/components/profile-editor.vue b/src/client/app/common/views/components/profile-editor.vue
index 62d5d7a29c..d5ba58ca75 100644
--- a/src/client/app/common/views/components/profile-editor.vue
+++ b/src/client/app/common/views/components/profile-editor.vue
@@ -67,7 +67,7 @@
 		</div>
 	</section>
 
-	<section>
+	<section v-if="enableEmail">
 		<header>{{ $t('email') }}</header>
 
 		<div>
@@ -94,6 +94,7 @@ export default Vue.extend({
 	data() {
 		return {
 			host: toUnicode(host),
+			enableEmail: false,
 			email: null,
 			name: null,
 			username: null,
@@ -128,6 +129,9 @@ export default Vue.extend({
 	},
 
 	created() {
+		this.$root.getMeta().then(meta => {
+			this.enableEmail = meta.enableEmail;
+		});
 		this.email = this.$store.state.i.email;
 		this.name = this.$store.state.i.name;
 		this.username = this.$store.state.i.username;
diff --git a/src/server/api/endpoints/meta.ts b/src/server/api/endpoints/meta.ts
index d18e6a154b..6ec5dfb884 100644
--- a/src/server/api/endpoints/meta.ts
+++ b/src/server/api/endpoints/meta.ts
@@ -66,16 +66,12 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		swPublickey: config.sw ? config.sw.public_key : null,
 		bannerUrl: instance.bannerUrl,
 		maxNoteTextLength: instance.maxNoteTextLength,
-
 		emojis: emojis,
+		enableEmail: instance.enableEmail,
 
 		enableTwitterIntegration: instance.enableTwitterIntegration,
 		enableGithubIntegration: instance.enableGithubIntegration,
 		enableDiscordIntegration: instance.enableDiscordIntegration,
-
-		enableExternalUserRecommendation: instance.enableExternalUserRecommendation,
-		externalUserRecommendationEngine: instance.externalUserRecommendationEngine,
-		externalUserRecommendationTimeout: instance.externalUserRecommendationTimeout
 	};
 
 	if (ps.detail) {
@@ -107,8 +103,10 @@ export default define(meta, (ps, me) => new Promise(async (res, rej) => {
 		response.githubClientSecret = instance.githubClientSecret;
 		response.discordClientId = instance.discordClientId;
 		response.discordClientSecret = instance.discordClientSecret;
+		response.enableExternalUserRecommendation = instance.enableExternalUserRecommendation;
+		response.externalUserRecommendationEngine = instance.externalUserRecommendationEngine;
+		response.externalUserRecommendationTimeout = instance.externalUserRecommendationTimeout;
 		response.summalyProxy = instance.summalyProxy;
-		response.enableEmail = instance.enableEmail;
 		response.email = instance.email;
 		response.smtpSecure = instance.smtpSecure;
 		response.smtpHost = instance.smtpHost;