bug: fix issue with chat message not showing proper name

Author: lukepolo

src/auth/auth.controller.ts

@@ -49,6 +49,11 @@ export class AuthController {
   public async me(@Req() request: Request) {
     const user = request.user;
 
+    user.name = await this.cache.get(
+      HasuraService.PLAYER_NAME_CACHE_KEY(request.user.steam_id),
+      request.user.name,
+    );
+
     user.role = await this.cache.get(
       HasuraService.PLAYER_ROLE_CACHE_KEY(request.user.steam_id),
     );

src/auth/strategies/SteamSerializer.ts

@@ -1,13 +1,30 @@
 import { PassportSerializer } from "@nestjs/passport";
 import { Inject, Injectable, Logger } from "@nestjs/common";
 import { User } from "../types/User";
+import { CacheService } from "../../cache/cache.service";
+import { HasuraService } from "../../hasura/hasura.service";
 
 @Injectable()
 export class SteamSerializer extends PassportSerializer {
   @Inject()
   private readonly logger: Logger;
 
+  @Inject()
+  private readonly cache: CacheService;
+
   serializeUser(user: User, done: CallableFunction) {
+    void this.cache
+      .forget(HasuraService.PLAYER_NAME_CACHE_KEY(user.steam_id))
+      .catch((error) => {
+        this.logger.error("unable to forget player name cache", error);
+      });
+
+    void this.cache
+      .forget(HasuraService.PLAYER_ROLE_CACHE_KEY(user.steam_id))
+      .catch((error) => {
+        this.logger.error("unable to forget player role cache", error);
+      });
+
     done(null, user);
   }
 

src/cache/cache.service.ts

@@ -15,12 +15,13 @@ export class CacheService {
     this.connection = redis.getConnection();
   }
 
-  public async get(key: string) {
+  public async get(key: string, defaultValue?: any) {
     const value = await this.connection.get(key);
 
     if (value !== null && value !== undefined) {
       return JSON.parse(value);
     }
+    return defaultValue;
   }
 
   public async has(key: string) {

src/chat/chat.service.ts

@@ -6,6 +6,7 @@ import { HasuraService } from "../hasura/hasura.service";
 import { RconService } from "../rcon/rcon.service";
 import { FiveStackWebSocketClient } from "src/sockets/types/FiveStackWebSocketClient";
 import { ChatLobbyType } from "./enums/ChatLobbyTypes";
+import { e_player_roles_enum } from "generated/schema";
 
 @Injectable()
 export class ChatService {
@@ -151,13 +152,21 @@ export class ChatService {
       }
     }
 
+    const name = await this.redis.get(
+      HasuraService.PLAYER_NAME_CACHE_KEY(player.steam_id),
+    );
+
+    const role: e_player_roles_enum = (await this.redis.get(
+      HasuraService.PLAYER_ROLE_CACHE_KEY(player.steam_id),
+    )) as unknown as e_player_roles_enum;
+
     const timestamp = new Date();
     const message = {
       message: _message,
       timestamp: timestamp.toISOString(),
       from: {
-        role: player.role,
-        name: player.name,
+        role: name ? JSON.parse(role) : player.role,
+        name: name ? JSON.parse(name) : player.name,
         steam_id: player.steam_id,
         avatar_url: player.avatar_url,
         profile_url: player.profile_url,

src/hasura/hasura.service.ts

@@ -31,8 +31,12 @@ export class HasuraService {
     this.config = configService.get<HasuraConfig>("hasura");
   }
 
+  public static PLAYER_NAME_CACHE_KEY(steamId: bigint | string) {
+    return `user:name:${steamId.toString()}`;
+  }
+
   public static PLAYER_ROLE_CACHE_KEY(steamId: bigint | string) {
-    return `user:${steamId.toString()}`;
+    return `user:role:${steamId.toString()}`;
   }
 
   public checkSecret(secret: string) {

src/type-sense/type-sense.controller.ts

@@ -39,6 +39,15 @@ export class TypeSenseController {
       ),
     );
 
+    if (data.new.name && data.new.name !== data.old.name) {
+      await this.cache.put(
+        HasuraService.PLAYER_NAME_CACHE_KEY(
+          `${data.new.steam_id || data.old.steam_id}`,
+        ),
+        data.new.name,
+      );
+    }
+
     if (data.op === "DELETE") {
       await this.typeSense.removePlayer(data.old.steam_id);
       return;