diff options
| author | MeiMei <30769358+mei23@users.noreply.github.com> | 2021-02-06 11:44:46 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-02-06 11:44:46 +0900 |
| commit | 41d7515f853c59627177a2d654415c5515ac3586 (patch) | |
| tree | bf291d41a8b5f55aa606c1546d24014d08c12698 /src | |
| parent | Fix: Duplicate system users are created (#7141) (diff) | |
| download | misskey-41d7515f853c59627177a2d654415c5515ac3586.tar.gz misskey-41d7515f853c59627177a2d654415c5515ac3586.tar.bz2 misskey-41d7515f853c59627177a2d654415c5515ac3586.zip | |
discordapp.com → discord.com (#7140)
Diffstat (limited to 'src')
| -rw-r--r-- | src/client/pages/settings/integration.vue | 2 | ||||
| -rw-r--r-- | src/server/api/service/discord.ts | 6 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/client/pages/settings/integration.vue b/src/client/pages/settings/integration.vue index 4516f490d9..7ae1f5e014 100644 --- a/src/client/pages/settings/integration.vue +++ b/src/client/pages/settings/integration.vue @@ -9,7 +9,7 @@ <div class="_content" v-if="enableDiscordIntegration"> <header><Fa :icon="faDiscord"/> Discord</header> - <p v-if="integrations.discord">{{ $ts.connectedTo }}: <a :href="`https://discordapp.com/users/${integrations.discord.id}`" rel="nofollow noopener" target="_blank">@{{ integrations.discord.username }}#{{ integrations.discord.discriminator }}</a></p> + <p v-if="integrations.discord">{{ $ts.connectedTo }}: <a :href="`https://discord.com/users/${integrations.discord.id}`" rel="nofollow noopener" target="_blank">@{{ integrations.discord.username }}#{{ integrations.discord.discriminator }}</a></p> <MkButton v-if="integrations.discord" @click="disconnectDiscord">{{ $ts.disconnectSerice }}</MkButton> <MkButton v-else @click="connectDiscord">{{ $ts.connectSerice }}</MkButton> </div> diff --git a/src/server/api/service/discord.ts b/src/server/api/service/discord.ts index a5ad18d99c..007458066d 100644 --- a/src/server/api/service/discord.ts +++ b/src/server/api/service/discord.ts @@ -70,7 +70,7 @@ async function getOAuth2() { return new OAuth2( meta.discordClientId!, meta.discordClientSecret!, - 'https://discordapp.com/', + 'https://discord.com/', 'api/oauth2/authorize', 'api/oauth2/token'); } else { @@ -174,7 +174,7 @@ router.get('/dc/cb', async ctx => { } })); - const { id, username, discriminator } = await getJson('https://discordapp.com/api/users/@me', '*/*', 10 * 1000, { + const { id, username, discriminator } = await getJson('https://discord.com/api/users/@me', '*/*', 10 * 1000, { 'Authorization': `Bearer ${accessToken}`, }); @@ -245,7 +245,7 @@ router.get('/dc/cb', async ctx => { } })); - const { id, username, discriminator } = await getJson('https://discordapp.com/api/users/@me', '*/*', 10 * 1000, { + const { id, username, discriminator } = await getJson('https://discord.com/api/users/@me', '*/*', 10 * 1000, { 'Authorization': `Bearer ${accessToken}`, }); if (!id || !username || !discriminator) { |