fix/find excluded linked (#313)

* fix: find * fix: find * fix: linter
faceitFinder · Mar 28, 2023 · 6f54d62 · 6f54d62
1 parent 87d2761
commit 6f54d62
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/commands/find.js b/commands/find.js
@@ -4,6 +4,7 @@ const { getUsers, getInteractionOption } = require('../functions/commands')
 const { sendCardWithInfo } = require('./last')
 const { getMapOption } = require('../functions/map')
 const { getTranslations, getTranslation } = require('../languages/setup')
+const User = require('../database/user')
 
 const getOptions = () => {
   const options = structuredClone(Options.stats)
@@ -42,6 +43,7 @@ module.exports = {
   example: 'player_aimed: justdams steam_parameters: weder77 faceit_parameters: sheraw excluded_faceit_parameters: KanzakiR3D map: Vertigo',
   type: 'stats',
   async execute(interaction) {
+    const currentPlayer = await User.exists(interaction.user.id)
     const playerAimed = (await getUsers(interaction, 2, 'player_aimed', 'player_aimed', false))
       .find(e => e.param.match(/^[0-9a-z]{8}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{4}-[0-9a-z]{12}$/i))
       ?.param
@@ -53,7 +55,7 @@ module.exports = {
     const excludedSteam = getInteractionOption(interaction, 'excluded_steam_parameters')
     const excludedFaceit = getInteractionOption(interaction, 'excluded_faceit_parameters')
 
-    if (!excludedSteam && !excludedFaceit) excludedUsers = excludedUsers.filter(e => e.normalize() !== playerAimed.normalize())
+    if (!excludedSteam && !excludedFaceit && currentPlayer) excludedUsers = excludedUsers.filter(e => e.normalize() !== currentPlayer.faceitId)
     if (excludedUsers.some(e => users.includes(e)) || excludedUsers.includes(playerAimed)) throw getTranslation('error.user.excluded', interaction.locale)
 
     return sendCardWithInfo(interaction, playerAimed, null, 0, users.filter(e => e.normalize() !== playerAimed.normalize()), null, excludedUsers)

diff --git a/commands/last.js b/commands/last.js
@@ -288,4 +288,4 @@ module.exports = {
 }
 
 module.exports.sendCardWithInfo = sendCardWithInfo
-module.exports.getMatchItems = getMatchItems
+module.exports.getMatchItems = getMatchItems