fix: detect private messages

src/bot/base.ts

@@ -1,6 +1,6 @@
 import { Bot, Context, Schema, Universal } from 'koishi'
 import * as OneBot from '../utils'
-import { OneBotMessageEncoder, PRIVATE_PFX } from './message'
+import { OneBotMessageEncoder } from './message'
 
 export class BaseBot<C extends Context = Context, T extends BaseBot.Config = BaseBot.Config> extends Bot<C, T> {
   static MessageEncoder = OneBotMessageEncoder
@@ -10,7 +10,7 @@ export class BaseBot<C extends Context = Context, T extends BaseBot.Config = Bas
   public internal: OneBot.Internal
 
   async createDirectChannel(userId: string) {
-    return { id: `${PRIVATE_PFX}${userId}`, type: Universal.Channel.Type.DIRECT }
+    return { id: `${OneBot.PRIVATE_PFX}${userId}`, type: Universal.Channel.Type.DIRECT }
   }
 
   async getMessage(channelId: string, messageId: string) {

src/bot/message.ts

@@ -2,6 +2,7 @@ import { Context, Dict, h, MessageEncoder, pick, Universal } from 'koishi'
 import { BaseBot } from './base'
 import { CQCode } from './cqcode'
 import { fileURLToPath } from 'node:url'
+import { PRIVATE_PFX } from '../utils'
 
 export interface Author extends Universal.User {
   time?: string | number
@@ -15,8 +16,6 @@ class State {
   constructor(public type: 'message' | 'forward' | 'reply') { }
 }
 
-export const PRIVATE_PFX = 'private:'
-
 export class OneBotMessageEncoder<C extends Context = Context> extends MessageEncoder<C, BaseBot<C>> {
   stack: State[] = [new State('message')]
   children: CQCode[] = []

src/utils.ts

@@ -3,6 +3,8 @@ import * as qface from 'qface'
 import { BaseBot, CQCode } from './bot'
 import * as OneBot from './types'
 
+export const PRIVATE_PFX = 'private:'
+
 export * from './types'
 
 export const decodeUser = (user: OneBot.AccountInfo): Universal.User => ({
@@ -121,10 +123,10 @@ export async function adaptMessage(
 const decodeGuildChannelId = (data: OneBot.Message) => {
   if (data.guild_id) {
     return [data.guild_id, data.channel_id]
-  } else if (data.group_id) {
-    return [data.group_id.toString(), data.group_id.toString()]
+  } else if (data.message_type === 'private') {
+    return [undefined, PRIVATE_PFX + data.sender.user_id]
   } else {
-    return [undefined, 'private:' + data.sender.user_id]
+    return [data.group_id.toString(), data.group_id.toString()]
   }
 }