Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Savant multiple results #34

Merged
merged 2 commits into from
Aug 5, 2024
Merged

Savant multiple results #34

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8e64764
offer choice when player search returns more than 1 result
AlecM33 Aug 5, 2024
e6dc6aa
fix message
AlecM33 Aug 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
146 changes: 88 additions & 58 deletions config/globals.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,182 +102,212 @@ module.exports = {
{
"id": 133,
"name": "Athletics",
primaryColor: "#003831",
secondaryColor: "#EFB21E"
"primaryColor": "#003831",
"secondaryColor": "#EFB21E",
"abbreviation": "OAK"
},
{
"id": 134,
"name": "Pirates",
primaryColor: "#FDB827",
secondaryColor: "#27251F"
"primaryColor": "#FDB827",
"secondaryColor": "#27251F",
"abbreviation": "PIT"
},
{
"id": 135,
"name": "Padres",
primaryColor: "#2F241D",
secondaryColor: "#FFC425"
"primaryColor": "#2F241D",
"secondaryColor": "#FFC425",
"abbreviation": "SD"
},
{
"id": 136,
"name": "Mariners",
primaryColor: "#005C5C",
secondaryColor: "#0C2C56"
"primaryColor": "#005C5C",
"secondaryColor": "#0C2C56",
"abbreviation": "SEA"
},
{
"id": 137,
"name": "Giants",
primaryColor: "#FD5A1E",
secondaryColor: "#27251F"
"primaryColor": "#FD5A1E",
"secondaryColor": "#27251F",
"abbreviation": "SF"
},
{
"id": 138,
"name": "Cardinals",
primaryColor: "#C41E3A",
secondaryColor: "#0C2340"
"primaryColor": "#C41E3A",
"secondaryColor": "#0C2340",
"abbreviation": "STL"
},
{
"id": 139,
"name": "Rays",
primaryColor: "#8FBCE6",
secondaryColor: "#092C5C"
"primaryColor": "#8FBCE6",
"secondaryColor": "#092C5C",
"abbreviation": "TB"
},
{
"id": 140,
"name": "Rangers",
primaryColor: "#003278",
secondaryColor: "#C0111F"
"primaryColor": "#003278",
"secondaryColor": "#C0111F",
"abbreviation": "TEX"
},
{
"id": 141,
"name": "Blue Jays",
primaryColor: "#134A8E",
secondaryColor: "#1D2D5C"
"primaryColor": "#134A8E",
"secondaryColor": "#1D2D5C",
"abbreviation": "TOR"
},
{
"id": 142,
"name": "Twins",
primaryColor: "#002B5C",
secondaryColor: "#D31145"
"primaryColor": "#002B5C",
"secondaryColor": "#D31145",
"abbreviation": "MIN"
},
{
"id": 143,
"name": "Phillies",
primaryColor: "#E81828",
secondaryColor: "#002D72"
"primaryColor": "#E81828",
"secondaryColor": "#002D72",
"abbreviation": "PHI"
},
{
"id": 144,
"name": "Braves",
"primaryColor": "#CE1141",
secondaryColor: "#13274F"
"secondaryColor": "#13274F",
"abbreviation": "ATL"
},
{
"id": 145,
"name": "White Sox",
primaryColor: "#27251F",
secondaryColor: "#C4CED4"
"primaryColor": "#27251F",
"secondaryColor": "#C4CED4",
"abbreviation": "CWS"
},
{
"id": 146,
"name": "Marlins",
primaryColor: "#00A3E0",
secondaryColor: "#EF3340",
"primaryColor": "#00A3E0",
"secondaryColor": "#EF3340",
"abbreviation": "MIA"
},
{
"id": 147,
"name": "Yankees",
primaryColor: "#C4CED3",
secondaryColor: "#0C2340"
"primaryColor": "#C4CED3",
"secondaryColor": "#0C2340",
"abbreviation": "NYY"
},
{
"id": 158,
"name": "Brewers",
primaryColor: "#FFC52F",
secondaryColor: "#12284B"
"primaryColor": "#FFC52F",
"secondaryColor": "#12284B",
"abbreviation": "MIL"
},
{
"id": 108,
"name": "Angels",
primaryColor: "#BA0021",
secondaryColor: "#003263"
"primaryColor": "#BA0021",
"secondaryColor": "#003263",
"abbreviation": "LAA"
},
{
"id": 109,
"name": "D-backs",
"primaryColor": "#A71930",
"secondaryColor": "#E3D4AD"
"secondaryColor": "#E3D4AD",
"abbreviation": "AZ"
},
{
"id": 110,
"name": "Orioles",
primaryColor: "#DF4601",
secondaryColor: "#000000"
"primaryColor": "#DF4601",
"secondaryColor": "#000000",
"abbreviation": "BAL"
},
{
"id": 111,
"name": "Red Sox",
primaryColor: "#BD3039",
secondaryColor: "#0C2340"
"primaryColor": "#BD3039",
"secondaryColor": "#0C2340",
"abbreviation": "BOS"
},
{
"id": 112,
"name": "Cubs",
primaryColor: "#0E3386",
secondaryColor: "#CC3433"
"primaryColor": "#0E3386",
"secondaryColor": "#CC3433",
"abbreviation": "CHC"
},
{
"id": 113,
"name": "Reds",
primaryColor: "#C6011F",
secondaryColor: "#000000"
"primaryColor": "#C6011F",
"secondaryColor": "#000000",
"abbreviation": "CIN"
},
{
"id": 114,
"name": "Guardians",
primaryColor: "#E50022",
secondaryColor: "#00385D"
"primaryColor": "#E50022",
"secondaryColor": "#00385D",
"abbreviation": "CLE"
},
{
"id": 115,
"name": "Rockies",
primaryColor: "#333366",
secondaryColor: "#C4CED4"
"primaryColor": "#333366",
"secondaryColor": "#C4CED4",
"abbreviation": "COL"
},
{
"id": 116,
"name": "Tigers",
primaryColor: "#0C2340",
secondaryColor: "#FA4616"
"primaryColor": "#0C2340",
"secondaryColor": "#FA4616",
"abbreviation": "DET"
},
{
"id": 117,
"name": "Astros",
primaryColor: "#002D62",
secondaryColor: "#EB6E1F"
"primaryColor": "#002D62",
"secondaryColor": "#EB6E1F",
"abbreviation": "HOU"
},
{
"id": 118,
"name": "Royals",
primaryColor: "#004687",
secondaryColor: "#BD9B60"
"primaryColor": "#004687",
"secondaryColor": "#BD9B60",
"abbreviation": "KC"
},
{
"id": 119,
"name": "Dodgers",
primaryColor: "#005A9C",
secondaryColor: "#EF3E42"
"primaryColor": "#005A9C",
"secondaryColor": "#EF3E42",
"abbreviation": "LAD"
},
{
"id": 120,
"name": "Nationals",
primaryColor: "#AB0003",
secondaryColor: "#14225A"
"primaryColor": "#AB0003",
"secondaryColor": "#14225A",
"abbreviation": "WSH"
},
{
"id": 121,
"name": "Mets",
primaryColor: "#002D72",
secondaryColor: "#FF5910"
"primaryColor": "#002D72",
"secondaryColor": "#FF5910",
"abbreviation": "NYM"
}
],
HELP_MESSAGE: '`/starters` - examine the starting pitching matchup for the upcoming game.\n'
Expand Down
82 changes: 58 additions & 24 deletions modules/command-util.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -562,6 +562,29 @@ module.exports = {
}
},

