@chatluna/patchbay 0.1.7 → 0.1.9

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@chatluna/patchbay",
-  "version": "0.1.7",
+  "version": "0.1.9",
   "description": "Cordis 4 patches for Koishi, Satori, Satori adapters and Cordis plugins, wired into yarn, pnpm or npm",
   "type": "module",
   "license": "MIT",

package/patchbay.json

@@ -7,7 +7,7 @@
     },
     {
       "name": "@cordisjs/plugin-database",
-      "version": "4.1.1",
+      "version": "4.2.0",
       "description": "Prepare tables extended while the driver was still starting; also installed as minato"
     },
     {
@@ -31,7 +31,7 @@
     },
     {
       "name": "@cordisjs/unyaml",
-      "version": "2.0.3",
+      "version": "3.0.0",
       "description": "Register the Vite YAML plugin through rolldownOptions instead of the retired esbuildOptions"
     },
     {
@@ -61,6 +61,41 @@
         "cordis": "^4.0.0-rc.8"
       }
     },
+    {
+      "name": "@satorijs/adapter-discord",
+      "version": "4.6.3",
+      "description": "Keep literal markup in message text, decode rich embeds as elements and resolve the author of a DM delete",
+      "fixes": [
+        "ChatLunaLab/v2-mirror#147",
+        "ChatLunaLab/v2-mirror#150",
+        "ChatLunaLab/v2-mirror#158"
+      ]
+    },
+    {
+      "name": "@satorijs/adapter-qq",
+      "version": "4.14.1",
+      "description": "Decode official QQ group_openid targets, ARK cards, nested chat records and index-only quotes; keep absolute channel image URLs",
+      "fixes": [
+        "ChatLunaLab/v2-mirror#84",
+        "ChatLunaLab/v2-mirror#93",
+        "ChatLunaLab/v2-mirror#134",
+        "ChatLunaLab/v2-mirror#135",
+        "ChatLunaLab/v2-mirror#136",
+        "ChatLunaLab/v2-mirror#139"
+      ]
+    },
+    {
+      "name": "@satorijs/adapter-telegram",
+      "version": "4.5.11",
+      "description": "Mention the bot by username, decode contacts, polls, dice and venues, scope albums and forum topics to their chat, and omit missing ids from uploads",
+      "fixes": [
+        "ChatLunaLab/v2-mirror#146",
+        "ChatLunaLab/v2-mirror#148",
+        "ChatLunaLab/v2-mirror#149",
+        "ChatLunaLab/v2-mirror#151",
+        "ChatLunaLab/v2-mirror#164"
+      ]
+    },
     {
       "name": "koishi-plugin-adapter-onebot",
       "version": "6.9.5",

package/patches/{@cordisjs+plugin-database@4.1.1.patch → @cordisjs+plugin-database@4.2.0.patch}

@@ -1,5 +1,5 @@
 diff --git a/lib/index.js b/lib/index.js
-index 47b64a6..46865f0 100644
+index 4f2f7ae..b958d11 100644
 --- a/lib/index.js
 +++ b/lib/index.js
 @@ -985,6 +985,10 @@ var Database = class _Database extends Service {

package/patches/@satorijs+adapter-discord@4.6.3.patch

@@ -0,0 +1,81 @@
+diff --git a/lib/index.cjs b/lib/index.cjs
+index c3cecb6..6eddf09 100644
+--- a/lib/index.cjs
++++ b/lib/index.cjs
+@@ -1259,22 +1259,30 @@ async function decodeMessage(bot, data, message, payload = message, details = tr
+   message.id = message.messageId = data.id;
+   message.content = "";
+   if (data.content) {
+-    message.content = data.content.replace(/<@[!&]?(.+?)>/g, (_, id) => {
+-      if (data.mention_roles.includes(id)) {
+-        return (0, import_core2.h)("at", { role: id }).toString();
++    let last = 0;
++    for (const match of data.content.matchAll(/<@([!&]?)(\d+)>|<(a?):(\w+):(\d+)>|<#(\d+)>|@everyone|@here/g)) {
++      message.content += import_core2.h.escape(data.content.slice(last, match.index));
++      last = match.index + match[0].length;
++      const [token, kind, userId, animated, name, emojiId, channelId] = match;
++      if (userId) {
++        if (kind === "&" || data.mention_roles.includes(userId)) {
++          message.content += (0, import_core2.h)("at", { role: userId });
++        } else {
++          const user = data.mentions?.find((u) => u.id === userId);
++          message.content += import_core2.h.at(userId, { name: user?.username });
++        }
++      } else if (emojiId) {
++        message.content += (0, import_core2.h)("face", { id: emojiId, name, animated: !!animated, platform }, [
++          import_core2.h.image(`https://cdn.discordapp.com/emojis/${emojiId}.webp?quality=lossless`)
++        ]);
++      } else if (channelId) {
++        const channel = data.mention_channels?.find((c) => c.id === channelId);
++        message.content += import_core2.h.sharp(channelId, { name: channel?.name });
+       } else {
+-        const user = data.mentions?.find((u) => u.id === id || `${u.username}#${u.discriminator}` === id);
+-        return import_core2.h.at(id, { name: user?.username }).toString();
++        message.content += (0, import_core2.h)("at", { type: token === "@everyone" ? "all" : "here" });
+       }
+-    }).replace(/<a?:(.*):(.+?)>/g, (_, name, id) => {
+-      const animated = _[1] === "a";
+-      return (0, import_core2.h)("face", { id, name, animated, platform }, [
+-        import_core2.h.image(`https://cdn.discordapp.com/emojis/${id}.webp?quality=lossless`)
+-      ]).toString();
+-    }).replace(/@everyone/g, () => (0, import_core2.h)("at", { type: "all" }).toString()).replace(/@here/g, () => (0, import_core2.h)("at", { type: "here" }).toString()).replace(/<#(.+?)>/g, (_, id) => {
+-      const channel = data.mention_channels?.find((c) => c.id === id);
+-      return import_core2.h.sharp(id, { name: channel?.name }).toString();
+-    });
++    }
++    message.content += import_core2.h.escape(data.content.slice(last));
+   }
+   if (data.sticker_items) {
+     message.content += data.sticker_items.map((s) => (0, import_core2.h)("sticker", {
+@@ -1327,6 +1335,16 @@ async function decodeMessage(bot, data, message, payload = message, details = tr
+     }).join("");
+   }
+   for (const embed of data.embeds) {
++    if (embed.title || embed.description || embed.fields?.length || embed.author?.name || embed.footer?.text) {
++      message.content += (0, import_core2.h)("discord:embed", {
++        type: embed.type,
++        title: embed.title,
++        url: embed.url,
++        description: embed.description,
++        author: embed.author?.name,
++        footer: embed.footer?.text
++      }, (embed.fields ?? []).map((field) => (0, import_core2.h)("field", { name: field.name, value: field.value, inline: field.inline })));
++    }
+     if (embed.image) {
+       message.content += (0, import_core2.h)("img", { src: embed.image.url, proxy_url: embed.image.proxy_url });
+     }
+@@ -1409,6 +1427,14 @@ async function adaptSession(bot, input) {
+     session.messageId = input.d.id;
+     session.channelId = input.d.channel_id;
+     setupMessageGuildId(session, input.d.guild_id);
++    if (!input.d.guild_id) {
++      try {
++        const channel = await bot.internal.getChannel(input.d.channel_id);
++        session.userId = channel.recipients?.[0]?.id;
++      } catch (e) {
++        bot.logger.warn("cannot resolve the author of a direct message deletion", e);
++      }
++    }
+   } else if (input.t === "MESSAGE_REACTION_ADD") {
+     session.type = "reaction-added";
+     setupReaction(session, input.d);

package/patches/@satorijs+adapter-qq@4.14.1.patch

@@ -0,0 +1,107 @@
+diff --git a/lib/index.cjs b/lib/index.cjs
+index 4e1bd28..a19e6b9 100644
+--- a/lib/index.cjs
++++ b/lib/index.cjs
+@@ -293,6 +293,7 @@ var decodeGuildMember = /* @__PURE__ */ __name((member) => ({
+   roles: member.roles?.map((id) => ({ id })),
+   joinedAt: new Date(member.joined_at).valueOf()
+ }), "decodeGuildMember");
++var attachmentUrl = /* @__PURE__ */ __name((url) => /^[a-z][a-z\d+.-]*:/i.test(url) ? url : "https://" + url.replace(/^\/\//, ""), "attachmentUrl");
+ var decodeGroupMessageContent = /* @__PURE__ */ __name((content, attachments = [], attachedFace = /* @__PURE__ */ new Set()) => {
+   const elements = [];
+   let lastIndex = 0;
+@@ -306,7 +307,7 @@ var decodeGroupMessageContent = /* @__PURE__ */ __name((content, attachments = [
+       case 6: {
+         const imageAttachment = attachments[+faceId];
+         if (imageAttachment) {
+-          elements.push(import_core.h.image(imageAttachment.url, {
++          elements.push(import_core.h.image(attachmentUrl(imageAttachment.url), {
+             width: imageAttachment.width,
+             height: imageAttachment.height
+           }));
+@@ -341,20 +342,32 @@ var decodeAttachments = /* @__PURE__ */ __name((attachments, attachedFace = /* @
+   const elements = [];
+   for (const [index, attachment] of attachments.entries()) {
+     if (attachment.content_type === "file") {
+-      elements.push(import_core.h.file(attachment.url, {
++      elements.push(import_core.h.file(attachmentUrl(attachment.url), {
+         filename: attachment.filename
+       }));
+     } else if (attachment.content_type.startsWith("image/")) {
+       if (attachedFace.has(index)) continue;
+-      elements.push(import_core.h.image(attachment.url, { width: attachment.width, height: attachment.height }));
++      elements.push(import_core.h.image(attachmentUrl(attachment.url), { width: attachment.width, height: attachment.height }));
+     } else if (attachment.content_type === "voice") {
+-      elements.push(import_core.h.audio(attachment.url));
++      elements.push(import_core.h.audio(attachmentUrl(attachment.url)));
+     } else if (attachment.content_type.startsWith("video")) {
+-      elements.push(import_core.h.video(attachment.url, { width: attachment.width, height: attachment.height }));
++      elements.push(import_core.h.video(attachmentUrl(attachment.url), { width: attachment.width, height: attachment.height }));
+     }
+   }
+   return elements;
+ }, "decodeAttachments");
++var decodeElementContent = /* @__PURE__ */ __name((element) => {
++  const attached = /* @__PURE__ */ new Set();
++  return [
++    ...decodeGroupMessageContent(element.content ?? "", element.attachments ?? [], attached),
++    ...decodeAttachments(element.attachments ?? [], attached)
++  ];
++}, "decodeElementContent");
++var decodeRecord = /* @__PURE__ */ __name((elements) => import_core.h("message", { forward: true }, elements.map((element) => import_core.h("message", {}, [
++  ...element.author?.username ? [import_core.h("author", { name: element.author.username })] : [],
++  ...decodeElementContent(element),
++  ...element.msg_elements?.length ? [decodeRecord(element.msg_elements)] : []
++]))), "decodeRecord");
+ function decodeGroupMessage(bot, data, message = {}, payload = message) {
+   message.id = data.id;
+   const attachedFace = /* @__PURE__ */ new Set();
+@@ -376,16 +389,22 @@ function decodeGroupMessage(bot, data, message = {}, payload = message) {
+     }, "text")
+   });
+   message.elements.push(...decodeAttachments(data.attachments ?? [], attachedFace));
+-  if (data.message_type === Message.Type.QUOTE) {
+-    const quoted = [];
+-    const quotedAttached = /* @__PURE__ */ new Set();
+-    quoted.push(...decodeGroupMessageContent(data.msg_elements[0].content, data.msg_elements[0].attachments ?? [], quotedAttached));
+-    quoted.push(...decodeAttachments(data.msg_elements[0].attachments ?? [], quotedAttached));
++  const ark = data.ark_data ?? data.ark;
++  if (+data.message_type === Message.Type.ARK && ark) {
++    message.elements.push(import_core.h("json", { data: JSON.stringify(ark) }));
++  }
++  if (+data.message_type === 102 && data.msg_elements?.length) {
++    message.elements.push(decodeRecord(data.msg_elements));
++  }
++  if (+data.message_type === Message.Type.QUOTE) {
++    const quoted = data.msg_elements?.[0];
++    const id = quoted?.msg_idx ?? data.message_scene?.ext?.find((item) => item.startsWith("ref_msg_idx="))?.slice("ref_msg_idx=".length);
+     message.quote = {
++      ...id ? { id } : {},
+       member: {
+-        nick: data.msg_elements[0].author?.username
++        nick: quoted?.author?.username
+       },
+-      elements: quoted
++      elements: quoted ? decodeElementContent(quoted) : []
+     };
+   }
+   message.content = message.elements.join("");
+@@ -395,7 +414,8 @@ function decodeGroupMessage(bot, data, message = {}, payload = message) {
+     date = data.timestamp.slice(0, data.timestamp.indexOf("m=")).trim().replace(/\+(\d{4}) CST/, "GMT+$1");
+   }
+   payload.timestamp = new Date(date).valueOf();
+-  payload.guild = data.group_id && { id: data.group_id };
++  const groupId = data.group_id ?? data.group_openid;
++  payload.guild = groupId && { id: groupId };
+   payload.user = { id: data.author.id, avatar: `https://q.qlogo.cn/qqapp/${bot.config.id}/${data.author.id}/640` };
+   if (data.author.username) payload.user.name = data.author.username;
+   if (data.author.member_role) payload.member = { roles: [{ id: data.author.member_role }] };
+@@ -407,7 +427,7 @@ async function decodeMessage(bot, data, message = {}, payload = message) {
+   message.content = (data.content ?? "").replace(/<@!(\d+)>/g, (_, $1) => import_core.h.at($1).toString());
+   const { attachments = [] } = data;
+   if (attachments.length && !/\s$/.test(message.content)) message.content += " ";
+-  message.content = attachments.filter(({ content_type }) => content_type.startsWith("image")).reduce((content, attachment) => content + import_core.h.image("https://" + attachment.url), message.content);
++  message.content = attachments.filter(({ content_type }) => content_type.startsWith("image")).reduce((content, attachment) => content + import_core.h.image(attachmentUrl(attachment.url)), message.content);
+   message.elements = import_core.h.parse(message.content);
+   message.elements = import_core.h.transform(message.elements, {
+     text: /* @__PURE__ */ __name((attrs) => import_core.h.unescape(attrs.content), "text")

package/patches/@satorijs+adapter-telegram@4.5.11.patch

@@ -0,0 +1,116 @@
+diff --git a/lib/index.cjs b/lib/index.cjs
+index 01364de..822374f 100644
+--- a/lib/index.cjs
++++ b/lib/index.cjs
+@@ -244,10 +244,11 @@ async function handleUpdate(update, bot) {
+     session.content = command + session.content.slice(group.length);
+   } else if (message) {
+     if (update.message?.media_group_id) {
+-      if (!mediaGroupMap.has(update.message.media_group_id)) {
+-        mediaGroupMap.set(update.message.media_group_id, [/* @__PURE__ */ new Date(), []]);
++      const groupKey = `${bot.selfId}:${update.message.chat.id}:${update.message.media_group_id}`;
++      if (!mediaGroupMap.has(groupKey)) {
++        mediaGroupMap.set(groupKey, [/* @__PURE__ */ new Date(), []]);
+       }
+-      const [, updates] = mediaGroupMap.get(update.message.media_group_id);
++      const [, updates] = mediaGroupMap.get(groupKey);
+       session.type = update.message || update.channel_post ? "message" : "message-updated";
+       await decodeMessage(bot, message, session.event.message = {}, session.event);
+       updates.push({
+@@ -255,10 +256,10 @@ async function handleUpdate(update, bot) {
+         elements: session.event.message.elements
+       });
+       const thisUpdateTime = /* @__PURE__ */ new Date();
+-      mediaGroupMap.set(update.message.media_group_id, [thisUpdateTime, updates]);
++      mediaGroupMap.set(groupKey, [thisUpdateTime, updates]);
+       await new Promise((resolve) => setTimeout(resolve, 1200));
+-      if (mediaGroupMap.get(update.message.media_group_id)[0] === thisUpdateTime) {
+-        mediaGroupMap.delete(update.message.media_group_id);
++      if (mediaGroupMap.get(groupKey)[0] === thisUpdateTime) {
++        mediaGroupMap.delete(groupKey);
+         session.event.message.elements = updates.sort((a, b) => a.id - b.id).reduce((acc, cur) => acc.concat(cur.elements), []);
+         session.event.message.content = session.event.message.elements.join("");
+         session.event.message.id = Math.min(...updates.map((e) => e.id)).toString();
+@@ -310,7 +311,7 @@ async function handleUpdate(update, bot) {
+           name: data.chat.title
+         };
+         session.event.channel = {
+-          id: data.is_topic_message ? data.message_thread_id.toString() : data.chat.id.toString(),
++          id: data.is_topic_message ? `${data.chat.id}:${data.message_thread_id}` : data.chat.id.toString(),
+           type: import_core.Universal.Channel.Type.TEXT
+         };
+       }
+@@ -366,7 +367,7 @@ async function decodeMessage(bot, data, message, payload = message) {
+         if (attr.includes("code")) ele = (0, import_core.h)("code", {}, ele);
+         if (attr.includes("pre")) ele = (0, import_core.h)("pre", {}, ele);
+         if (attr.includes("spoiler")) ele = (0, import_core.h)("spl", {}, ele);
+-        if (attr.includes("mention")) ele = (0, import_core.h)("at", { name: content.slice(1) });
++        if (attr.includes("mention")) ele = content.slice(1) === bot.user?.name ? (0, import_core.h)("at", { id: bot.selfId, name: content.slice(1) }) : (0, import_core.h)("at", { name: content.slice(1) });
+         if (url) ele = (0, import_core.h)("a", { href: url }, ele);
+         if (user) ele = (0, import_core.h)("at", { id: user.id, name: user.username }, ele);
+         if (content === "\n") ele = (0, import_core.h)("br");
+@@ -394,7 +395,15 @@ async function decodeMessage(bot, data, message, payload = message) {
+     segments.push((0, import_core.h)(type, attrs));
+   }, "addResource");
+   if (data.location) {
+-    segments.push((0, import_core.h)("location", { lat: data.location.latitude, lon: data.location.longitude }));
++    segments.push((0, import_core.h)("location", { lat: data.location.latitude, lon: data.location.longitude, title: data.venue?.title, address: data.venue?.address }));
++  } else if (data.contact) {
++    const { contact } = data;
++    segments.push((0, import_core.h)("telegram:contact", { name: [contact.first_name, contact.last_name].filter(Boolean).join(" "), phone: contact.phone_number, id: contact.user_id?.toString() }));
++  } else if (data.poll) {
++    const { poll } = data;
++    segments.push((0, import_core.h)("telegram:poll", { question: poll.question, type: poll.type, multiple: poll.allows_multiple_answers, closed: poll.is_closed }, poll.options.map((option) => (0, import_core.h)("option", { text: option.text, votes: option.voter_count }))));
++  } else if (data.dice) {
++    segments.push((0, import_core.h)("telegram:dice", { emoji: data.dice.emoji, value: data.dice.value }));
+   } else if (data.photo) {
+     const photo = data.photo.sort((s1, s2) => s2.file_size - s1.file_size)[0];
+     segments.push((0, import_core.h)("img", await bot.$getFileFromId(photo.file_id)));
+@@ -442,7 +451,7 @@ async function decodeMessage(bot, data, message, payload = message) {
+     };
+     payload.member = {};
+     payload.channel = {
+-      id: data.is_topic_message ? data.message_thread_id.toString() : data.chat.id.toString(),
++      id: data.is_topic_message ? `${data.chat.id}:${data.message_thread_id}` : data.chat.id.toString(),
+       type: import_core.Universal.Channel.Type.TEXT
+     };
+   }
+@@ -461,9 +470,12 @@ var TelegramMessageEncoder = class extends import_core2.MessageEncoder {
+   mode = "default";
+   rows = [];
+   async prepare() {
+-    const chat_id = this.session.guildId || this.channelId;
++    const [chat, thread] = this.channelId.split(":");
++    const chat_id = thread ? chat : this.session.guildId || this.channelId;
+     this.payload = { chat_id, parse_mode: "html", caption: "" };
+-    if (this.session.guildId && this.channelId !== this.session.guildId) {
++    if (thread) {
++      this.payload.message_thread_id = +thread;
++    } else if (this.session.guildId && this.channelId !== this.session.guildId) {
+       this.payload.message_thread_id = +this.channelId;
+     }
+   }
+@@ -564,8 +576,8 @@ var TelegramMessageEncoder = class extends import_core2.MessageEncoder {
+           formData.append("chat_id", this.payload.chat_id);
+           formData.append("caption", this.payload.caption);
+           formData.append("parse_mode", this.payload.parse_mode);
+-          formData.append("reply_to_message_id", this.payload.reply_to_message_id);
+-          formData.append("message_thread_id", this.payload.message_thread_id);
++          if (this.payload.reply_to_message_id !== undefined) formData.append("reply_to_message_id", this.payload.reply_to_message_id);
++          if (this.payload.message_thread_id !== undefined) formData.append("message_thread_id", this.payload.message_thread_id);
+           formData.append("has_spoiler", files[0].element.attrs.spoiler ? "true" : "false");
+           formData.append(dataKey, "attach://" + files[0].filename);
+           formData.append(files[0].filename, new Blob([files[0].data], { type: files[0].mime }), files[0].filename);
+@@ -874,10 +886,12 @@ var TelegramBot = class _TelegramBot extends import_core5.Bot {
+     this.online();
+   }
+   async deleteMessage(chat_id, message_id) {
++    chat_id = chat_id.split(":")[0];
+     message_id = +message_id;
+     await this.internal.deleteMessage({ chat_id, message_id });
+   }
+   async editMessage(chat_id, message_id, content) {
++    chat_id = chat_id.split(":")[0];
+     message_id = +message_id;
+     const payload = {
+       chat_id,