Update/link (#456)

* feat: new translation string EN

* fix: translation reference

* feat: new translation string DE, FR, RO, RU, UA

* feat: ephemeral unlink

---------

Co-authored-by: JustDams <noreply@github.com>

Author: JustDams

commands/link.js

@@ -37,9 +37,15 @@ const sendCardWithInfo = async (interaction, playerParam) => {
 }
 
 const link = async (interaction, playerParam, discordId, guildId = null, nickname) => {
-  const user = await User.exists(discordId, guildId)
-  if (!!user?.verified) return errorCard('error.user.unlink.verified', interaction.locale)
+  const verified = await User.getVerified(discordId)
+  if (verified.length > 0) { 
+    const error = interaction.user.id === discordId ?
+      'error.user.unlink.verified' :
+      'error.user.link.verified.other'
+    return errorCard(error, interaction.locale) 
+  }
 
+  const user = await User.exists(discordId, guildId)
   const {
     playerDatas
   } = await getStats({
@@ -49,7 +55,6 @@ const link = async (interaction, playerParam, discordId, guildId = null, nicknam
   })
 
   const playerId = playerDatas.player_id
-
   if (guildId) await User.remove(discordId, null, false)
 
   user ?
@@ -105,6 +110,7 @@ module.exports = {
   usage: '[<steam_parameter> <faceit_parameter>] <discord_user> <nickname>',
   example: 'steam_parameter: justdams',
   type: 'utility',
+  ephemeral: true,
   async execute(interaction) {
     return getCardsConditions({
       interaction,

commands/unlink.js

@@ -42,6 +42,7 @@ module.exports = {
   descriptionLocalizations: getTranslations('command.unlink.description'),
   usage: '',
   type: 'utility',
+  ephemeral: true,
   async execute(interaction) {
     return sendCardWithInfo(interaction)
   }

config.json

@@ -10,6 +10,7 @@
   "join": "https://discord.gg/uPAdfvfuTP",
   "oauth2": "https://faceitfinder.app/api/auth/discord/login",
   "unlinkVerified": "https://faceitfinder.app/profile/settings",
+  "linkVerified": "https://faceitfinder.app/profile/connections",
   "logChannel": "1120786737636048976",
   "logGuild": "882210656328228895",
   "itemByPage": 25,

languages/base.js

@@ -185,7 +185,12 @@ module.exports = {
       mapNotPlayed: '',
       unlink: {
         verified: '',
-      }
+      },
+      link: {
+        verified: {
+          other: '',
+        },
+      },
     },
     execution: {
       command: '',

languages/bg-BG/translations.js

@@ -1,5 +1,5 @@
 /* eslint-disable semi */
-const { maxLengthTeamName, invite, join, oauth2, unlinkVerified } = require('../../config.json')
+const { maxLengthTeamName, invite, join, oauth2, unlinkVerified, linkVerified } = require('../../config.json')
 const base = structuredClone(require('../base'))
 base.command.compare.description = 'Compare both user stats'
 base.command.dailystats.description = 'Displays the stats of the chosen day, with elo graph of the day'
@@ -147,6 +147,7 @@ base.error.user.globalLink = '{discord} already has a global link'
 base.error.user.notFound = 'The requested user is not on this server'
 base.error.user.mapNotPlayed = 'The player **{playerName}** hasn\'t played on this map'
 base.error.user.unlink.verified = `Since your account is verified, you have to unlink your account on the website, click on the link below to do so\n${unlinkVerified}`
+base.error.user.link.verified.other = `This account is verified, the user will have to select the guild on the website to link it\n${linkVerified}`
 base.error.execution.command = 'An error occurred while executing the command'
 base.error.execution.selectmenu = 'An error occurred while executing the select menu'
 base.error.execution.button = 'An error occurred while executing the button'

languages/cs-CZ/translations.js

@@ -1,5 +1,5 @@
 /* eslint-disable semi */
-const { maxLengthTeamName, invite, join, oauth2, unlinkVerified } = require('../../config.json')
+const { maxLengthTeamName, invite, join, oauth2, unlinkVerified, linkVerified } = require('../../config.json')
 const base = structuredClone(require('../base'))
 base.command.compare.description = 'Compare both user stats'
 base.command.dailystats.description = 'Displays the stats of the chosen day, with elo graph of the day'
@@ -147,6 +147,7 @@ base.error.user.globalLink = '{discord} already has a global link'
 base.error.user.notFound = 'The requested user is not on this server'
 base.error.user.mapNotPlayed = 'The player **{playerName}** hasn\'t played on this map'
 base.error.user.unlink.verified = `Since your account is verified, you have to unlink your account on the website, click on the link below to do so\n${unlinkVerified}`
+base.error.user.link.verified.other = `This account is verified, the user will have to select the guild on the website to link it\n${linkVerified}`
 base.error.execution.command = 'An error occurred while executing the command'
 base.error.execution.selectmenu = 'An error occurred while executing the select menu'
 base.error.execution.button = 'An error occurred while executing the button'

languages/da-DK/translations.js

@@ -1,5 +1,5 @@
 /* eslint-disable semi */
-const { maxLengthTeamName, invite, join, oauth2, unlinkVerified } = require('../../config.json')
+const { maxLengthTeamName, invite, join, oauth2, unlinkVerified, linkVerified } = require('../../config.json')
 const base = structuredClone(require('../base'))
 base.command.compare.description = 'Compare both user stats'
 base.command.dailystats.description = 'Displays the stats of the chosen day, with elo graph of the day'
@@ -147,6 +147,7 @@ base.error.user.globalLink = '{discord} already has a global link'
 base.error.user.notFound = 'The requested user is not on this server'
 base.error.user.mapNotPlayed = 'The player **{playerName}** hasn\'t played on this map'
 base.error.user.unlink.verified = `Since your account is verified, you have to unlink your account on the website, click on the link below to do so\n${unlinkVerified}`
+base.error.user.link.verified.other = `This account is verified, the user will have to select the guild on the website to link it\n${linkVerified}`
 base.error.execution.command = 'An error occurred while executing the command'
 base.error.execution.selectmenu = 'An error occurred while executing the select menu'
 base.error.execution.button = 'An error occurred while executing the button'

languages/de-DE/translations.js

@@ -1,5 +1,5 @@
 /* eslint-disable semi */
-const { maxLengthTeamName, invite, join, oauth2, unlinkVerified } = require('../../config.json');
+const { maxLengthTeamName, invite, join, oauth2, unlinkVerified, linkVerified } = require('../../config.json');
 const base = structuredClone(require('../base'));
 base.command.compare.description = 'Vergleiche beide User Statistiken';
 base.command.dailystats.description = 'Zeigt die Statistiken des ausgewählten Tages mit der Elo-Grafik des Tages an.';
@@ -143,6 +143,7 @@ base.error.user.globalLink = '{discord} hat schon einen Globalen-Link';
 base.error.user.notFound = 'Der angefragte User ist nicht auf dem Server';
 base.error.user.mapNotPlayed = 'Der Spieler **{playerName}**, hat noch nicht auf dieser Karte gespielt';
 base.error.user.unlink.verified = `Da Ihr Konto verifiziert ist, müssen Sie Ihr Konto auf der Website trennen. Klicken Sie auf den unten stehenden Link, um dies zu tun\n${unlinkVerified}`;
+base.error.user.link.verified.other = `Dieses Konto ist verifiziert, der Benutzer muss die Gilde auf der Website auswählen, um sie zu verknüpfen\n${linkVerified}`;
 base.error.execution.command = 'Es ist ein Fehler aufgetreten, während der Befehl ausgeführt wurde';
 base.error.execution.selectmenu = 'Es ist ein Fehler aufgetreten, während das Auswahlfeld ausgeführt wurde';
 base.error.execution.button = 'Es ist ein Fehler aufgetreten, während des Drückens des Knopfes';

languages/el-GR/translations.js

@@ -1,5 +1,5 @@
 /* eslint-disable semi */
-const { maxLengthTeamName, invite, join, oauth2, unlinkVerified } = require('../../config.json')
+const { maxLengthTeamName, invite, join, oauth2, unlinkVerified, linkVerified } = require('../../config.json')
 const base = structuredClone(require('../base'))
 base.command.compare.description = 'Compare both user stats'
 base.command.dailystats.description = 'Displays the stats of the chosen day, with elo graph of the day'
@@ -120,6 +120,7 @@ base.strings.pagination = {
   last: 'Last Page'
 }
 base.strings.donate = 'Support the project'
+base.strings.translation = 'Help with the translation'
 base.strings.fullHistory = 'Full history'
 base.strings.verifyDescription = `Hey {discord}, to verify your faceit account click on the link below!\n${oauth2}\nOnce you have verified your account, you will be able to get the linked role, and more !`
 base.strings.verify = 'Verification'
@@ -146,6 +147,7 @@ base.error.user.globalLink = '{discord} already has a global link'
 base.error.user.notFound = 'The requested user is not on this server'
 base.error.user.mapNotPlayed = 'The player **{playerName}** hasn\'t played on this map'
 base.error.user.unlink.verified = `Since your account is verified, you have to unlink your account on the website, click on the link below to do so\n${unlinkVerified}`
+base.error.user.link.verified.other = `This account is verified, the user will have to select the guild on the website to link it\n${linkVerified}`
 base.error.execution.command = 'An error occurred while executing the command'
 base.error.execution.selectmenu = 'An error occurred while executing the select menu'
 base.error.execution.button = 'An error occurred while executing the button'

languages/en-GB/translations.js

@@ -1,5 +1,5 @@
 /* eslint-disable semi */
-const { maxLengthTeamName, invite, join, oauth2, unlinkVerified } = require('../../config.json')
+const { maxLengthTeamName, invite, join, oauth2, unlinkVerified, linkVerified } = require('../../config.json')
 const base = structuredClone(require('../base'))
 base.command.compare.description = 'Compare both user stats'
 base.command.dailystats.description = 'Displays the stats of the chosen day, with elo graph of the day'
@@ -120,10 +120,10 @@ base.strings.pagination = {
   last: 'Last Page'
 }
 base.strings.donate = 'Support the project'
+base.strings.translation = 'Help with the translation'
 base.strings.fullHistory = 'Full history'
 base.strings.verifyDescription = `Hey {discord}, to verify your faceit account click on the link below!\n${oauth2}\nOnce you have verified your account, you will be able to get the linked role, and more !`
 base.strings.verify = 'Verification'
-base.strings.premiumDesc = 'This feature is only available for premium guilds. Become a premium guild by clicking on the button below'
 base.error.user.missing = 'It seems like there is a user missing'
 base.error.user.compareSame = 'You can\'t compare the same user'
 base.error.user.excluded = 'You can\'t exclude a player you are searching for'
@@ -147,6 +147,7 @@ base.error.user.globalLink = '{discord} already has a global link'
 base.error.user.notFound = 'The requested user is not on this server'
 base.error.user.mapNotPlayed = 'The player **{playerName}** hasn\'t played on this map'
 base.error.user.unlink.verified = `Since your account is verified, you have to unlink your account on the website, click on the link below to do so\n${unlinkVerified}`
+base.error.user.link.verified.other = `This account is verified, the user will have to select the guild on the website to link it\n${linkVerified}`
 base.error.execution.command = 'An error occurred while executing the command'
 base.error.execution.selectmenu = 'An error occurred while executing the select menu'
 base.error.execution.button = 'An error occurred while executing the button'