chore: remove name

koishijs · Jan 16, 2020 · ce4feb1 · ce4feb1
1 parent 20ebbae
commit ce4feb1
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/packages/database-sqlite/src/database.ts b/packages/database-sqlite/src/database.ts
@@ -26,7 +26,6 @@ export type Pragma = {
 export const pragma: Pragma = {
   user: {
     id: 'BIGINT',
-    name: 'VARCHAR(64)',
     flag: 'INT',
     authority: 'INT',
     usage: 'TEXT',

diff --git a/packages/plugin-teach/src/receiver.ts b/packages/plugin-teach/src/receiver.ts
@@ -1,4 +1,4 @@
-import { Context, getSenderName, Meta } from 'koishi-core'
+import { Context, Meta } from 'koishi-core'
 import { randomPick, CQCode, sleep } from 'koishi-utils'
 import { simplifyQuestion, TeachConfig } from './utils'
 import { DialogueTest, Dialogue } from './database'
@@ -39,7 +39,7 @@ export default function (ctx: Context, config: TeachConfig) {
       .replace(/\$a/g, `[CQ:at,qq=${meta.userId}]`)
       .replace(/\$A/g, '[CQ:at,qq=all]')
       .replace(/\$m/g, CQCode.stringify('at', { qq: meta.selfId }))
-      .replace(/\$s/g, escapeAnswer(getSenderName(meta)))
+      .replace(/\$s/g, escapeAnswer(meta.sender.card || meta.sender.nickname)) // TODO: name support
       .replace(/\$0/g, escapeAnswer(meta.message))
       .split('$n')
       .map(str => str.trim().replace(/@@__DOLLARS_PLACEHOLDER__@@/g, '$'))

diff --git a/packages/plugin-teach/src/update.ts b/packages/plugin-teach/src/update.ts
@@ -133,8 +133,9 @@ export default async function (parsedOptions: TeachOptions) {
     ]
 
     if (config.useWriter && dialogue.writer) {
-      const user = await ctx.database.getUser(dialogue.writer, 0, ['id', 'name'])
-      output.push(`来源：${user.name}`)
+      // TODO: name support
+      const user = await ctx.database.getUser(dialogue.writer, 0, ['id'])
+      output.push(`来源：${user.id}`)
     }
 
     if (config.useEnvironment) {