feat(chat): use context filter instead of config

koishijs · Apr 18, 2021 · 2060ed5 · 2060ed5
1 parent 2827a5c
commit 2060ed5
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 11 deletions.
diff --git a/packages/koishi/src/worker.ts b/packages/koishi/src/worker.ts
@@ -259,7 +259,7 @@ function createWatcher() {
 
   const logger = new Logger('app:watcher')
   function triggerFullReload() {
-    if (!fullReload) return
+    if (fullReload === false) return
     logger.info('trigger full reload')
     process.exit(114)
   }

diff --git a/packages/plugin-chat/src/index.ts b/packages/plugin-chat/src/index.ts
@@ -26,8 +26,6 @@ declare module 'koishi-plugin-webui' {
 
 export interface Config extends ReceiverConfig {
   whitelist?: string[]
-  includeUsers?: string[]
-  includeChannels?: string[]
 }
 
 template.set('chat', {
@@ -57,15 +55,10 @@ const builtinWhitelist = [
 export const name = 'chat'
 
 export function apply(ctx: Context, options: Config = {}) {
-  const { includeUsers, includeChannels } = options
-
   ctx.plugin(receiver, options)
 
   ctx.on('chat/receive', async (message, session) => {
-    if (session.subtype === 'private') {
-      if (includeUsers && !includeUsers.includes(session.userId)) return
-    } else {
-      if (includeChannels && !includeChannels.includes(session.channelId)) return
+    if (session.subtype !== 'private') {
       const { assignee } = await session.observeChannel(['assignee'])
       if (assignee !== session.selfId) return
     }

diff --git a/packages/plugin-chat/src/receiver.ts b/packages/plugin-chat/src/receiver.ts
@@ -169,6 +169,6 @@ export default function apply(ctx: Context, config: ReceiverConfig = {}) {
     ctx.emit('chat/receive', params, session)
   }
 
-  ctx.on('message', handleMessage)
-  ctx.on('send', handleMessage)
+  ctx.all().on('message', handleMessage)
+  ctx.all().on('send', handleMessage)
 }