feat(groups): get group active players (#9)

Author: ESK0

server/groups/index.ts

@@ -20,6 +20,21 @@ export function GetGroupsByType(type: string) {
   }, [] as string[]);
 }
 
+export function GetGroupActivePlayers(groupName: string) {
+  const group = groups[groupName];
+
+  return group ? [...group.activePlayers] : [];
+}
+
+export function GetGroupActivePlayersByType(type: string) {
+  return Object.values(groups).reduce((acc, group) => {
+    if (group.type === type) {
+      acc.push(...group.activePlayers);
+    }
+    return acc;
+  }, [] as number[]);
+}
+
 export function SetGroupPermission(groupName: string, grade: number, permission: string, value: 'allow' | 'deny') {
   const permissions = GetGroupPermissions(groupName);
 
@@ -48,6 +63,8 @@ function SetupGroup(data: DbGroup) {
   GlobalState[`${group.name}:count`] = 0;
   GlobalState[`${group.name}:activeCount`] = 0;
 
+  group.activePlayers = new Set();
+
   groups[group.name] = group;
   group.grades = group.grades.reduce(
     (acc, value, index) => {
@@ -99,6 +116,7 @@ export async function CreateGroup(data: CreateGroupProperties) {
     grades: grades,
     accountRoles: accountRoles,
     hasAccount: data.hasAccount ?? false,
+    activePlayers: new Set(),
   };
 
   const response = await InsertGroup(group);
@@ -185,3 +203,5 @@ exports('SetGroupPermission', SetGroupPermission);
 exports('RemoveGroupPermission', RemoveGroupPermission);
 exports('CreateGroup', CreateGroup);
 exports('DeleteGroup', DeleteGroup);
+exports('GetGroupActivePlayers', GetGroupActivePlayers);
+exports('GetGroupActivePlayersByType', GetGroupActivePlayersByType);

server/player/class.ts

@@ -187,9 +187,19 @@ export class OxPlayer extends ClassInterface {
 
     const currentActiveGroup = this.get('activeGroup');
 
-    if (currentActiveGroup) GlobalState[`${currentActiveGroup}:activeCount`] -= 1;
+    if (currentActiveGroup) {
+      GlobalState[`${currentActiveGroup}:activeCount`] -= 1;
 
-    if (groupName) GlobalState[`${groupName}:activeCount`] += 1;
+      const group = GetGroup(currentActiveGroup);
+      group.activePlayers.delete(+this.source);
+    }
+
+    if (groupName) {
+      GlobalState[`${groupName}:activeCount`] += 1;
+
+      const group = GetGroup(groupName);
+      group.activePlayers.add(+this.source);
+    }
 
     SetActiveGroup(this.charId, temp ? undefined : groupName);
     this.set('activeGroup', groupName, true);
@@ -437,7 +447,10 @@ export class OxPlayer extends ClassInterface {
     delete this.#groups[group.name];
     GlobalState[`${group.name}:count`] -= 1;
 
-    if (canRemoveActiveCount && group.name === this.get('activeGroup')) GlobalState[`${group.name}:activeCount`] -= 1;
+    if (canRemoveActiveCount && group.name === this.get('activeGroup')) {
+      GlobalState[`${group.name}:activeCount`] -= 1;
+      group.activePlayers.delete(+this.source);
+    }
   }
 
   /** Saves the active character to the database. */
@@ -582,8 +595,14 @@ export class OxPlayer extends ClassInterface {
     this.set('phoneNumber', phoneNumber, true);
     this.set('activeGroup', groups.find((group) => group.isActive)?.name, true);
 
-    if (this.get('activeGroup')) GlobalState[`${this.get('activeGroup')}:activeCount`] += 1;
-    DEV: console.info(`Restored OxPlayer<${this.userId}> previous active group: ${this.get('activeGroup')}`);
+    const activeGroup = this.get('activeGroup');
+    if (activeGroup) {
+      GlobalState[`${this.get('activeGroup')}:${activeGroup}`] += 1;
+
+      const group = GetGroup(activeGroup)
+      group.activePlayers.add(+this.source);
+    }
+    DEV: console.info(`Restored OxPlayer<${this.userId}> previous active group: ${activeGroup}`);
 
     OxPlayer.keys.charId[character.charId] = this;
 

types/index.ts

@@ -140,6 +140,7 @@ export interface DbGroup {
   type?: string;
   colour?: number;
   hasAccount: boolean;
+  activePlayers: Set<number>;
 }
 
 export interface OxGroup extends DbGroup {