feat(satori): support login.adapter

satorijs · Oct 4, 2024 · a88972e · a88972e
1 parent 26064aa
commit a88972e
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 4 deletions.
diff --git a/packages/core/src/bot.ts b/packages/core/src/bot.ts
@@ -18,7 +18,7 @@ export interface Bot extends Methods {
   internal: any
 }
 
-export abstract class Bot<C extends Context = Context, T = any> implements Login {
+export abstract class Bot<C extends Context = Context, T = any> {
   static reusable = true
   static MessageEncoder?: new (bot: Bot, channelId: string, guildId?: string, options?: SendOptions) => MessageEncoder
 
@@ -233,7 +233,12 @@ export abstract class Bot<C extends Context = Context, T = any> implements Login
   }
 
   toJSON(): Login {
-    return clone(pick(this, ['platform', 'selfId', 'status', 'user', 'hidden', 'features', 'proxyUrls']))
+    return clone({
+      ...pick(this, ['platform', 'selfId', 'status', 'hidden', 'features', 'proxyUrls']),
+      // make sure `user.id` is present
+      user: this.user.id ? this.user : undefined,
+      adapter: this.platform,
+    })
   }
 
   async getLogin() {

diff --git a/packages/core/src/session.ts b/packages/core/src/session.ts
@@ -140,7 +140,7 @@ export class Session<C extends Context = Context> {
     return {
       login: {
         platform: this.platform,
-        user: { id: this.userId },
+        user: { id: this.selfId },
       } as Login,
       ...this.event,
       id: this.id,

diff --git a/packages/protocol/src/index.ts b/packages/protocol/src/index.ts
@@ -225,6 +225,7 @@ export interface GuildMember {
 }
 
 export interface Login {
+  adapter: string
   user?: User
   platform?: string
   /** @deprecated use `login.user.id` instead */

diff --git a/packages/server/src/index.ts b/packages/server/src/index.ts
@@ -67,7 +67,7 @@ class SatoriServer extends Service<SatoriServer.Config> {
 
       if (checkAuth(koa)) return
 
-      const selfId = koa.request.headers['satori-login-id'] ?? koa.request.headers['x-self-id']
+      const selfId = koa.request.headers['satori-user-id'] ?? koa.request.headers['x-self-id']
       const platform = koa.request.headers['satori-platform'] ?? koa.request.headers['x-platform']
       const bot = ctx.bots.find(bot => bot.selfId === selfId && bot.platform === platform)
       if (!bot) {