Data changes and minor fixes to effects and jump squat fix

package.json

@@ -1,6 +1,6 @@
 {
   "name": "fightcore.bot",
-  "version": "2.5.2",
+  "version": "2.5.4",
   "description": "FightCore Discord bot to display frame data",
   "main": "index.js",
   "scripts": {
@@ -26,26 +26,26 @@
   },
   "homepage": "https://github.com/FightCore/bot-js#readme",
   "dependencies": {
-    "@apollo/client": "^3.11.3",
+    "@apollo/client": "^3.12.4",
     "@datalust/winston-seq": "^2.0.0",
-    "@elastic/elasticsearch": "^8.14.0",
-    "axios": "^1.7.3",
-    "discord.js": "^14.15.3",
-    "dotenv": "^16.4.5",
-    "inversify": "^6.0.2",
+    "@elastic/elasticsearch": "^8.17.0",
+    "axios": "^1.7.9",
+    "discord.js": "^14.17.2",
+    "dotenv": "^16.4.7",
+    "inversify": "^6.2.1",
     "jaro-winkler-typescript": "^1.0.1",
-    "reflect-metadata": "^0.1.14",
+    "reflect-metadata": "^0.2.2",
     "sqlite3": "^5.1.7",
-    "winston": "^3.13.1"
+    "winston": "^3.17.0"
   },
   "devDependencies": {
     "@jest/globals": "^29.7.0",
-    "@types/node": "^16.18.104",
+    "@types/node": "^16.18.123",
     "@typescript-eslint/eslint-plugin": "^6.21.0",
     "@typescript-eslint/parser": "^6.21.0",
-    "eslint": "^8.57.0",
+    "eslint": "^8.57.1",
     "jest": "^29.7.0",
-    "ts-jest": "^29.2.4",
-    "typescript": "^5.5.4"
+    "ts-jest": "^29.2.5",
+    "typescript": "^5.7.2"
   }
-}
+}

src/assets/names.json

@@ -117,6 +117,15 @@
         "names": [
             "kirby"
         ],
+        "moves": {
+            "suck": "neutralb",
+            "succ": "neutralb",
+            "inhale": "neutralb",
+            "swallow": "neutralb",
+            "copy": "neutralb",
+            "absorb": "neutralb",
+            "ingest": "neutralb"
+        },
         "fightCoreId": 210
     },
     {

src/discord-client.ts

@@ -1,6 +1,5 @@
 import { Message, Client, Interaction, PartialMessage, Partials, GatewayIntentBits } from 'discord.js';
-import { Container, inject } from 'inversify';
-import { injectable } from 'inversify/lib/annotation/injectable';
+import { Container, inject, injectable } from 'inversify';
 import { Logger } from 'winston';
 import { RegisterCommands } from './commands/register-commands';
 import { Symbols } from './config/symbols';

src/embeds/character-embed-creator.ts

@@ -42,7 +42,7 @@ export class CharacterEmbedCreator extends BaseEmbedCreator {
       { title: 'Weight', value: characterStatistics.weight },
       { title: 'Gravity', value: characterStatistics.gravity },
       { title: 'Can wall jump', value: characterStatistics.canWallJump },
-      { title: 'Jump squad frames', value: characterStatistics.jumpSquat },
+      { title: 'Jump squat frames', value: characterStatistics.jumpSquat },
     ];
     return {
       name: 'Frame data',

src/embeds/formatting/body-formatter.ts

@@ -13,6 +13,9 @@ export class BodyFormatter {
     }
 
     properties = properties.filter((property) => !!property.value);
-    return properties.map(InfoLine.createLine).join('\n');
+    return properties
+      .map(InfoLine.createLine)
+      .filter((value) => !!value)
+      .join('\n');
   }
 }

src/embeds/formatting/info-line.ts

@@ -14,6 +14,10 @@ export class InfoLine {
       return undefined;
     }
 
+    if (typeof value === 'string' && value.indexOf('/') === 0) {
+      return undefined;
+    }
+
     return `**${title}**: ${value}`;
   }
 

src/embeds/move-embed-creator.ts

