@koishijs/plugin-adapter-discord 2.0.2 → 2.0.5

package/lib/bot.d.ts

@@ -1,6 +1,6 @@
 /// <reference types="koishi/lib" />
 /// <reference types="node" />
-import { Adapter, Bot, Schema, Quester } from 'koishi';
+import { Adapter, Bot, Quester, Schema } from 'koishi';
 import { AdapterConfig } from './utils';
 import { Internal } from './types';
 interface PrivilegedIntents {

package/lib/index.js

@@ -89,7 +89,7 @@ var _Sender = class {
       this.errors.push(e);
     }
   }
-  async sendEmbed(fileBuffer, payload_json = {}, filename) {
+  async sendEmbed(fileBuffer, payload_json, filename) {
     const fd = new import_form_data.default();
     const type = await (0, import_file_type.fromBuffer)(fileBuffer);
     filename || (filename = "file." + type.ext);
@@ -251,7 +251,7 @@ function adaptMessage(bot, meta, session = {}) {
       if (meta.mention_roles.includes(id)) {
         return (0, import_koishi2.segment)("at", { role: id });
       } else {
-        const user = (_a2 = meta.mentions) == null ? void 0 : _a2.find((u) => u.id === id);
+        const user = (_a2 = meta.mentions) == null ? void 0 : _a2.find((u) => u.id === id || `${u.username}#${u.discriminator}` === id);
         return import_koishi2.segment.at(id, { name: user == null ? void 0 : user.username });
       }
     }).replace(/<:(.*):(.+?)>/, (_, name, id) => (0, import_koishi2.segment)("face", { id, name })).replace(/<a:(.*):(.+?)>/, (_, name, id) => (0, import_koishi2.segment)("face", { id, name, animated: true })).replace(/@everyone/, () => (0, import_koishi2.segment)("at", { type: "all" })).replace(/@here/, () => (0, import_koishi2.segment)("at", { type: "here" })).replace(/<#(.+?)>/, (_, id) => {
@@ -1372,9 +1372,9 @@ var DiscordBot = class extends import_koishi4.Bot {
     return chain.shift().data.id;
   }
   async sendMessage(channelId, content, guildId) {
-    const session = this.createSession({ channelId, content, guildId, subtype: guildId ? "group" : "private" });
-    if (await this.app.serial(session, "before-send", session))
-      return;
+    const session = await this.session({ channelId, content, guildId, subtype: guildId ? "group" : "private" });
+    if (!(session == null ? void 0 : session.content))
+      return [];
     const chain = import_koishi4.segment.parse(session.content);
     const quote = this.parseQuote(chain);
     const message_reference = quote ? {