Updated types to match expected from EFT

project-fika · Jul 3, 2024 · 59b0437 · 59b0437
1 parent bed3de3
commit 59b0437
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 9 deletions.
diff --git a/src/overrides/callbacks/GameCallbacks.ts b/src/overrides/callbacks/GameCallbacks.ts
@@ -35,14 +35,14 @@ export class GameCallbacksOverride extends Override {
                         squad: group.map(p => ({
                             _id: p._id,
                             aid: String(p.aid),
-                            info: {
+                            Info: {
                                 Nickname: p.Info.Nickname,
                                 Side: p.Info.Side,
                                 Level: String(p.Info.Level),
                                 MemberCategory: p.Info.MemberCategory
                             },
-                            isLeader: p.isLeader,
-                            isReady: p.isReady
+                            IsLeader: p.IsLeader,
+                            IsReady: p.IsReady
                         }))
                     })
                 }

diff --git a/src/overrides/callbacks/MatchCallbacks.ts b/src/overrides/callbacks/MatchCallbacks.ts
@@ -83,7 +83,7 @@ export class MatchCallbacksOverride extends Override {
 
                     // If the leader is ready, then we'll notify everyone that this
                     // player isn't anymore.
-                    if (leaderUnreadied || leader.isReady) {
+                    if (leaderUnreadied || leader.IsReady) {
                         for (const member of group) {
                             this.notifications.sendMessage(member._id, notification);
                         }
@@ -95,7 +95,7 @@ export class MatchCallbacksOverride extends Override {
                         for (const member of group) {
                             this.fikaGroupService.groupMemberNotReady(groupId, member._id);
 
-                            if (member._id === leader._id || !member.isReady) continue
+                            if (member._id === leader._id || !member.IsReady) continue
                             this.notifications.sendMessage(leader._id, {
                                 type: NotificationEventType.GROUP_MATCH_RAID_NOT_READY,
                                 eventId: this.hashUtil.generate(),

diff --git a/src/services/FikaGroupService.ts b/src/services/FikaGroupService.ts
@@ -78,7 +78,7 @@ export class FikaGroupService {
         if (!group) return null
 
         for (const member of group) {
-            if (member.isLeader) return member;
+            if (member.IsLeader) return member;
         }
 
         return null;
@@ -89,7 +89,7 @@ export class FikaGroupService {
         if (!group) return;
         for (const member of group) {
             if (member._id === sessionID) {
-                member.isReady = true;
+                member.IsReady = true;
             }
         }
         this.groups.set(groupId, group);
@@ -101,7 +101,7 @@ export class FikaGroupService {
         if (!group) return;
         for (const member of group) {
             if (member._id === sessionID) {
-                member.isReady = false;
+                member.IsReady = false;
             }
         }
         this.groups.set(groupId, group);
@@ -353,7 +353,7 @@ export class FikaGroupService {
         try {
             const members = this.getGroup(groupId);
             for (const member of members) {
-                member.isLeader = member._id === newLeaderId
+                member.IsLeader = member._id === newLeaderId
             }
             this.groups.set(groupId, members);
             return true;