From 41767478ad2502f0113da0621c04b295685627cc Mon Sep 17 00:00:00 2001
From: Shigma <shigma10826@gmail.com>
Date: Mon, 1 Jan 2024 16:20:16 +0800
Subject: [PATCH] feat(admin): use colon separated permissions

---
 plugins/admin/client/group.vue |  8 ++++----
 plugins/admin/client/name.vue  |  4 ++--
 plugins/admin/src/index.ts     | 17 ++++++++---------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/plugins/admin/client/group.vue b/plugins/admin/client/group.vue
index 39e8ce24..fe88b371 100644
--- a/plugins/admin/client/group.vue
+++ b/plugins/admin/client/group.vue
@@ -65,7 +65,7 @@
 
       <el-select v-model="permission">
         <el-option
-          v-for="id in store.permissions.filter(item => (active.type === 'track' ? item.startsWith('group.') : true) && !permissions.includes(item))"
+          v-for="id in [...Object.keys(store.admin.group).map(id => `group:${id}`), ...active.type === 'track' ? [] : store.permissions]"
           :key="id"
           :value="id">
           <permission-name :id="id" />
@@ -232,11 +232,11 @@ async function removeUser() {
 }
 
 function getLink(name: string) {
-  if (name.startsWith('group.')) {
+  if (name.startsWith('group:')) {
     return `/admin/group/${name.slice(6)}`
-  } else if (name.startsWith('track.')) {
+  } else if (name.startsWith('track:')) {
     return `/admin/track/${name.slice(6)}`
-  } else if (name.startsWith('command.')) {
+  } else if (name.startsWith('command:')) {
     return `/commands/${name.slice(8).replace(/\./g, '/')}`
   }
 }
diff --git a/plugins/admin/client/name.vue b/plugins/admin/client/name.vue
index 52776277..0d0b4315 100644
--- a/plugins/admin/client/name.vue
+++ b/plugins/admin/client/name.vue
@@ -1,8 +1,8 @@
 <template>
-  <template v-if="id.startsWith('command.')">
+  <template v-if="id.startsWith('command:')">
     指令：{{ id.slice(8) }}
   </template>
-  <template v-else-if="id.startsWith('group.')">
+  <template v-else-if="id.startsWith('group:')">
     用户组：{{ store.locales?.[`permission.${id}`] || store.admin.group[id.slice(6)].name || '未命名' }}
   </template>
   <template v-else>
diff --git a/plugins/admin/src/index.ts b/plugins/admin/src/index.ts
index e2db4499..617fadb3 100644
--- a/plugins/admin/src/index.ts
+++ b/plugins/admin/src/index.ts
@@ -61,7 +61,7 @@ export class Admin extends Service {
     this.tracks = await this.ctx.database.get('perm_track', {})
     for (const item of this.groups) {
       item.count = await this.ctx.database
-        .select('user', { permissions: { $el: 'group.' + item.id } })
+        .select('user', { permissions: { $el: 'group:' + item.id } })
         .execute(row => $.count(row.id)) || 0
       this.setupGroup(item)
     }
@@ -72,8 +72,7 @@ export class Admin extends Service {
 
   private setupGroup(item: PermGroup) {
     item.dispose = this.ctx.permissions.define('(name)', {
-      inherits: ({ name }) => item.permissions.includes(name) && ['group.' + item.id],
-      list: () => ['group.' + item.id],
+      inherits: ({ name }) => item.permissions.includes(name) && ['group:' + item.id],
     })
   }
 
@@ -143,13 +142,13 @@ export class Admin extends Service {
     if (index < 0) throw new Error('group not found')
     const [item] = this.groups.splice(index, 1)
     item.dispose!()
-    const users = await this.ctx.database.get('user', { permissions: { $el: 'group.' + id } }, ['id', 'permissions'])
+    const users = await this.ctx.database.get('user', { permissions: { $el: 'group:' + id } }, ['id', 'permissions'])
     for (const user of users) {
-      remove(user.permissions, 'group.' + id)
+      remove(user.permissions, 'group:' + id)
     }
     await this.ctx.database.upsert('user', users)
     const updates = this.groups.filter((group) => {
-      return remove(group.permissions, 'group.' + id)
+      return remove(group.permissions, 'group:' + id)
     })
     await this.ctx.database.upsert('group', updates)
     await this.ctx.database.remove('group', id)
@@ -169,8 +168,8 @@ export class Admin extends Service {
     if (!item) throw new Error('group not found')
     const data = await this.ctx.database.getUser(platform, aid, ['id', 'permissions'])
     if (!data) throw new Error('user not found')
-    if (!data.permissions.includes('group.' + item.id)) {
-      data.permissions.push('group.' + item.id)
+    if (!data.permissions.includes('group:' + item.id)) {
+      data.permissions.push('group:' + item.id)
       item.count!++
       await this.ctx.database.set('user', data.id, { permissions: data.permissions })
       this.ctx.get('console')?.refresh('admin')
@@ -182,7 +181,7 @@ export class Admin extends Service {
     if (!item) throw new Error('group not found')
     const data = await this.ctx.database.getUser(platform, aid, ['id', 'permissions'])
     if (!data) throw new Error('user not found')
-    if (remove(data.permissions, 'group.' + item.id)) {
+    if (remove(data.permissions, 'group:' + item.id)) {
       item.count!--
       await this.ctx.database.set('user', data.id, { permissions: data.permissions })
       this.ctx.get('console')?.refresh('admin')