summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2018-12-13 01:18:29 +0900
committersyuilo <syuilotan@yahoo.co.jp>2018-12-13 01:18:29 +0900
commit656cec65b9911e9d25d7fa6874f2dd417c0e3759 (patch)
treeffca0d9482852ac78525eb7869f22bf0ddd9fae8 /src
parent:art: (diff)
parentHide unavailable integration settings (#3604) (diff)
downloadsharkey-656cec65b9911e9d25d7fa6874f2dd417c0e3759.tar.gz
sharkey-656cec65b9911e9d25d7fa6874f2dd417c0e3759.tar.bz2
sharkey-656cec65b9911e9d25d7fa6874f2dd417c0e3759.zip
Merge branch 'develop' of https://github.com/syuilo/misskey into develop
Diffstat (limited to 'src')
-rw-r--r--src/client/app/common/views/components/integration-settings.vue19
1 files changed, 15 insertions, 4 deletions
diff --git a/src/client/app/common/views/components/integration-settings.vue b/src/client/app/common/views/components/integration-settings.vue
index 4947d7305c..a9b17779b3 100644
--- a/src/client/app/common/views/components/integration-settings.vue
+++ b/src/client/app/common/views/components/integration-settings.vue
@@ -1,22 +1,22 @@
<template>
-<ui-card>
+<ui-card v-if="enableTwitterIntegration || enableDiscordIntegration || enableGithubIntegration">
<div slot="title"><fa icon="share-alt"/> {{ $t('title') }}</div>
- <section>
+ <section v-if="enableTwitterIntegration">
<header><fa :icon="['fab', 'twitter']"/> Twitter</header>
<p v-if="$store.state.i.twitter">{{ $t('connected-to') }}: <a :href="`https://twitter.com/${$store.state.i.twitter.screenName}`" target="_blank">@{{ $store.state.i.twitter.screenName }}</a></p>
<ui-button v-if="$store.state.i.twitter" @click="disconnectTwitter">{{ $t('disconnect') }}</ui-button>
<ui-button v-else @click="connectTwitter">{{ $t('connect') }}</ui-button>
</section>
- <section>
+ <section v-if="enableDiscordIntegration">
<header><fa :icon="['fab', 'discord']"/> Discord</header>
<p v-if="$store.state.i.discord">{{ $t('connected-to') }}: <a :href="`https://discordapp.com/users/${$store.state.i.discord.id}`" target="_blank">@{{ $store.state.i.discord.username }}#{{ $store.state.i.discord.discriminator }}</a></p>
<ui-button v-if="$store.state.i.discord" @click="disconnectDiscord">{{ $t('disconnect') }}</ui-button>
<ui-button v-else @click="connectDiscord">{{ $t('connect') }}</ui-button>
</section>
- <section>
+ <section v-if="enableGithubIntegration">
<header><fa :icon="['fab', 'github']"/> GitHub</header>
<p v-if="$store.state.i.github">{{ $t('connected-to') }}: <a :href="`https://github.com/${$store.state.i.github.login}`" target="_blank">@{{ $store.state.i.github.login }}</a></p>
<ui-button v-if="$store.state.i.github" @click="disconnectGithub">{{ $t('disconnect') }}</ui-button>
@@ -39,9 +39,20 @@ export default Vue.extend({
twitterForm: null,
discordForm: null,
githubForm: null,
+ enableTwitterIntegration: false,
+ enableDiscordIntegration: false,
+ enableGithubIntegration: false,
};
},
+ created() {
+ this.$root.getMeta().then(meta => {
+ this.enableTwitterIntegration = meta.enableTwitterIntegration;
+ this.enableDiscordIntegration = meta.enableDiscordIntegration;
+ this.enableGithubIntegration = meta.enableGithubIntegration;
+ });
+ },
+
mounted() {
document.cookie = `i=${this.$store.state.i.token}`;
this.$watch('$store.state.i', () => {