@@ -240,7 +240,7 @@ export class MoveEmbedCreator extends BaseEmbedCreator {
       {
         title: 'Effect',
         // Filter out the "Normal" effects cause they don't say anything.
-        value: hitboxes.map((hitbox) => (hitbox.effect === 'Normal' ? null : hitbox.effect)).join('/'),
+        value: hitboxes.map((hitbox) => (hitbox.effect === 'Normal' || hitbox.effect == '' ? null : hitbox.effect)).join('/'),
       },
       {
         title: 'Base knockback',

src/interactions/message-interaction-handler.ts

@@ -43,7 +43,10 @@ export class MessageInteractionHandler extends BaseInteractionHandler {
       if (!messageSearchResult.shouldRespond) {
         return;
       }
-      await message.channel.sendTyping();
+
+      if (message.channel.isSendable()) {
+        await message.channel.sendTyping();
+      }
 
       if (messageSearchResult.isRoleMessage) {
         await message.reply({ embeds: RoleEmbedCreator.createErrorEmbed() });

src/meta-data.ts

@@ -1 +1 @@
-export const versionNumber = '2.5.3';
+export const versionNumber = '2.5.4';

tests/move-embed.test.ts

@@ -1,8 +1,8 @@
 import { expect, test } from '@jest/globals';
 import { MoveEmbedCreator } from '../src/embeds/move-embed-creator';
-import { createCharacter, createMove } from './create-test-data';
+import { createCharacter, createMove } from './create-data.test';
 import { versionNumber } from '../src/meta-data';
-import { getEmbedJson, getMarth, getMarthFTilt } from './move-embed-test-data';
+import { getEmbedJson, getMarth, getMarthFTilt } from './move-embed-data.test';
 
 test('Ensure correct gif is added to embed', async () => {
   const baseUrl = 'https://i.fightcore.gg/moves/1.gif';

tests/search.test.ts

@@ -0,0 +1,70 @@
+import 'reflect-metadata';
+import winston from 'winston';
+import { Loader } from '../src/data/loader';
+import { Search } from '../src/data/search';
+import { AliasParser } from '../src/data/alias-parser';
+import { expect, test } from '@jest/globals';
+import { SearchResultType } from '../src/models/search/search-result-type';
+import { describe } from 'node:test';
+
+test('Ensure search works with characters', async () => {
+  const search = await setupSearch();
+  const marth = search.searchCharacter(['Marth']);
+  expect(marth).toBeDefined();
+  expect(marth!.name).toBe('Marth');
+  expect(marth!.normalizedName).toBe('marth');
+});
+
+test('Ensure search works with an alias', async () => {
+  const search = await setupSearch();
+  const marth = search.searchCharacter(['Puff']);
+  expect(marth).toBeDefined();
+  expect(marth!.name).toBe('Jigglypuff');
+  expect(marth!.normalizedName).toBe('jigglypuff');
+});
+
+test('Ensure move search works for a basic move', async () => {
+  const search = await setupSearch();
+  const move = search.search('marth fsmash');
+  expect(move).toBeDefined();
+  expect(move.type).toBe(SearchResultType.Move);
+  expect(move.move.name).toBe('Forward Smash');
+  expect(move.character.name).toBe('Marth');
+});
+
+describe('Ensure move search works with different cases', () => {
+  const cases = [
+    ['Marth usmash', 'Marth', 'Up Smash'],
+    ['fox shine', 'Fox', 'Reflector'],
+    ['shine', 'Fox', 'Reflector'],
+    ['falcon knee', 'Captain Falcon', 'Forward Air'],
+    ['gnw hammer', 'Mr. Game & Watch', 'Judgement'],
+    ['rest', 'Jigglypuff', 'Rest'],
+  ];
+
+  test.each(cases)('Ensure move search works for %s', async (query: string, expectedCharacter: string, expectedMove: string) => {
+    const search = await setupSearch();
+    const move = search.search(query);
+    expect(move).toBeDefined();
+    expect(move.type).toBe(SearchResultType.Move);
+    expect(move.move.name).toBe(expectedMove);
+    expect(move.character.name).toBe(expectedCharacter);
+  });
+});
+
+async function setupSearch(): Promise<Search> {
+  // Create a silent unit test logger.
+  const logger = winston.createLogger({
+    transports: [
+      new winston.transports.Console({
+        // Set the level to silent to prevent any output
+        level: 'silent',
+      }),
+    ],
+  });
+
+  const loader = new Loader(logger);
+  await loader.ensureLoaded();
+  const aliasParser = new AliasParser(loader);
+  return new Search(aliasParser);
+}

tsconfig-build.json

@@ -4,6 +4,7 @@
         "rootDir": "./src",
     },
     "exclude": [
-      "tests/**/*.test.ts"
+      "tests/**/*.test.ts",
+      "tests/**/*-test.ts"
     ]
   }