perfectionist-plugins 2.4.7 → 2.4.8

package/ban-blocker.js

@@ -1,4 +1,4 @@
-export const version = "3.6.2";
+export const version = "3.6.6";
 
 const PLUGIN_ID = "ban-blocker";
 const STYLE_ID = "perfectionist-ban-blocker-style";
@@ -28,7 +28,8 @@ const CSS = `
   right: -2px !important;
   left: auto !important;
   bottom: auto !important;
-  z-index: 2 !important;
+  z-index: 50 !important;
+  pointer-events: auto !important;
 }
 .swap-button-component.${BTN_CLASS} .icon {
   -webkit-mask-image: url("${BAN_GLYPH}") !important;
@@ -65,6 +66,7 @@ let uiScheduled = false;
 let lastDetect = -Infinity;
 
 const enabled = new Map();
+const blockedCellIds = new Set();
 const alias = new Map();
 const fetchedNames = new Set();
 const playerNames = new Map();
@@ -232,7 +234,9 @@ function decide(s) {
   }
   myActionId = myPick ? myPick.id : null;
 
-  const blockedCells = new Set(m.filter((p) => isBlocked(cellToPlayer.get(p.cellId))).map((p) => p.cellId));
+  const blockedCells = new Set(
+    m.filter((p) => blockedCellIds.has(p.cellId) || isBlocked(cellToPlayer.get(p.cellId))).map((p) => p.cellId),
+  );
 
   let threat = 0;
   for (const a of actions) {
@@ -264,6 +268,7 @@ function onSessionGone() {
   lastSession = null;
   goneAway = true;
   uiVisible = false;
+  blockedCellIds.clear();
   swapSeen.clear();
   removeButtons();
   if (!goneTimer) {
@@ -378,22 +383,29 @@ function bindRowsToTeam(session) {
   const selfIdx = list.findIndex((r) => isSelfRow(r));
   const selfCellIdx =
     session?.localPlayerCellId != null ? cells.findIndex((c) => c.cellId === session.localPlayerCellId) : -1;
+
+  // The DOM can label allied rows 0-4 while the session uses cell IDs 5-9 (red side).
+  // If every row still has a unique matching cell, slot IDs are reliable; otherwise
+  // align by the local row's position in myTeam, then fall back to row order.
+  const bySlot = list.map((r) =>
+    r.slotId != null ? cells.find((c) => c.cellId === r.slotId) ?? null : null,
+  );
+  const slotMapComplete =
+    bySlot.every(Boolean) && new Set(bySlot.map((c) => c.cellId)).size === list.length;
   let pick;
-  if (selfIdx >= 0 && selfCellIdx >= 0) {
-    const selfSlot = list[selfIdx].slotId;
-    if (selfSlot != null && selfSlot === cells[selfCellIdx].cellId) {
-      pick = (r) => (r.slotId != null ? cells.find((c) => c.cellId === r.slotId) : null);
-    } else if (selfIdx === selfCellIdx) {
-      pick = (r) => (r.slotId != null ? cells[r.slotId] : null) ?? cells[r.index];
-    } else {
-      pick = () => null;
-    }
+  if (slotMapComplete) {
+    pick = (r) => bySlot[r.index] ?? null;
   } else {
-    pick = (r) => (r.slotId != null ? cells.find((c) => c.cellId === r.slotId) : null);
+    const shift = selfIdx >= 0 && selfCellIdx >= 0 ? selfCellIdx - selfIdx : 0;
+    pick = (r) => cells[r.index + shift] ?? null;
   }
 
   for (const r of list) {
-    const cell = pick(r) ?? cells.find((c) => nameMatches(r.name, keyOf(c)));
+    const rowName = norm(r.name);
+    const cell =
+      pick(r) ??
+      cells.find((c) => rowName && (norm(c.summonerName) === rowName || payloadName(c) === rowName)) ??
+      cells.find((c) => nameMatches(r.name, keyOf(c)));
     if (cell) {
       r.cell = cell.cellId;
       r.player = linkPlayer(cell, r.name, cell.cellId);
@@ -410,23 +422,56 @@ function stopEvent(e) {
   e.preventDefault();
 }
 
+function cellForRow(r) {
+  if (!r) return null;
+  if (r.cell != null) return r.cell;
+  const cells = lastSession?.myTeam ?? [];
+  if (!cells.length) return r.slotId ?? null;
+  const direct = r.slotId != null ? cells.find((c) => c.cellId === r.slotId) : null;
+  if (direct) return direct.cellId;
+  const selfIdx = rows.findIndex((x) => isSelfRow(x));
+  const selfCellIdx =
+    lastSession?.localPlayerCellId != null
+      ? cells.findIndex((c) => c.cellId === lastSession.localPlayerCellId)
+      : -1;
+  const shift = selfIdx >= 0 && selfCellIdx >= 0 ? selfCellIdx - selfIdx : 0;
+  return cells[r.index + shift]?.cellId ?? cells[r.index]?.cellId ?? null;
+}
+
+function badgeCell(btn) {
+  const rowEl = btn.closest(".summoner-object");
+  const r = rowEl ? rows.find((x) => x.el === rowEl) : rows[Number(btn.dataset.slot)];
+  const cell = cellForRow(r) ?? (btn.dataset.cell ? Number(btn.dataset.cell) : null);
+  return cell == null ? null : Number(cell);
+}
+
 function playerForBadge(btn) {
   const rowEl = btn.closest(".summoner-object");
   const r = rowEl ? rows.find((x) => x.el === rowEl) : rows[Number(btn.dataset.slot)];
-  const byCell = btn.dataset.cell ? cellToPlayer.get(Number(btn.dataset.cell)) ?? null : null;
+  const cell = badgeCell(btn);
+  const member = cell == null ? null : (lastSession?.myTeam ?? []).find((p) => p.cellId === cell);
+  if (member) {
+    const id = linkPlayer(member, r?.name, cell);
+    cellToPlayer.set(cell, id);
+    return canonOf(id);
+  }
+  const byCell = cell == null ? null : cellToPlayer.get(cell) ?? null;
   return canonOf(byCell ?? r?.player ?? null);
 }
 
 function toggle(btn) {
-  let id = playerForBadge(btn);
-  if (id == null && lastSession) {
+  if (lastSession) {
     bindRowsToTeam(lastSession);
-    id = playerForBadge(btn);
+    decide(lastSession);
   }
-  if (id == null) return;
+  const cell = badgeCell(btn);
   const myCell = lastSession?.localPlayerCellId;
-  if (myCell != null && btn.dataset.cell && Number(btn.dataset.cell) === myCell) return;
-  enabled.set(id, !isBlocked(id));
+  if (cell == null || (myCell != null && cell === myCell)) return;
+  const next = !blockedCellIds.has(cell);
+  if (next) blockedCellIds.add(cell);
+  else blockedCellIds.delete(cell);
+  const id = playerForBadge(btn);
+  if (id != null) enabled.set(id, next);
   renderButtons();
   if (lastSession) {
     decide(lastSession);
@@ -461,7 +506,12 @@ function isSelfRow(r) {
 }
 
 function rowKey(r) {
-  return String(r.slotId ?? r.cell ?? r.index);
+  return String(r.cell ?? r.slotId ?? r.index);
+}
+
+function buttonKey(r) {
+  const cell = r.cell ?? r.slotId;
+  return cell == null ? `row:${r.index}` : `cell:${cell}`;
 }
 
 function nativeSwapIn(circle) {
@@ -471,23 +521,25 @@ function nativeSwapIn(circle) {
 
 function ensureButtons() {
   const list = getRows();
+  const active = new Set();
   for (const r of list) {
     if (!r.circle || !r.circle.isConnected) r.circle = r.el.querySelector(".champion-icon-container");
     if (!r.circle || !r.circle.isConnected) continue;
-    const key = rowKey(r);
-    let btn = buttons.get(r.index);
+    const swapKey = rowKey(r);
+    const key = buttonKey(r);
+    let btn = buttons.get(key);
     if (isSelfRow(r)) {
       if (btn) {
         btn.remove();
-        buttons.delete(r.index);
+        buttons.delete(key);
       }
       continue;
     }
-    if (nativeSwapIn(r.circle)) swapSeen.add(key);
-    if (!swapSeen.has(key)) {
+    if (nativeSwapIn(r.circle)) swapSeen.add(swapKey);
+    if (!swapSeen.has(swapKey)) {
       if (btn) {
         btn.remove();
-        buttons.delete(r.index);
+        buttons.delete(key);
       }
       continue;
     }
@@ -496,16 +548,17 @@ function ensureButtons() {
       for (const orphan of r.circle.querySelectorAll(`:scope > .${BTN_CLASS}`)) orphan.remove();
       btn = buildBadge(r.index);
       r.circle.appendChild(btn);
-      buttons.set(r.index, btn);
+      buttons.set(key, btn);
     }
+    active.add(key);
     btn.dataset.slot = String(r.index);
-    const cell = r.cell ?? r.slotId;
+    const cell = cellForRow(r);
     btn.dataset.cell = cell == null ? "" : String(cell);
   }
-  for (const [slot, btn] of [...buttons]) {
-    if (!list[slot] || !btn.isConnected) {
+  for (const [key, btn] of [...buttons]) {
+    if (!active.has(key) || !btn.isConnected) {
       btn.remove();
-      buttons.delete(slot);
+      buttons.delete(key);
     }
   }
 }
@@ -514,7 +567,8 @@ function renderButtons() {
   const hasSession = !!lastSession?.myTeam;
   for (const [, btn] of buttons) {
     const id = playerForBadge(btn);
-    const on = id != null && isBlocked(id);
+    const cell = badgeCell(btn);
+    const on = (cell != null && blockedCellIds.has(cell)) || (id != null && isBlocked(id));
     btn.classList.toggle("on", on);
     btn.classList.toggle("unresolved", id == null && hasSession);
     const title = on ? "Blocked — click to allow their bans" : "Block this teammate's bans";
@@ -640,6 +694,7 @@ function onDisable() {
   failCount.clear();
   cellToPlayer.clear();
   enabled.clear();
+  blockedCellIds.clear();
   playerNames.clear();
   alias.clear();
   fetchedNames.clear();

package/dodge-helper.js

@@ -1,5 +1,5 @@
 const PLUGIN_ID = "dodge-helper";
-export const version = "1.4.3";
+export const version = "1.4.14";
 
 const PHASE_URI = "/lol-gameflow/v1/gameflow-phase";
 const SESSION_URI = "/lol-gameflow/v1/session";
@@ -7,8 +7,8 @@ const CHAMP_SELECT_URI = "/lol-champ-select/v1/session";
 const TIMER_URI = "/lol-champ-select/v1/session/timer";
 const SUMMONER_URI = "/lol-summoner/v1/current-summoner";
 const RANKED_STATS_URI = "/lol-ranked/v1/current-ranked-stats";
-const DODGE_URI = "/lol-gameflow/v1/session/dodge";
-const QUIT_URI = "/lol-lobby-team-builder/champ-select/v1/session/quit";
+const QUIT_V2_URI = '/lol-login/v1/session/invoke?destination=lcdsServiceProxy&method=call&args=["","teambuilder-draft","quitV2",""]';
+const CUSTOM_CANCEL_URI = "/lol-lobby/v1/lobby/custom/cancel-champ-select";
 const STORE_KEY = "perfectionist:dodge-helper:accounts:v1";
 const PENDING_KEY = "perfectionist:dodge-helper:pending:v1";
 const DAY_MS = 24 * 60 * 60 * 1000;
@@ -43,15 +43,30 @@ const GAME_PHASES = new Set([
 
 const CSS = `
 #${LAYER_ID} {
