feat: remove UserData.name

packages/koishi-core/src/app.ts

@@ -327,7 +327,7 @@ export class App extends Context {
       }
 
       // attach user data
-      const userFields = new Set<UserField>(['name', 'flag'])
+      const userFields = new Set<UserField>(['flag'])
       this.receiver.emit('before-user', userFields, parsedArgv || { meta })
       const user = await this.database.observeUser(meta.userId, Array.from(userFields))
       Object.defineProperty(meta, '$user', { value: user, writable: true })

packages/koishi-core/src/database.ts

@@ -14,7 +14,6 @@ export const userFlags: (keyof typeof UserFlag)[] = ['ignore']
 
 export interface UserData {
   id: number
-  name: string
   flag: number
   authority: number
   usage: Record<string, Usage>

packages/koishi-core/src/utils.ts

@@ -7,12 +7,6 @@ import { messages } from './messages'
 import { format } from 'util'
 import leven from 'leven'
 
-export function getSenderName (meta: MessageMeta) {
-  const userId = '' + meta.userId
-  return meta.$user && meta.$user.name !== userId ? meta.$user.name
-    : meta.sender ? meta.sender.card || meta.sender.nickname : userId
-}
-
 export function getTargetId (target: string | number) {
   if (typeof target !== 'string' && typeof target !== 'number') return
   let qq = +target
@@ -51,7 +45,7 @@ export function showSuggestions (options: SuggestOptions): Promise<void> {
       const [suggestion] = suggestions
       const command = typeof options.command === 'function' ? options.command(suggestion) : options.command
       const identifier = meta.userId + meta.$ctxType + meta.$ctxId
-      const userFields = new Set<UserField>(['name'])
+      const userFields = new Set<UserField>()
       const groupFields = new Set<GroupField>()
       Command.attachUserFields(userFields, { command, meta })
       Command.attachGroupFields(groupFields, { command, meta })

packages/koishi-core/tests/utils.spec.ts

@@ -1,39 +1,4 @@
-import { getSenderName, createUser, getTargetId } from 'koishi-core'
-import { createSender } from 'koishi-test-utils'
-import { observe } from 'koishi-utils'
-
-describe('getSenderName', () => {
-  test('userData with userId', () => {
-    expect(getSenderName({
-      userId: 123,
-      $user: observe(createUser(123, 1)),
-    })).toBe('123')
-  })
-
-  test('userData with name', () => {
-    expect(getSenderName({
-      userId: 123,
-      $user: observe({ ...createUser(123, 1), name: '456' }),
-      sender: createSender(123, 'bar', 'foo'),
-    })).toBe('456')
-  })
-
-  test('userData with card', () => {
-    expect(getSenderName({
-      userId: 123,
-      $user: observe(createUser(123, 1)),
-      sender: createSender(123, 'bar', 'foo'),
-    })).toBe('foo')
-  })
-
-  test('userData with nickname', () => {
-    expect(getSenderName({
-      userId: 123,
-      $user: observe(createUser(123, 1)),
-      sender: createSender(123, 'bar'),
-    })).toBe('bar')
-  })
-})
+import { getTargetId } from 'koishi-core'
 
 describe('getTargetId', () => {
   test('with id', () => {

packages/plugin-common/src/authorize.ts

@@ -31,7 +31,6 @@ interface AuthorizeInfo {
 export default function apply (ctx: Context, config: AuthorizeConfig) {
   const { app, database } = ctx
   const { authorizeUser = {}, authorizeGroup = {} } = config
-  const logger = ctx.logger('authorize')
   const authorityMap: Record<number, AuthorizeInfo> = []
 
   /**

packages/plugin-common/src/index.ts

@@ -2,12 +2,11 @@ import { Context, CommandConfig } from 'koishi-core'
 import admin from './admin'
 import authorize, { AuthorizeConfig } from './authorize'
 import broadcast, { BroadcastOptions } from './broadcast'
-import callme, { CallmeOptions } from './callme'
 import contextify from './contextify'
 import echo from './echo'
 import exit from './exit'
 import help from './help'
-import info from './info'
+import info, { InfoOptions } from './info'
 import repeater, { RepeaterOptions } from './repeater'
 import requestHandler, { HandlerConfig } from './request-handler'
 import respondent, { Respondent } from './respondent'
@@ -20,7 +19,6 @@ export {
   admin,
   authorize,
   broadcast,
-  callme,
   contextify,
   echo,
   exit,
@@ -35,12 +33,11 @@ export {
 interface CommonPluginConfig extends HandlerConfig, AuthorizeConfig {
   admin?: false | CommandConfig
   broadcast?: false | BroadcastOptions
-  callme?: false | CallmeOptions
   contextify?: false | CommandConfig
   echo?: false | CommandConfig
   exit?: false | CommandConfig
   help?: false | CommandConfig
-  info?: false | CommandConfig
+  info?: false | InfoOptions
   repeater?: false | RepeaterOptions
   respondent?: Respondent[]
   welcome?: false | WelcomeMessage
@@ -64,7 +61,6 @@ export function apply (ctx: Context, options: CommonPluginConfig = {}) {
       .plugin(admin, options.admin)
       .plugin(authorize, options)
       .plugin(broadcast, options.broadcast)
-      .plugin(callme, options.callme)
       .plugin(info, options.info)
   }
 }

packages/plugin-common/src/info.ts

@@ -12,11 +12,11 @@ export function registerUserInfo <K extends UserField> (callback: UserInfoCallba
   }
 }
 
-export interface InfoConfig extends CommandConfig {
+export interface InfoOptions extends CommandConfig {
   getSenderName? (user: UserData, meta: Meta<'message'>): string
 }
 
-const defaultConfig: InfoConfig = {
+const defaultConfig: InfoOptions = {
   authority: 0,
   getSenderName (user, meta) {
     if (meta.userId === user.id && meta.sender) {
@@ -25,7 +25,7 @@ const defaultConfig: InfoConfig = {
   },
 }
 
-export default function apply (ctx: Context, config: InfoConfig = {}) {
+export default function apply (ctx: Context, config: InfoOptions = {}) {
   config = { ...defaultConfig, ...config }
   ctx.command('info', '查看用户信息', config)
     .alias('i')

packages/plugin-common/tests/info.spec.ts

@@ -1,6 +1,6 @@
 import { MockedApp, MemoryDatabase, Session } from 'koishi-test-utils'
 import { registerDatabase } from 'koishi-core'
-import info, { registerUserInfo, InfoConfig } from '../src/info'
+import info, { registerUserInfo, InfoOptions } from '../src/info'
 
 registerDatabase('memory', MemoryDatabase)
 
@@ -38,7 +38,7 @@ test('basic support', async () => {
 })
 
 test('getSenderName', async () => {
-  app.plugin<InfoConfig>(info, {
+  app.plugin<InfoOptions>(info, {
     getSenderName (user, meta) {
       if (user.id !== meta.userId) return 'bar'
     },

packages/test-utils/src/database.ts

@@ -111,7 +111,7 @@ export function testDatabase (config: DatabaseConfig, options: TestDatabaseOptio
     })
 
     test('observeUser merge', async () => {
-      const user: UserData = { id: 1000, flag: 3, name: '', authority: 1, usage: {} }
+      const user: UserData = { id: 1000, flag: 3, authority: 1, usage: {} }
       const observedUser = await db.observeUser(user, 1)
       expect(observedUser).toMatchObject(user)
       observedUser.flag = 5

packages/test-utils/src/utils.ts

@@ -1,4 +1,3 @@
-import { SenderInfo } from 'koishi-core'
 import debug from 'debug'
 
 export const BASE_SELF_ID = 514
@@ -20,7 +19,3 @@ export function fromEntries <T> (entries: Iterable<readonly [string, T]>) {
 export function createArray <T> (length: number, create: (index: number) => T) {
   return Array(length).fill(undefined).map((_, index) => create(index))
 }
-
-export function createSender (userId: number, nickname: string, card = '') {
-  return { userId, nickname, card, sex: 'unknown', age: 20 } as SenderInfo
-}