From e016f23f559cf90d29606ea79164d4f0b6977a53 Mon Sep 17 00:00:00 2001
From: SeanWalsh95 <SeanWalsh95@users.noreply.github.com>
Date: Sat, 7 Nov 2020 18:43:28 -0500
Subject: [PATCH] update to support new util admin lists

---
 squad-server/plugins/auto-kick-unassigned.js | 16 +++++-----------
 1 file changed, 5 insertions(+), 11 deletions(-)

diff --git a/squad-server/plugins/auto-kick-unassigned.js b/squad-server/plugins/auto-kick-unassigned.js
index c5daef8..8af88e6 100644
--- a/squad-server/plugins/auto-kick-unassigned.js
+++ b/squad-server/plugins/auto-kick-unassigned.js
@@ -12,12 +12,6 @@ export default class AutoKickUnassigned extends BasePlugin {
 
   static get optionsSpecification() {
     return {
-      adminList: {
-        required: true,
-        description: 'List of server admins.',
-        connector: 'remoteAdminLists',
-        default: 'remoteAdminLists'
-      },
       warningMessage: {
         required: false,
         description: 'Message SquadJS will send to players warning them they will be kicked',
@@ -81,10 +75,10 @@ export default class AutoKickUnassigned extends BasePlugin {
    *  }
    */
   constructor(server, options) {
-    super();
+    super(server, options, rawOptions);
 
-    this.server = server;
-    this.options = options;
+    this.admins = server.getAdminsWithPermission('canseeadminchat');
+    this.whitelist = server.getAdminsWithPermission('reserve');
 
     this.kickTimeout = options.unassignedTimer * 60 * 1000;
     this.warningInterval = options.frequencyOfWarnings * 1000;
@@ -152,8 +146,8 @@ export default class AutoKickUnassigned extends BasePlugin {
     for (const player of this.server.players) {
       const isTracked     = player.steamID in this.trackedPlayers;
       const isUnassigned  = player.squadID === null;
-      const isAdmin       = player.steamID in this.options.adminList.admins;
-      const isWhitelist   = player.steamID in this.options.adminList.whitelist;
+      const isAdmin       = player.steamID in this.admins;
+      const isWhitelist   = player.steamID in this.whitelist;
 
       if (isUnassigned && isAdmin) Logger.verbose('AutoKick', 2, `Admin is Unassigned: ${player.name}`);
       if (isUnassigned && isWhitelist) Logger.verbose('AutoKick', 2, `Whitelist player is Unassigned: ${player.name}`);