-  position: fixed !important; inset: 0 !important; z-index: 99999 !important;
+  position: fixed !important; inset: 0 !important; z-index: 100 !important;
   pointer-events: none !important;
 }
 #${ROOT_ID} {
   position: fixed !important; display: flex !important; align-items: flex-end !important;
-  justify-content: center !important; width: 125px !important; height: 32px !important;
+  justify-content: center !important; width: 114px !important; height: 32px !important;
   pointer-events: auto !important; z-index: 1 !important;
 }
-#${ROOT_ID} lol-uikit-flat-button { width: 125px !important; height: 32px !important; }
+#${ROOT_ID} .perf-dodge-button {
+  width: 100% !important; height: 32px !important; box-sizing: border-box !important;
+  appearance: none !important; -webkit-appearance: none !important; border-radius: 0 !important;
+  padding: 0 !important; border: 1px solid #785a28 !important;
+  background: linear-gradient(to bottom, #1e2328 0%, #11161c 55%, #0a0e12 100%) !important;
+  color: #cdbe91 !important; font-family: var(--font-display, "Beaufort for LOL", serif) !important;
+  font-size: 13px !important; font-weight: 700 !important; letter-spacing: 1px !important;
+  text-transform: uppercase !important; cursor: pointer !important;
+  text-shadow: 0 1px 2px #000 !important;
+  box-shadow: inset 0 0 0 1px rgba(0, 0, 0, 0.55), inset 0 1px 0 rgba(240, 230, 210, 0.12) !important;
+}
+#${ROOT_ID} .perf-dodge-button:hover {
+  color: #f0e6d2 !important; border-color: #c89b3c !important;
+  background: linear-gradient(to bottom, #2a3038 0%, #192027 55%, #0e141a 100%) !important;
+}
+#${ROOT_ID} .perf-dodge-button:disabled { opacity: 0.6 !important; cursor: default !important; }
 #${ROOT_ID} .perf-dodge-cost {
   position: absolute !important; left: 50% !important; bottom: calc(100% + 4px) !important;
   transform: translateX(-50%) !important; box-sizing: border-box !important;
