From a9e1dc853ea3161c6923b3ef6369d8a6b949134b Mon Sep 17 00:00:00 2001
From: Scott Anderson <662325+scottanderson@users.noreply.github.com>
Date: Wed, 25 Jun 2025 11:06:01 -0400
Subject: [PATCH] Fix pattern locking logic (#1270)

## Description:

Fix pattern locking logic

## Please complete the following:

- [x] I have added screenshots for all UI updates
- [x] I process any text displayed to the user through translateText()
and I've added it to the en.json file
- [x] I have added relevant tests to the test directory
- [x] I confirm I have thoroughly tested these changes and take full
responsibility for any bugs introduced
- [x] I understand that submitting code with bugs that could have been
caught through manual testing blocks releases and new features for all
contributors
---
 src/client/Main.ts                   |  2 +-
 src/client/TerritoryPatternsModal.ts | 58 ++++++++++++++--------------
 2 files changed, 29 insertions(+), 31 deletions(-)

diff --git a/src/client/Main.ts b/src/client/Main.ts
index a1862e947..c96e2fe17 100644
--- a/src/client/Main.ts
+++ b/src/client/Main.ts
@@ -220,6 +220,7 @@ class Client {
         loginDiscordButton.hidden = false;
         loginDiscordButton.addEventListener("click", discordLogin);
         logoutDiscordButton.hidden = true;
+        territoryModal.onLogout();
       });
       // Look up the discord user object.
       // TODO: Add caching
@@ -234,7 +235,6 @@ class Client {
         }
         loginDiscordButton.translationKey = "main.logged_in";
         loginDiscordButton.hidden = true;
-        const { user, player } = userMeResponse;
         territoryModal.onUserMe(userMeResponse);
       });
     }
diff --git a/src/client/TerritoryPatternsModal.ts b/src/client/TerritoryPatternsModal.ts
index e02952851..e2788d5fb 100644
--- a/src/client/TerritoryPatternsModal.ts
+++ b/src/client/TerritoryPatternsModal.ts
@@ -29,13 +29,15 @@ export class TerritoryPatternsModal extends LitElement {
   @state() private keySequence: string[] = [];
   @state() private showChocoPattern = false;
 
-  @state() private roles: string[] = [];
-  @state() private flares: string[] = [];
-
   public resizeObserver: ResizeObserver;
 
   private userSettings: UserSettings = new UserSettings();
 
+  constructor() {
+    super();
+    this.checkPatternPermission(undefined, undefined);
+  }
+
   connectedCallback() {
     super.connectedCallback();
     this.selectedPattern = this.userSettings.getSelectedPattern();
@@ -57,35 +59,34 @@ export class TerritoryPatternsModal extends LitElement {
     this.resizeObserver.disconnect();
   }
 
-  onUserMe(userMeResponse: UserMeResponse) {
-    const { user, player } = userMeResponse;
-    if (player) {
-      const { publicId, roles, flares } = player;
-      if (roles) {
-        this.roles = roles;
-      }
-      if (flares) {
-        this.flares = flares;
-      }
-    }
-    this.checkPatternPermission(this.roles);
-    this.requestUpdate();
+  onLogout() {
+    this.checkPatternPermission(undefined, undefined);
   }
 
-  private checkPatternPermission(roles: string[]) {
-    const patterns = COSMETICS.patterns;
-    for (const key in patterns) {
-      const patternData = patterns[key];
+  onUserMe(userMeResponse: UserMeResponse) {
+    const { player } = userMeResponse;
+    const { roles, flares } = player;
+    this.checkPatternPermission(roles, flares);
+  }
+
+  private checkPatternPermission(
+    roles: string[] | undefined,
+    flares: string[] | undefined,
+  ) {
+    this.lockedPatterns = [];
+    this.lockedReasons = {};
+    for (const key in COSMETICS.patterns) {
+      const patternData = COSMETICS.patterns[key];
       const roleGroup: string[] | string | undefined = patternData.role_group;
       if (
-        this.flares.includes("pattern:*") ||
-        this.flares.includes(`pattern:${key}`)
+        flares !== undefined &&
+        (flares.includes("pattern:*") || flares.includes(`pattern:${key}`))
       ) {
         continue;
       }
 
       if (!roleGroup || (Array.isArray(roleGroup) && roleGroup.length === 0)) {
-        if (roles.length === 0) {
+        if (roles === undefined || roles.length === 0) {
           const reason = translateText("territory_patterns.blocked.login");
           this.setLockedPatterns([key], reason);
         }
@@ -93,7 +94,9 @@ export class TerritoryPatternsModal extends LitElement {
       }
 
       const groupList = Array.isArray(roleGroup) ? roleGroup : [roleGroup];
-      const isAllowed = groupList.some((required) => roles.includes(required));
+      const isAllowed =
+        roles !== undefined &&
+        groupList.some((required) => roles.includes(required));
 
       if (!isAllowed) {
         const reason = translateText("territory_patterns.blocked.role", {
@@ -102,6 +105,7 @@ export class TerritoryPatternsModal extends LitElement {
         this.setLockedPatterns([key], reason);
       }
     }
+    this.requestUpdate();
   }
 
   private handleKeyDown = (e: KeyboardEvent) => {
@@ -236,7 +240,6 @@ export class TerritoryPatternsModal extends LitElement {
   }
 
   render() {
-    this.resetLockedPatterns();
     return html`
       ${this.renderTooltip()}
       <o-modal
@@ -394,11 +397,6 @@ export class TerritoryPatternsModal extends LitElement {
     };
   }
 
-  private resetLockedPatterns() {
-    this.lockedPatterns = [];
-    this.lockedReasons = {};
-  }
-
   private isPatternLocked(patternKey: string): boolean {
     return this.lockedPatterns.includes(patternKey);
   }