From 5228252c8e84d568392d0e2e34394591a4e59218 Mon Sep 17 00:00:00 2001
From: pa <maplenagisa@gmail.com>
Date: Thu, 8 Jan 2026 19:05:51 +0900
Subject: [PATCH] fix playerlist icon sorting

---
 src/views/PlayerList/columns.jsx | 27 +++++++++++++++++++++------
 1 file changed, 21 insertions(+), 6 deletions(-)

diff --git a/src/views/PlayerList/columns.jsx b/src/views/PlayerList/columns.jsx
index 8eb70e0a..22e80a03 100644
--- a/src/views/PlayerList/columns.jsx
+++ b/src/views/PlayerList/columns.jsx
@@ -14,12 +14,19 @@ import { i18n } from '../../plugin';
 
 const { t } = i18n.global;
 
-const sortButton = ({ column, label }) => (
+const sortButton = ({ column, label, descFirst = false }) => (
     <Button
         variant="ghost"
         size="sm"
         class="-ml-2 h-8 px-2"
-        onClick={() => column.toggleSorting(column.getIsSorted() === 'asc')}
+        onClick={() => {
+            const sorted = column.getIsSorted();
+            if (!sorted && descFirst) {
+                column.toggleSorting(true);
+                return;
+            }
+            column.toggleSorting(sorted === 'asc');
+        }}
     >
         {label}
         <ArrowUpDown class="ml-1 h-4 w-4" />
@@ -36,9 +43,13 @@ const getInstanceIconWeight = (item) => {
     if (item.isMuted) value -= 50;
     if (item.isAvatarInteractionDisabled) value -= 20;
     if (item.isChatBoxMuted) value -= 10;
+    if (item.ageVerified) value += 5;
     return value;
 };
 
+const sortInstanceIcon = (a, b) =>
+    getInstanceIconWeight(b) - getInstanceIconWeight(a);
+
 export const createColumns = ({
     randomUserColours,
     photonLoggingEnabled,
@@ -220,16 +231,20 @@ export const createColumns = ({
         {
             id: 'icon',
             header: ({ column }) =>
-                sortButton({ column, label: t('table.playerList.icon') }),
+                sortButton({
+                    column,
+                    label: t('table.playerList.icon'),
+                    descFirst: true
+                }),
             size: 90,
             accessorFn: (row) => getInstanceIconWeight(row),
             meta: {
                 class: 'w-[90px] text-center'
             },
             sortingFn: (rowA, rowB, columnId) => {
-                const a = rowA.getValue(columnId) ?? 0;
-                const b = rowB.getValue(columnId) ?? 0;
-                return b - a;
+                const a = rowA.original;
+                const b = rowB.original;
+                return -sortInstanceIcon(a, b);
             },
             cell: ({ row }) => {
                 const r = row.original;