feat(qq): rename qqguild to qq

packages/core/src/database.ts

@@ -1,7 +1,7 @@
 import * as utils from '@koishijs/utils'
 import { defineProperty, Dict, MaybeArray } from 'cosmokit'
 import { Database, Driver, Update } from '@minatojs/core'
-import { Context, Fragment, Schema } from '@satorijs/core'
+import { Context, Fragment, Schema, Universal } from '@satorijs/core'
 import { Plugin } from './context'
 
 declare module '@satorijs/core' {
@@ -199,13 +199,15 @@ export class DatabaseService extends Database<Tables> {
     return (await Promise.all(this.app.bots.map((bot) => {
       const targets = assignMap[bot.platform]?.[bot.selfId]
       if (!targets) return Promise.resolve([])
-      const sessions = targets.map(({ id, guildId, locales }) => bot.session({
-        type: 'message',
-        subtype: 'group',
-        channelId: id,
-        guildId,
-        locales,
-      }))
+      const sessions = targets.map(({ id, guildId, locales }) => {
+        const session = bot.session({
+          type: 'message',
+          channel: { id, type: Universal.Channel.Type.TEXT },
+          guild: { id: guildId },
+        })
+        session.locales = locales
+        return session
+      })
       return bot.broadcast(sessions, content)
     }))).flat(1)
   }

packages/core/src/session.ts

@@ -1,6 +1,6 @@
 import { extend, observe } from '@koishijs/utils'
 import { Awaitable, defineProperty, isNullable, makeArray } from 'cosmokit'
-import { Context, Fragment, h, Logger, Session } from '@satorijs/core'
+import { Context, Fragment, h, Logger, Session, Universal } from '@satorijs/core'
 import { Eval, executeEval, isEvalExpr } from '@minatojs/core'
 import { Argv, Command } from './command'
 import { Channel, Tables, User } from './database'
@@ -21,7 +21,7 @@ declare module '@satorijs/core' {
     stripped?: Stripped
     scope?: string
     username?: string
-    send(content: Fragment, options?: SendOptions): Promise<string[]>
+    send(content: Fragment, options?: Universal.SendOptions): Promise<string[]>
     cancelQueued(delay?: number): void
     sendQueued(content: Fragment, delay?: number): Promise<string[]>
     resolve<T, R extends any[]>(source: T | Eval.Expr | ((session: Session, ...args: R) => T), ...args: R):
@@ -196,7 +196,7 @@ extend(Session.prototype as Session.Private, {
         atSelf = appel = true
       }
       // quote messages may contain mentions
-      if (!self.quote || self.quote.userId !== attrs.id) {
+      if (self.quote?.user?.id && self.quote.user.id !== attrs.id) {
         hasAt = true
       }
       // @ts-ignore
@@ -220,7 +220,7 @@ extend(Session.prototype as Session.Private, {
 
   async getChannel(id = this.channelId, fields = []) {
     const { app, platform, guildId } = this
-    if (!fields.length) return { platform, id, guildId }
+    if (!fields.length) return { platform, id, guildId } as Channel
     const channel = await app.database.getChannel(platform, id, fields)
     if (channel) return channel
     const assignee = this.resolve(app.config.autoAssign) ? this.selfId : ''
@@ -273,7 +273,7 @@ extend(Session.prototype as Session.Private, {
 
   async getUser(userId = this.userId, fields = []) {
     const { app, platform } = this
-    if (!fields.length) return {}
+    if (!fields.length) return {} as User
     const user = await app.database.getUser(platform, userId, fields)
     if (user) return user
     const authority = this.resolve(app.config.autoAuthorize)
@@ -302,7 +302,7 @@ extend(Session.prototype as Session.Private, {
     }
 
     // 匿名消息不会写回数据库
-    if (this.author?.anonymous) {
+    if (this.author?.['anonymous']) {
       const fallback = this.app.model.tables.user.create()
       fallback.authority = this.resolve(this.app.config.autoAuthorize)
       const user = observe(fallback, () => Promise.resolve())
@@ -318,7 +318,7 @@ extend(Session.prototype as Session.Private, {
       cache = observe(data, diff => this.app.database.setUser(this.platform, userId, diff as any), `user ${this.uid}`)
       this.app.$internal._userCache.set(this.id, this.uid, cache as any)
     }
-    return this.user = cache
+    return this.user = cache as any
   },
 
   async withScope(scope, callback: () => any) {

plugins/adapter/qqguild/package.json → plugins/adapter/qq/package.json

@@ -1,6 +1,6 @@
 {
-  "name": "@koishijs/plugin-adapter-qqguild",
-  "description": "QQ Guild Adapter for Koishi",
+  "name": "@koishijs/plugin-adapter-qq",
+  "description": "QQ Adapter for Koishi",
   "version": "4.0.1",
   "main": "lib/index.js",
   "module": "lib/index.mjs",
@@ -13,17 +13,18 @@
   "repository": {
     "type": "git",
     "url": "git+https://github.com/satorijs/satori.git",
-    "directory": "adapters/qqguild"
+    "directory": "adapters/qq"
   },
   "bugs": {
     "url": "https://github.com/satorijs/satori/issues"
   },
-  "homepage": "https://koishi.chat/plugins/adapter/qqguild.html",
+  "homepage": "https://koishi.chat/plugins/adapter/qq.html",
   "keywords": [
     "bot",
     "chatbot",
     "qqbot",
     "qqguild",
+    "qq",
     "koishi"
   ],
   "koishi": {
@@ -45,6 +46,6 @@
     "koishi": "^4.14.6"
   },
   "dependencies": {
-    "@satorijs/adapter-qqguild": "^4.0.1"
+    "@satorijs/adapter-qq": "^4.0.1"
   }
 }

plugins/adapter/qq/readme.md

@@ -0,0 +1,5 @@
+# [@koishijs/plugin-adapter-qq](https://koishi.chat/plugins/adapter/qq.html)
+
+QQ / QQ Guild adapter for [Koishi](https://koishi.chat).
+
+- [Documentation](https://koishi.chat/plugins/adapter/qq.html)

plugins/adapter/qq/src/index.ts

@@ -0,0 +1,4 @@
+import { QQBot } from '@satorijs/adapter-qq'
+
+export default QQBot
+export * from '@satorijs/adapter-qq'

plugins/adapter/satori/.npmignore

@@ -0,0 +1,2 @@
+.DS_Store
+tsconfig.tsbuildinfo

plugins/adapter/satori/package.json

@@ -0,0 +1,50 @@
+{
+  "name": "@koishijs/plugin-adapter-satori",
+  "description": "Satori Protocol Adapter for Koishi",
+  "version": "1.0.0-alpha.0",
+  "main": "lib/index.js",
+  "module": "lib/index.mjs",
+  "typings": "lib/index.d.ts",
+  "files": [
+    "lib"
+  ],
+  "author": "Shigma <[email protected]>",
+  "license": "MIT",
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/satorijs/satori.git",
+    "directory": "adapters/satori"
+  },
+  "bugs": {
+    "url": "https://github.com/satorijs/satori/issues"
+  },
+  "homepage": "https://koishi.chat/plugins/adapter/satori.html",
+  "keywords": [
+    "bot",
+    "adapter",
+    "satori",
+    "protocol",
+    "chatbot",
+    "koishi"
+  ],
+  "koishi": {
+    "description": {
+      "en": "Satori Protocol Adapter",
+      "zh": "Satori 协议适配器"
+    },
+    "service": {
+      "implements": [
+        "adapter"
+      ]
+    }
+  },
+  "peerDependencies": {
+    "koishi": "^4.14.6"
+  },
+  "devDependencies": {
+    "koishi": "^4.14.6"
+  },
+  "dependencies": {
+    "@satorijs/adapter-satori": "^1.0.0-alpha.0"
+  }
+}

plugins/adapter/satori/readme.md

@@ -0,0 +1,5 @@
+# [@koishijs/plugin-adapter-satori](https://koishi.chat/plugins/adapter/satori.html)
+
+Satori protocol adapter for [Koishi](https://koishi.chat).
+
+- [Documentation](https://koishi.chat/plugins/adapter/satori.html)

plugins/adapter/satori/src/index.ts

@@ -0,0 +1,4 @@
+import { SatoriBot } from '@satorijs/adapter-satori'
+
+export default SatoriBot
+export * from '@satorijs/adapter-satori'

plugins/adapter/satori/tsconfig.json

@@ -0,0 +1,10 @@
+{
+  "extends": "../../../tsconfig.base",
+  "compilerOptions": {
+    "outDir": "lib",
+    "rootDir": "src",
+  },
+  "include": [
+    "src",
+  ],
+}