fix(qqguild): escape elements

satorijs · Sep 25, 2023 · 3e6692c · 3e6692c
1 parent 891b2f8
commit 3e6692c
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 3 deletions.
diff --git a/adapters/qqguild/src/bot.ts b/adapters/qqguild/src/bot.ts
@@ -45,6 +45,11 @@ export class QQGuildBot extends Bot<QQGuildBot.Config> {
     return user
   }
 
+  async getUser(userId: string, guildId?: string): Promise<Universal.User> {
+    const { user } = await this.getGuildMember(guildId, userId)
+    return user
+  }
+
   async getGuildList(next?: string) {
     const guilds = await this.internal.getGuilds()
     return { data: guilds.map(adaptGuild) }

diff --git a/adapters/qqguild/src/message.ts b/adapters/qqguild/src/message.ts
@@ -3,6 +3,7 @@ import { Dict, h, MessageEncoder } from '@satorijs/satori'
 import { QQGuildBot } from './bot'
 import FormData from 'form-data'
 import { decodeMessage } from './utils'
+import { escape } from '@satorijs/element'
 
 export class QQGuildMessageEncoder extends MessageEncoder<QQGuildBot> {
   private content: string = ''
@@ -106,7 +107,7 @@ export class QQGuildMessageEncoder extends MessageEncoder<QQGuildBot> {
   async visit(element: h) {
     const { type, attrs, children } = element
     if (type === 'text') {
-      this.content += attrs.content
+      this.content += escape(attrs.content)
     } else if (type === 'at') {
       switch (attrs.type) {
         case 'all':

diff --git a/adapters/qqguild/src/utils.ts b/adapters/qqguild/src/utils.ts
@@ -1,6 +1,7 @@
 import { h, Session, Universal } from '@satorijs/satori'
 import * as QQGuild from './types'
 import { QQGuildBot } from './bot'
+import { unescape } from '@satorijs/element'
 
 export const adaptGuild = (guild: QQGuild.Guild): Universal.Guild => ({
   id: guild.id,
@@ -49,13 +50,16 @@ export async function decodeMessage(bot: QQGuildBot, msg: QQGuild.Message, sessi
   }
   session.isDirect = !!msg.direct_message
   session.content = (msg.content ?? '')
-    .replace(/<@!(.+)>/, (_, $1) => h.at($1).toString())
-    .replace(/<#(.+)>/, (_, $1) => h.sharp($1).toString())
+    .replace(/<@!(\d+)>/g, (_, $1) => h.at($1).toString())
+  // .replace(/<#(.+)>/, (_, $1) => h.sharp($1).toString()) // not used?
   const { attachments = [] } = msg
   session.content = attachments
     .filter(({ content_type }) => content_type.startsWith('image'))
     .reduce((content, attachment) => content + h.image('https://' + attachment.url), session.content)
   session.elements = h.parse(session.content)
+  session.elements = h.transform(session.elements, {
+    text: (attrs) => unescape(attrs.content),
+  })
 
   if (msg.message_reference) {
     session.quote = await bot.getMessage(msg.channel_id, msg.message_reference.message_id)