mioku-plugin-music 2.4.4 → 3.0.0

package/index.ts

@@ -1,4 +1,4 @@
-import { definePlugin } from "mioki";
+import { definePlugin } from "mioku";
 import { AppleMusicService } from "mioku-service-applemusic";
 import { NeteaseService } from "mioku-service-netease";
 import { getService, Services } from "mioku";

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-music",
-  "version": "2.4.4",
+  "version": "3.0.0",
   "description": "音乐插件：点歌、搜索音乐、听歌语音发送",
   "main": "index.ts",
   "type": "module",
@@ -57,14 +57,12 @@
     }
   },
   "peerDependencies": {
-    "mioku": "^0.8.0",
-    "mioki": "^0.16.0",
-    "mioku-service-applemusic": "^2.0.0",
-    "mioku-service-netease": "^1.0.0"
+    "mioku": "^1.0.0",
+    "mioku-service-applemusic": "^3.0.0",
+    "mioku-service-netease": "^2.0.0"
   },
   "devDependencies": {
     "mioku": "workspace:*",
-    "mioki": "^0.16.0",
     "mioku-service-applemusic": "workspace:*",
     "mioku-service-netease": "workspace:*"
   }

package/render/search-list.ts

@@ -4,11 +4,11 @@ import { getMusicProviderLabel } from "../providers/provider-labels";
 function escapeHtml(value: string): string {
   const source = String(value || "");
   return source
-    .replace(/&/g, "&")
-    .replace(/</g, "&lt;")
-    .replace(/>/g, "&gt;")
-    .replace(/"/g, "&quot;")
-    .replace(/'/g, "&#039;");
+    .replace(/&/g, "&amp);")
+    .replace(/</g, "&lt);")
+    .replace(/>/g, "&gt);")
+    .replace(/"/g, "&quot);")
+    .replace(/'/g, "&#039);");
 }
 
 export function renderMusicSearchListHtml(search: MusicSearchResult): string {

package/runtime-core/message.ts

@@ -25,16 +25,12 @@ function getBotAndTarget(ctx: any, event: any): {
   groupId?: number;
   userId?: number;
 } {
-  const selfId = event?.self_id != null ? Number(event.self_id) : undefined;
-  const bot =
-    selfId != null && typeof ctx?.pickBot === "function"
-      ? ctx.pickBot(selfId)
-      : undefined;
+  const bot = event?.bot;
 
   return {
     bot,
-    groupId: event?.message_type === "group" ? Number(event.group_id) : undefined,
-    userId: event?.message_type !== "group" ? Number(event?.user_id) : undefined,
+    groupId: event?.message_type === "group" ? event.group_id : undefined,
+    userId: event?.message_type !== "group" ? event?.user_id : undefined,
   };
 }
 
@@ -46,7 +42,7 @@ export async function sendTextMessage(
   const { bot, groupId, userId } = getBotAndTarget(ctx, event);
   const payload: any[] = [];
 
-  payload.push(ctx?.segment?.text ? ctx.segment.text(text) : { type: "text", text });
+  payload.push(ctx.segment.text(text));
 
   if (bot && groupId != null) {
     await bot.sendGroupMsg(groupId, payload);
@@ -71,11 +67,7 @@ export async function sendImageMessage(
   const { bot, groupId, userId } = getBotAndTarget(ctx, event);
   const sendPayload = async (source: string) => {
     const payload: any[] = [];
-    payload.push(
-      ctx?.segment?.image
-        ? ctx.segment.image(normalizeFileSource(source))
-        : { type: "image", file: normalizeFileSource(source) },
-    );
+    payload.push(ctx.segment.image(normalizeFileSource(source)));
 
     if (bot && groupId != null) {
       await bot.sendGroupMsg(groupId, payload);
@@ -112,11 +104,7 @@ export async function sendFileMessage(
   const { bot, groupId, userId } = getBotAndTarget(ctx, event);
   const sendPayload = async (source: string) => {
     const payload: any[] = [];
-    payload.push(
-      ctx?.segment?.file
-        ? ctx.segment.file(normalizeFileSource(source), { name: fileName })
-        : { type: "file", file: normalizeFileSource(source), name: fileName },
-    );
+    payload.push(ctx.segment.file(normalizeFileSource(source), { name: fileName }));
 
     if (bot && groupId != null) {
       await bot.sendGroupMsg(groupId, payload);
@@ -184,11 +172,7 @@ export async function sendRecordMessage(
   const { bot, groupId, userId } = getBotAndTarget(ctx, event);
   const sendPayload = async (source: string) => {
     const payload: any[] = [];
-    payload.push(
-      ctx?.segment?.record
-        ? ctx.segment.record(normalizeFileSource(source))
-        : { type: "record", file: normalizeFileSource(source) },
-    );
+    payload.push(ctx.segment.record(normalizeFileSource(source)));
 
     if (bot && groupId != null) {
       await bot.sendGroupMsg(groupId, payload);

package/runtime-core/service.ts

@@ -414,19 +414,13 @@ export class MusicPluginRuntime {
       return;
     }
 
-    const selfId = Number(event?.self_id || ctx?.self_id);
-    if (!Number.isFinite(selfId) || selfId <= 0) {
-      return;
-    }
-
-    const bot =
-      typeof ctx?.pickBot === "function" ? ctx.pickBot(selfId) : undefined;
-    if (!bot || typeof bot.api !== "function") {
-      return;
+    const bot = event?.bot;
+    if (!bot || bot.adapter !== "onebotv11") {
+      return; // set_msg_emoji_like 是 onebot 专属特殊 API，icqq 不支持
     }
 
     try {
-      await bot.api("set_msg_emoji_like", {
+      await bot.sendApi("set_msg_emoji_like", {
         message_id: messageId,
         emoji_id: MusicPluginRuntime.COMMAND_REACTION_FACE_ID,
         set: true,