fix: fixes lost punctiation in display formatting (#270)

fixes #266
ssilve1989 · May 16, 2024 · 9eb9ac7 · 9eb9ac7
1 parent e7fda08
commit 9eb9ac7
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 19 deletions.
diff --git a/package.json b/package.json
@@ -35,7 +35,6 @@
     "@sentry/cli": "^2.31.2",
     "@sentry/node": "^7.113.0",
     "@sentry/profiling-node": "^7.113.0",
-    "change-case": "^5.4.4",
     "class-transformer": "^0.5.1",
     "class-validator": "^0.14.1",
     "dayjs": "^1.11.11",
@@ -48,6 +47,7 @@
     "pino-pretty": "^11.0.0",
     "reflect-metadata": "^0.2.2",
     "rxjs": "^7.8.1",
+    "title-case": "^4.3.1",
     "ts-pattern": "^5.1.1",
     "tslib": "^2.6.2"
   },

diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/commands/lookup/lookup.command-handler.ts b/src/commands/lookup/lookup.command-handler.ts
@@ -1,8 +1,8 @@
 import { Logger } from '@nestjs/common';
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { capitalCase } from 'change-case';
 import { plainToInstance } from 'class-transformer';
 import { CommandInteractionOptionResolver, EmbedBuilder } from 'discord.js';
+import { titleCase } from 'title-case';
 import { EncounterFriendlyDescription } from '../../encounters/encounters.consts.js';
 import { SignupCollection } from '../../firebase/collections/signup.collection.js';
 import { SignupDocument } from '../../firebase/models/signup.model.js';
@@ -32,7 +32,7 @@ class LookupCommandHandler implements ICommandHandler<LookupCommand> {
       ({ world, character, encounter, availability }) => [
         {
           name: 'Character',
-          value: `${capitalCase(character)} @ ${capitalCase(world)}`,
+          value: `${titleCase(character)} @ ${titleCase(world)}`,
           inline: true,
         },
         {

diff --git a/src/commands/signup/signup-command.handler.ts b/src/commands/signup/signup-command.handler.ts
@@ -1,6 +1,5 @@
 import { Logger } from '@nestjs/common';
 import { CommandHandler, EventBus, ICommandHandler } from '@nestjs/cqrs';
-import { capitalCase } from 'change-case';
 import { plainToInstance } from 'class-transformer';
 import { ValidationError, validate } from 'class-validator';
 import {
@@ -12,6 +11,7 @@ import {
   DiscordjsErrorCodes,
   EmbedBuilder,
 } from 'discord.js';
+import { titleCase } from 'title-case';
 import { P, match } from 'ts-pattern';
 import { isSameUserFilter } from '../../common/collection-filters.js';
 import {
@@ -186,11 +186,11 @@ class SignupCommandHandler implements ICommandHandler<SignupCommand> {
       .addFields([
         {
           name: 'Character',
-          value: capitalCase(character),
+          value: titleCase(character),
           inline: true,
         },
         { name: '\u200B', value: '\u200B', inline: true },
-        { name: 'Home World', value: capitalCase(world), inline: true },
+        { name: 'Home World', value: titleCase(world), inline: true },
         { name: 'Availability', value: availability, inline: true },
         { name: '\u200B', value: '\u200B', inline: true },
         { name: 'Role', value: role, inline: true },

diff --git a/src/commands/signup/subcommands/send-signup-review/send-signup-review-command.handler.ts b/src/commands/signup/subcommands/send-signup-review/send-signup-review-command.handler.ts
@@ -1,7 +1,7 @@
 import { Logger } from '@nestjs/common';
 import { CommandHandler, ICommandHandler } from '@nestjs/cqrs';
-import { capitalCase } from 'change-case';
 import { EmbedBuilder } from 'discord.js';
+import { titleCase } from 'title-case';
 import { MissingChannelException } from '../../../../discord/discord.exceptions.js';
 import { DiscordService } from '../../../../discord/discord.service.js';
 import { EncounterFriendlyDescription } from '../../../../encounters/encounters.consts.js';
@@ -92,11 +92,11 @@ class SendSignupReviewCommandHandler
         },
         {
           name: 'Character',
-          value: capitalCase(character),
+          value: titleCase(character),
           inline: true,
         },
         { name: '\u200B', value: '\u200B', inline: true },
-        { name: 'Home World', value: capitalCase(world), inline: true },
+        { name: 'Home World', value: titleCase(world), inline: true },
         { name: 'Availability', value: availability, inline: true },
         { name: 'Job', value: role, inline: true },
         { name: 'Prog Point', value: progPointRequested, inline: true },

diff --git a/src/sheets/sheets.service.ts b/src/sheets/sheets.service.ts
@@ -2,7 +2,7 @@ import { sheets_v4 } from '@googleapis/sheets';
 import { Inject, Injectable, Logger } from '@nestjs/common';
 import { ConfigType } from '@nestjs/config';
 import * as Sentry from '@sentry/node';
-import { capitalCase } from 'change-case';
+import { titleCase } from 'title-case';
 import { AsyncQueue } from '../common/async-queue/async-queue.js';
 import { PartyType, SignupDocument } from '../firebase/models/signup.model.js';
 import { SignupCompositeKeyProps } from '../firebase/models/signup.model.js';
@@ -422,7 +422,7 @@ class SheetsService {
     role,
     progPoint = '',
   }: SignupDocument) {
-    return [capitalCase(character), capitalCase(world), role, progPoint];
+    return [titleCase(character), titleCase(world), role, progPoint];
   }
 }