@@ -399,24 +414,20 @@ function build() {
   const cost = document.createElement("div");
   cost.id = COST_ID;
   cost.className = "perf-dodge-cost";
-  const button = document.createElement("lol-uikit-flat-button");
+  const button = document.createElement("button");
+  button.type = "button";
   button.id = BUTTON_ID;
+  button.className = "perf-dodge-button";
+  button.textContent = "DODGE";
   bindButton(button);
   root.append(cost, button);
   return root;
 }
 
 function bindButton(button) {
-  if (!button) return;
-  if (!button.__perfClickBound) {
-    button.__perfClickBound = true;
-    button.addEventListener("click", onButtonClick, true);
-  }
-  const inner = button.shadowRoot?.querySelector(".lol-uikit-flat-button");
-  if (inner && !inner.__perfClickBound) {
-    inner.__perfClickBound = true;
-    inner.addEventListener("click", onButtonClick);
-  }
+  if (!button || button.__perfClickBound) return;
+  button.__perfClickBound = true;
+  button.addEventListener("click", onButtonClick);
 }
 
 function onButtonClick(event) {
@@ -470,19 +481,30 @@ function positionRoot() {
   const root = document.getElementById(ROOT_ID);
   if (!root) return;
   const footer = visibleFooter();
-  const width = root.offsetWidth || 125;
   const height = root.offsetHeight || 32;
-  if (footer && footer.left > width + 24) {
-    root.style.left = `${Math.round(footer.left - width - 10)}px`;
-    root.style.top = `${Math.round(Math.min(window.innerHeight - height - 8, Math.max(8, footer.bottom - height)))}px`;
-    root.style.right = "auto";
+  if (footer) {
+    const footerElement = document.querySelector(FOOTER_SELECTOR);
+    const chat = footerElement?.querySelector("lol-social-chat-toggle-button");
+    const voice = footerElement?.querySelector(".champ-select-voice-button-wrapper");
+    const chatRect = chat?.getBoundingClientRect();
+    const voiceRect = voice?.getBoundingClientRect();
+    const left = chatRect?.left;
+    const rightEdge = voiceRect?.right ?? footer.right;
+    const width = left && rightEdge > left ? Math.round(rightEdge - left) : 114;
+    const right = Math.round(Math.max(8, window.innerWidth - rightEdge));
+    const top = Math.round(Math.max(8, footer.top - height - 8));
+    root.style.width = `${width}px`;
+    root.style.left = "auto";
+    root.style.right = `${right}px`;
+    root.style.top = `${top}px`;
     root.style.bottom = "auto";
     return;
   }
+  root.style.width = "114px";
   root.style.left = "auto";
   root.style.top = "auto";
-  root.style.right = "145px";
-  root.style.bottom = "21px";
+  root.style.right = "20px";
+  root.style.bottom = "76px";
 }
 
 function schedulePosition() {
@@ -698,14 +720,30 @@ function handleTimer(raw) {
   syncTimer(raw);
 }
 
+async function requestDodge(uri) {
+  const options = { method: "POST" };
+  if (uri === QUIT_V2_URI) options.body = '["","teambuilder-draft","quitV2",""]';
+  const response = await fetch(uri, options);
+  if (!response.ok) throw new Error(`LCU ${uri} responded ${response.status}`);
+  return response;
+}
+
 async function quitOrDodge() {
   if (!active || dodging || !state.queueId || isCustomQueue() || state.showQuitButton) return;
   dodging = true;
   render();
-  const ranked = RANKED_QUEUES.has(Number(state.queueId));
-  const uri = ranked ? DODGE_URI : QUIT_URI;
   try {
-    await api.lcu.send("POST", uri);
+    let sent = false;
+    let lastError = null;
+    for (const uri of [QUIT_V2_URI, CUSTOM_CANCEL_URI]) {
+      try {
+        await requestDodge(uri);
+        sent = true;
+      } catch (error) {
+        lastError = error;
+      }
+    }
+    if (!sent) throw lastError ?? new Error("No dodge endpoint accepted the request");
     await recordDodge();
   } catch (error) {
     console.warn("[Dodge Helper] quit failed:", error);
@@ -832,4 +870,4 @@ export function init() {
   addEventListener("perfectionist:utils-ready", (event) => registerWith(event.detail ?? window.PerfectionistUtils), {
     once: true,
   });
-}
+}

package/hide-unowned-skins.js

@@ -1,4 +1,4 @@
-export const version = "2.4.3";
+export const version = "2.4.5";
 
 const PLUGIN_ID = "hide-unowned-skins";
 const STYLE_ID = "perfectionist-hide-unowned-skins-style";
@@ -27,7 +27,7 @@ const OBSERVER_OPTIONS = {
   attributeFilter: ["src"],
 };
 
-const FILTER_VERSION = "2.4.3";
+const FILTER_VERSION = "2.4.5";
 const FILTER_STATE_KEY = "__perfSkinFilterState";
 const filterState = (globalThis[FILTER_STATE_KEY] ??= { active: true });
 
@@ -69,7 +69,7 @@ function installArrayFilter() {
   const nativeFilter = proto.filter;
   const wrapped = function (callback, thisArg) {
     const result = nativeFilter.call(this, callback, thisArg);
-    if (!filterState.active || !isSkinCollection(result)) return result;
+    if (!filterState.active || currentChampionId === null || !isSkinCollection(result)) return result;
     let changed = false;
     if (!skinShapeKeys) learnSkinShape(result);
     const kept = nativeFilter.call(result, (skin) => {
@@ -109,7 +109,7 @@ function isOwnedSkin(skin) {
 }
 
 function filterSkinList(list) {
-  if (!Array.isArray(list)) return null;
+  if (!Array.isArray(list) || currentChampionId === null) return null;
   if (!skinShapeKeys && isSkinCollection(list)) learnSkinShape(list);
   let changed = false;
   const filtered = list
@@ -133,7 +133,7 @@ function recordClientOrder(list) {
 }
 
 function rewriteWebSocketFrame(text) {
-  if (!filterState.active || typeof text !== "string") return null;
+  if (!filterState.active || currentChampionId === null || typeof text !== "string") return null;
   if (text.indexOf("skin-carousel-skins") === -1) return null;
   let frame;
   try {
@@ -237,7 +237,7 @@ function installFetchFilter() {
           ? input.href
           : "";
     const promise = original.call(this, input, init);
-    if (!filterState.active || url.split("?")[0].indexOf(CAROUSEL_URI) === -1) return promise;
+    if (!filterState.active || currentChampionId === null || url.split("?")[0].indexOf(CAROUSEL_URI) === -1) return promise;
     return promise.then((response) => {
       if (!response || !response.ok) return response;
       let body;
@@ -288,7 +288,7 @@ function installXhrFilter() {
       const cache = { raw: null, filtered: null };
       const filteredText = () => {
         const raw = textDescriptor.get.call(xhr);
-        if (!filterState.active) return raw;
+        if (!filterState.active || currentChampionId === null) return raw;
         if (cache.filtered === null || cache.raw !== raw) {
           cache.raw = raw;
           cache.filtered = raw;
@@ -436,6 +436,7 @@ function scheduleApply() {
   requestAnimationFrame(() => {
     applyQueued = false;
     ensureSourceFilter();
+    if (currentChampionId === null) return;
     const item = document.querySelector(SKIN_ITEM_SELECTOR);
     if (!item && !document.querySelector(DOT_SELECTOR)) return;
     applyAll();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "perfectionist-plugins",
-  "version": "2.4.7",
+  "version": "2.4.8",
   "description": "Small plugins that fix the annoying parts of League of Legends champ select. Built for Pengu Loader.",
   "type": "module",
   "main": "perfectionist-utils.js",

package/perfectionist-utils.js

@@ -30,21 +30,21 @@ const BUNDLED_MODULES = [
     id: "ban-blocker",
     file: "ban-blocker.js",
     name: "Ban Blocker",
-    version: "3.6.2",
+    version: "3.6.6",
     description: "Adds a BLOCK button to your teammates in champ select. While a teammate is blocked, the champion they are about to ban is prepicked for you, so their ban can never land on it.",
   },
   {
     id: "unlock-profile-skins",
     file: "unlock-profile-skins.js",
     name: "Unlock Profile Skins",
-    version: "1.2.4",
+    version: "1.2.6",
     description: "Shows every skin as unlocked in the Set profile background window, event skins included, so you can pick any skin as your profile background.",
   },
   {
     id: "hide-unowned-skins",
     file: "hide-unowned-skins.js",
     name: "Hide Unowned Skins",
-    version: "2.4.3",
+    version: "2.4.5",
     description: "In champ select, the skin carousel only shows the skins you own for the champion you picked.",
   },
   {
@@ -58,7 +58,7 @@ const BUNDLED_MODULES = [
     id: "dodge-helper",
     file: "dodge-helper.js",
     name: "Dodge Helper",
-    version: "1.4.3",
+    version: "1.4.13",
     description: "Adds a DODGE/QUIT button to champ select, showing the LP and queue penalty for the next dodge.",
   },
   {
@@ -384,6 +384,7 @@ function isInstalled(mod) {
 }
 
 function moduleUrl(file) {
+  if (coords?.moduleBase) return new URL(file, coords.moduleBase).href;
   return `${CDN}/${PKG}@${runningVersion}/${file}`;
 }
 

package/unlock-profile-skins.js

@@ -1,4 +1,4 @@
-export const version = "1.2.4";
+export const version = "1.2.6";
 
 const PLUGIN_ID = "unlock-profile-skins";
 const PICKER_BUTTON_SELECTOR = ".style-profile-skin-picker-button";
@@ -39,8 +39,39 @@ function logError(scope, error) {
   console.error(`[Perfectionist] Unlock Profile Skins: ${scope}`, error);
 }
 
+const PICKER_ARM_MS = 5000;
+let pickerArmUntil = 0;
+let pickerArmTimer = null;
+
 function isPickerOpen() {
-  return document.querySelector(PICKER_BUTTON_SELECTOR) !== null;
+  for (const dialog of document.querySelectorAll("lol-uikit-dialog-frame")) {
+    const rect = dialog.getBoundingClientRect();
+    if (rect.width <= 0 || rect.height <= 0) continue;
+    if (/set profile background/i.test(dialog.textContent || "")) return true;
+  }
+  return false;
+}
+
+function shouldFilter() {
+  return filterActive && (isPickerOpen() || Date.now() < pickerArmUntil);
+}
+
+function armPicker() {
+  pickerArmUntil = Date.now() + PICKER_ARM_MS;
+  if (pickerArmTimer !== null) clearTimeout(pickerArmTimer);
+  const waitForPicker = () => {
+    if (isPickerOpen()) {
+      pickerArmTimer = null;
+      startTierGrouping();
+      return;
+    }
+    if (Date.now() >= pickerArmUntil) {
+      pickerArmTimer = null;
+      return;
+    }
+    pickerArmTimer = setTimeout(waitForPicker, 100);
+  };
+  pickerArmTimer = setTimeout(waitForPicker, 50);
 }
 
 function cleanPath(url) {
@@ -386,7 +417,7 @@ function ensureSummonerId() {
     });
 }
 function rewriteInventoryText(raw) {
-  if (typeof raw !== "string") return raw;
+  if (!shouldFilter() || typeof raw !== "string") return raw;
   if (inventoryTextCache.has(raw)) {
     const cached = inventoryTextCache.get(raw);
     inventoryTextCache.delete(raw);
@@ -406,7 +437,7 @@ function rewriteInventoryText(raw) {
 }
 
 function rewriteWebSocketFrame(text) {
-  if (!filterActive || typeof text !== "string") return null;
+  if (!shouldFilter() || typeof text !== "string") return null;
   const targetFrame = text.indexOf("lol-champions/v1/inventories") !== -1;
   const augmentFrame = text.indexOf("SKIN_AUGMENT") !== -1;
   if (!targetFrame && !augmentFrame) return null;
@@ -512,12 +543,12 @@ function installFetchFilter() {
     const inventory = pathIdOf(url) !== null;
     const augmentRequest = isAugmentUrl(url);
     let options = init;
-    if (filterActive && options && typeof options.body === "string") {
+    if (shouldFilter() && options && typeof options.body === "string") {
       const mapped = remapVariantIds(options.body);
       if (mapped !== options.body) options = { ...options, body: mapped };
     }
     const promise = original.call(this, input, options);
-    if (!filterActive || (!inventory && !augmentRequest)) return promise;
+    if (!shouldFilter() || (!inventory && !augmentRequest)) return promise;
     if (inventory) maybeRefreshSummoner();
 
     return whenSummonerKnown(SUMMONER_WAIT_MS).then(() => {
@@ -594,13 +625,13 @@ function installXhrFilter() {
     const url = this.__perfProfileUrl || "";
     const target = isTargetUrl(url);
     const augment = !target && isAugmentUrl(url);
-    if (filterActive && pathIdOf(url) !== null) maybeRefreshSummoner();
-    if (filterActive && typeof args[0] === "string") {
+    if (shouldFilter() && pathIdOf(url) !== null) maybeRefreshSummoner();
+    if (shouldFilter() && typeof args[0] === "string") {
       const mapped = remapVariantIds(args[0]);
       if (mapped !== args[0]) args = [mapped, ...args.slice(1)];
     }
     const xhr = this;
-    if (target && filterActive && augmentIds.size === 0 && textDescriptor && textDescriptor.get) {
+    if (target && shouldFilter() && augmentIds.size === 0 && textDescriptor && textDescriptor.get) {
       const latch = new Promise((resolve) => {
         const finish = () => {
           if (augmentIds.size === 0) {
@@ -619,7 +650,7 @@ function installXhrFilter() {
     }
     if (textDescriptor && textDescriptor.get && (pathIdOf(url) !== null || augment)) {
       const cache = { raw: null, gate: null, filtered: null };
-      const gateOpen = () => filterActive && (augment || isTargetUrl(url));
+      const gateOpen = () => shouldFilter() && (augment || isTargetUrl(url));
       const rewriteBody = (json) => (augment ? unlockAugmentInventory(json) : unlockDeep(json));
       const filteredText = () => {
         const gate = gateOpen();
@@ -653,7 +684,7 @@ function installXhrFilter() {
         });
       }
     }
-    if (augment && filterActive && augmentIds.size === 0) {
+    if (augment && shouldFilter() && augmentIds.size === 0) {
       const sendArgs = args;
       ensureAugmentIds().finally(() => {
         try {
@@ -693,11 +724,10 @@ function onEnable(utils) {
   filterActive = true;
   ensureSourceFilter();
   ensureSummonerId();
-  tierArmListener = () => {
-    if (tierObserver) return;
-    setTimeout(() => {
-      if (tierArmListener && isPickerOpen()) startTierGrouping();
-    }, 0);
+  tierArmListener = (event) => {
+    const target = event.target instanceof Element ? event.target.closest(PICKER_BUTTON_SELECTOR) : null;
+    if (!target) return;
+    armPicker();
   };
   document.addEventListener("click", tierArmListener, true);
   if (isPickerOpen()) startTierGrouping();
@@ -708,6 +738,9 @@ function onDisable() {
   inventoryTextCache.clear();
   if (tierArmListener) document.removeEventListener("click", tierArmListener, true);
   tierArmListener = null;
+  if (pickerArmTimer !== null) clearTimeout(pickerArmTimer);
+  pickerArmTimer = null;
+  pickerArmUntil = 0;
   stopTierGrouping();
   api = null;
 }