fix(mock): add missing webhook api

koishijs · Jun 3, 2022 · 7c8171e · 7c8171e
1 parent d86ec4d
commit 7c8171e
Show file tree

Hide file tree

Showing 31 changed files with 31 additions and 39 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,13 +12,10 @@ tsconfig.temp.json
 /community
 /external
 /addons
-/public
-/atri
 /coverage
-/legacy
+/docs
 /shiki
 /test
-/utsuho
 /.yalc
 
 todo.md

diff --git a/package.json b/package.json
@@ -72,12 +72,11 @@
     "eslint-plugin-promise": "^5.2.0",
     "fs-extra": "^10.1.0",
     "globby": "^11.1.0",
-    "jest-mock": "^27.5.1",
+    "jest-mock": "^28.1.0",
     "json5": "^2.2.1",
     "kleur": "^4.1.4",
     "latest-version": "^5.1.0",
     "mocha": "^9.2.2",
-    "nock": "^13.2.4",
     "open": "^8.4.0",
     "ora": "^5.4.1",
     "p-map": "^4.0.0",

diff --git a/packages/core/package.json b/packages/core/package.json
@@ -29,7 +29,7 @@
   ],
   "devDependencies": {
     "@koishijs/plugin-database-memory": "^1.3.0",
-    "@koishijs/plugin-mock": "^1.0.4",
+    "@koishijs/plugin-mock": "^1.0.6",
     "chai": "^4.3.6",
     "chai-as-promised": "^7.1.1",
     "chai-shape": "^1.0.0"

diff --git a/packages/helpers/package.json b/packages/helpers/package.json
@@ -31,6 +31,6 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   }
 }
diff --git a/plugins/a11y/admin/package.json b/plugins/a11y/admin/package.json
@@ -47,7 +47,7 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   },
   "dependencies": {
     "@koishijs/helpers": "^1.2.2"

diff --git a/plugins/a11y/bind/package.json b/plugins/a11y/bind/package.json
@@ -48,6 +48,6 @@
   },
   "devDependencies": {
     "@koishijs/plugin-database-memory": "^1.3.1",
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   }
 }
diff --git a/plugins/a11y/callme/package.json b/plugins/a11y/callme/package.json
@@ -47,6 +47,6 @@
   },
   "devDependencies": {
     "@koishijs/plugin-database-memory": "^1.3.1",
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   }
 }
diff --git a/plugins/a11y/commands/package.json b/plugins/a11y/commands/package.json
@@ -41,7 +41,7 @@
   "devDependencies": {
     "@koishijs/client": "^3.3.3",
     "@koishijs/plugin-console": "^3.3.3",
-    "@koishijs/plugin-mock": "^1.0.5",
+    "@koishijs/plugin-mock": "^1.0.6",
     "@types/throttle-debounce": "^2.1.0"
   },
   "dependencies": {

diff --git a/plugins/a11y/locales/package.json b/plugins/a11y/locales/package.json
@@ -41,7 +41,7 @@
   "devDependencies": {
     "@koishijs/client": "^3.3.3",
     "@koishijs/plugin-console": "^3.3.3",
-    "@koishijs/plugin-mock": "^1.0.5",
+    "@koishijs/plugin-mock": "^1.0.6",
     "@types/throttle-debounce": "^2.1.0"
   },
   "dependencies": {

diff --git a/plugins/a11y/rate-limit/package.json b/plugins/a11y/rate-limit/package.json
@@ -46,7 +46,7 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   },
   "dependencies": {
     "@koishijs/helpers": "^1.2.2"

diff --git a/plugins/a11y/schedule/package.json b/plugins/a11y/schedule/package.json
@@ -42,7 +42,7 @@
   },
   "devDependencies": {
     "@koishijs/plugin-database-memory": "^1.3.1",
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   },
   "peerDependencies": {
     "koishi": "^4.7.2"

diff --git a/plugins/a11y/sudo/package.json b/plugins/a11y/sudo/package.json
@@ -47,7 +47,7 @@
   },
   "devDependencies": {
     "@koishijs/plugin-database-memory": "^1.3.1",
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   },
   "dependencies": {
     "@koishijs/helpers": "^1.2.2"

diff --git a/plugins/a11y/suggest/package.json b/plugins/a11y/suggest/package.json
@@ -47,6 +47,6 @@
   },
   "devDependencies": {
     "@koishijs/plugin-database-memory": "^1.3.1",
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   }
 }
diff --git a/plugins/a11y/switch/package.json b/plugins/a11y/switch/package.json
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@koishijs/plugin-database-memory": "^1.3.1",
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   },
   "dependencies": {
     "@koishijs/helpers": "^1.2.2"

diff --git a/plugins/a11y/verifier/package.json b/plugins/a11y/verifier/package.json
@@ -38,6 +38,6 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   }
 }
diff --git a/plugins/adapter/discord/package.json b/plugins/adapter/discord/package.json
@@ -43,7 +43,7 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5",
+    "@koishijs/plugin-mock": "^1.0.6",
     "@types/es-aggregate-error": "^1.0.2",
     "@types/ws": "^8.5.3",
     "axios": "^0.24.0"

