feat(core): object form session.$reply

koishijs · Oct 18, 2020 · a16c113 · a16c113
1 parent abe85f8
commit a16c113
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 7 deletions.
diff --git a/packages/koishi-core/src/app.ts b/packages/koishi-core/src/app.ts
@@ -1,9 +1,9 @@
+import { simplify, defineProperty, Time, Observed, coerce, escapeRegExp, makeArray, noop } from 'koishi-utils'
 import { Command } from './command'
 import { Context, Middleware, NextFunction } from './context'
 import { Group, User, Database } from './database'
 import { BotOptions, Server } from './server'
 import { Session } from './session'
-import { simplify, defineProperty, Time, Observed, coerce, escapeRegExp, makeArray } from 'koishi-utils'
 import help from './plugins/help'
 import shortcut from './plugins/shortcut'
 import suggest from './plugins/suggest'
@@ -145,8 +145,12 @@ export class App extends Context {
     let capture: RegExpMatchArray, atSelf = false
     // eslint-disable-next-line no-cond-assign
     if (capture = message.match(/^\[CQ:reply,id=(-?\d+)\]\s*/)) {
-      session.$reply = +capture[1]
+      session.$reply = await session.$bot.getMsg(+capture[1]).catch(noop)
       message = message.slice(capture[0].length)
+      if (session.$reply) {
+        const prefix = `[CQ:at,qq=${session.$reply.sender.userId}]`
+        message = message.slice(prefix.length).trimStart()
+      }
     }
 
     // strip prefix

diff --git a/packages/koishi-core/src/session.ts b/packages/koishi-core/src/session.ts
@@ -85,7 +85,7 @@ export class Session<U extends User.Field = never, G extends Group.Field = never
   $appel?: boolean
   $prefix?: string = null
   $parsed?: string
-  $reply?: number
+  $reply?: MessageInfo
   $uuid = Random.uuid()
 
   private _delay?: number
@@ -316,6 +316,15 @@ export interface StatusInfo {
   good: boolean
 }
 
+export interface MessageInfo {
+  time: number
+  messageType: MessageType
+  messageId: number
+  realId: number
+  sender: SenderInfo
+  message: string
+}
+
 /**
  * get context unique id
  * @example

diff --git a/packages/plugin-common/src/sender.ts b/packages/plugin-common/src/sender.ts
@@ -60,8 +60,9 @@ export default function apply(ctx: Context, config: SenderConfig = {}) {
 
   ctx.middleware((session, next) => {
     const { $reply, $parsed } = session
-    const userId = interactions[$reply]
-    if (!$parsed || !userId) return next()
+    if (!$parsed || !$reply) return next()
+    const userId = interactions[$reply.messageId]
+    if (!userId) return next()
     return session.$bot.sendPrivateMsg(userId, $parsed)
   })
 

diff --git a/packages/plugin-github/src/index.ts b/packages/plugin-github/src/index.ts
@@ -138,7 +138,7 @@ export function apply(ctx: Context, config: Config = {}) {
 
   ctx.on('before-attach-user', (session, fields) => {
     if (!session.$reply) return
-    if (history[int32ToHex6(session.$reply)]) {
+    if (history[int32ToHex6(session.$reply.messageId)]) {
       fields.add('ghAccessToken')
       fields.add('ghRefreshToken')
     }
@@ -147,7 +147,7 @@ export function apply(ctx: Context, config: Config = {}) {
   ctx.middleware((session, next) => {
     if (!session.$reply) return next()
     const body = session.$parsed
-    const payloads = history[int32ToHex6(session.$reply)]
+    const payloads = history[int32ToHex6(session.$reply.messageId)]
     if (!body || !payloads) return next()
 
     let name: string, message: string