resolvePlayerSelection: async (players, interaction) => {
const buttons = players.map(player =>
new ButtonBuilder()
.setCustomId(player.id.toString())
.setLabel(`${player.fullName} (${globals.TEAMS.find(team => team.id === player.currentTeam.id)?.abbreviation})`)
.setStyle(ButtonStyle.Primary)
);
const response = await interaction.followUp({
content: 'I found multiple matches. Which one?',
components: [new ActionRowBuilder().addComponents(buttons)]
});
const collectorFilter = i => i.user.id === interaction.user.id;
try {
LOGGER.trace('awaiting');
return await response.awaitMessageComponent({ filter: collectorFilter, time: 20_000 });
} catch (e) {
await interaction.editReply({
content: 'Player selection not received within 20 seconds - request was canceled.',
components: []
});
}
},

giveFinalCommandResponse: async (toHandle, options) => {
await (globalCache.values.game.isDoubleHeader
? toHandle.update(options)
Expand Down Expand Up @@ -671,28 +694,32 @@ module.exports = {
liveFeed.gameData.teams.home.abbreviation + ' ' + homeScore + '**');
},

getClosestPlayer: async (playerName, type) => {
getClosestPlayers: async (playerName, type) => {
const startTime = performance.now();
const allPlayers = await mlbAPIUtil.players();
const removeDiacritics = (str) => str.normalize('NFD').replace(/[\u0300-\u036f]/g, '');
const normalizedPlayerName = removeDiacritics(playerName.toLowerCase());
let matchingPlayer;
let matchingPlayers = [];
let smallestDistance = Infinity;
allPlayers.people.forEach(p => {
const currentName = removeDiacritics(`${p.fullName}`.toLowerCase());
const distance = levenshtein(currentName, normalizedPlayerName);
if (distance < smallestDistance
if (distance <= smallestDistance
&& (
(type === 'Pitcher' && p.primaryPosition.name === 'Pitcher')
|| (type === 'Batter' && p.primaryPosition.name !== 'Pitcher')
)) {
matchingPlayer = p;
smallestDistance = distance;
if (distance < smallestDistance) {
matchingPlayers = [p];
smallestDistance = distance;
} else {
matchingPlayers.push(p);
}
}
});
const endTime = performance.now();
LOGGER.trace(`Savant command - getting closest player took ${endTime - startTime} milliseconds.`);
return matchingPlayer;
return matchingPlayers;
},

getPitcherEmbed: (pitcher, pitcherInfo, isLiveGame, description, savantMode = false) => {
Expand Down Expand Up @@ -791,32 +818,39 @@ module.exports = {
}
},

getBatterFromUserInputOrLiveFeed: async (playerName) => {
let batter, currentLiveFeed;
getPlayerFromUserInputOrLiveFeed: async (playerName, interaction, type) => {
let player, currentLiveFeed, shouldEditReply, pendingChoice;
if (playerName) {
batter = await module.exports.getClosestPlayer(playerName, 'Batter');
} else {
currentLiveFeed = globalCache.values.game.currentLiveFeed;
if (currentLiveFeed && currentLiveFeed.gameData.status.abstractGameState === 'Live') {
batter = currentLiveFeed.liveData.plays.currentPlay.matchup.batter;
const players = await module.exports.getClosestPlayers(playerName, type);
if (players.length > 1) {
pendingChoice = await module.exports.resolvePlayerSelection(players.slice(0, 5), interaction);
const idString = pendingChoice?.customId;
if (idString) {
player = players.find(player => player.id === parseInt(idString));
await pendingChoice.deferUpdate(); // This function says it takes reply options, but it doesn't work?? So I've resorted to editing on the next line.
await interaction.editReply({
content: `Getting stats for ${player.fullName} (${globals.TEAMS.find(team => team.id === player.currentTeam.id)?.abbreviation}). Please wait...`,
components: []
});
shouldEditReply = true;
}
} else {
player = players[0];
}
}

return batter;
},

getPitcherFromUserInputOrLiveFeed: async (playerName) => {
let batter, currentLiveFeed;
if (playerName) {
batter = await module.exports.getClosestPlayer(playerName, 'Pitcher');
} else {
currentLiveFeed = globalCache.values.game.currentLiveFeed;
if (currentLiveFeed && currentLiveFeed.gameData.status.abstractGameState === 'Live') {
batter = currentLiveFeed.liveData.plays.currentPlay.matchup.pitcher;
player = type === 'Pitcher'
? currentLiveFeed.liveData.plays.currentPlay.matchup.pitcher
: currentLiveFeed.liveData.plays.currentPlay.matchup.batter;
}
}

return batter;
return {
player,
pendingChoice,
shouldEditReply
};
}
};

Expand Down
Loading
Loading