diff --git a/plugins/adapter/kaiheila/package.json b/plugins/adapter/kaiheila/package.json
@@ -39,7 +39,7 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   },
   "dependencies": {
     "axios": "^0.24.0",

diff --git a/plugins/adapter/onebot/package.json b/plugins/adapter/onebot/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@koishijs/plugin-adapter-onebot",
   "description": "OneBot Adapter for Koishi",
-  "version": "4.2.6",
+  "version": "4.2.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [
@@ -43,7 +43,7 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5",
+    "@koishijs/plugin-mock": "^1.0.6",
     "@types/ws": "^8.5.3"
   },
   "dependencies": {

diff --git a/plugins/adapter/onebot/src/bot.ts b/plugins/adapter/onebot/src/bot.ts
@@ -20,15 +20,13 @@ export function renderText(source: string) {
 export interface BotConfig extends Bot.BaseConfig, Quester.Config {
   selfId?: string
   token?: string
-  reportSelfMessage?: boolean
   qqguildPlatform?: string
 }
 
 export const BotConfig: Schema<BotConfig> = Schema.intersect([
   Schema.object({
     selfId: Schema.string(),
     token: Schema.string().role('secret'),
-    reportSelfMessage: Schema.boolean().default(false),
     qqguildPlatform: Schema.string().default('qqguild'),
   }),
   Quester.Config,
@@ -237,9 +235,6 @@ export class QQGuildBot extends OneBotBot {
     if (!session?.content) return []
     session.messageId = '' + await this.internal.sendGuildChannelMsg(guildId, channelId, session.content)
     this.app.emit(session, 'send', session)
-    if (!this.config.reportSelfMessage) {
-      this.app.emit(session, 'message', session)
-    }
     return [session.messageId]
   }
 

diff --git a/plugins/adapter/telegram/package.json b/plugins/adapter/telegram/package.json
@@ -44,7 +44,7 @@
   },
   "devDependencies": {
     "@types/es-aggregate-error": "^1.0.2",
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   },
   "dependencies": {
     "axios": "^0.24.0",

diff --git a/plugins/common/broadcast/package.json b/plugins/common/broadcast/package.json
@@ -47,6 +47,6 @@
   },
   "devDependencies": {
     "@koishijs/plugin-database-memory": "^1.3.1",
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   }
 }
diff --git a/plugins/common/echo/package.json b/plugins/common/echo/package.json
@@ -41,7 +41,7 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   },
   "dependencies": {
     "@koishijs/helpers": "^1.2.2"

diff --git a/plugins/common/feedback/package.json b/plugins/common/feedback/package.json
@@ -42,7 +42,7 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   },
   "dependencies": {
     "@koishijs/helpers": "^1.2.2"

diff --git a/plugins/common/forward/package.json b/plugins/common/forward/package.json
@@ -48,7 +48,7 @@
   },
   "devDependencies": {
     "@koishijs/plugin-database-memory": "^1.3.1",
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   },
   "dependencies": {
     "@koishijs/helpers": "^1.2.2"

diff --git a/plugins/common/help/package.json b/plugins/common/help/package.json
@@ -46,7 +46,7 @@
   },
   "devDependencies": {
     "@koishijs/plugin-database-memory": "^1.3.1",
-    "@koishijs/plugin-mock": "^1.0.5",
+    "@koishijs/plugin-mock": "^1.0.6",
     "@koishijs/plugin-suggest": "^1.1.0"
   }
 }
diff --git a/plugins/common/recall/package.json b/plugins/common/recall/package.json
@@ -41,6 +41,6 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   }
 }
diff --git a/plugins/common/repeater/package.json b/plugins/common/repeater/package.json
@@ -41,6 +41,6 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   }
 }
diff --git a/plugins/common/respondent/package.json b/plugins/common/respondent/package.json
@@ -37,6 +37,6 @@
     "koishi": "^4.7.2"
   },
   "devDependencies": {
-    "@koishijs/plugin-mock": "^1.0.5"
+    "@koishijs/plugin-mock": "^1.0.6"
   }
 }
diff --git a/plugins/mock/package.json b/plugins/mock/package.json
@@ -1,7 +1,7 @@
 {
   "name": "@koishijs/plugin-mock",
   "description": "Test Mocker for Koishi",
-  "version": "1.0.5",
+  "version": "1.0.6",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [

diff --git a/plugins/mock/src/adapter.ts b/plugins/mock/src/adapter.ts
@@ -48,6 +48,7 @@ export class MockAdapter extends Adapter<BotConfig> {
   constructor(ctx: Context, config: MockAdapter.Config) {
     super(ctx, config)
     this.app = ctx.app
+    this.webhook = new Webhook(ctx.app)
     ctx.mock = this
     ctx.bots.adapters.mock = this
 

diff --git a/plugins/mock/src/webhook.ts b/plugins/mock/src/webhook.ts
@@ -68,7 +68,7 @@ export class Webhook {
         const code = res.statusCode
         const headers = res.getHeaders()
         resolve({ code, body, headers })
-        callback?.()
+        if (typeof callback === 'function') callback()
         return res
       }
       this.app._httpServer.emit('request', req, res)
-Original file line number
+Diff line change
@@ Expand Up / @@ -12,13 +12,10 @@ tsconfig.temp.json @@
     /community
     /external
     /addons
-    /public
-    /atri
     /coverage
-    /legacy
+    /docs
     /shiki
     /test
-    /utsuho
     /.yalc
     todo.md
@@ Expand Down @@