mioku-plugin-impact 1.1.2 → 2.0.1

package/handlers/dajiao.ts

@@ -9,7 +9,7 @@ export async function handleDajiao(h: HandlerContext): Promise<void> {
   if (!cdState.ok) {
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text(
           `你已经打不动了喵, 请等待${roundTo(cdState.remaining, 3)}秒后再打喵`,
         ),
@@ -26,7 +26,7 @@ export async function handleDajiao(h: HandlerContext): Promise<void> {
     await db.addJjLength(Number(uid), delta);
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text(
           `打胶结束喵, 你的${pickJj()}很满意喵, 长了${delta}cm喵, 目前长度为${db.getJjLength(
             Number(uid),
@@ -39,7 +39,7 @@ export async function handleDajiao(h: HandlerContext): Promise<void> {
     await db.addNewUser(Number(uid));
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text(
           `你还没有创建${pickJj()}, 咱帮你创建了喵, 目前长度是10cm喵`,
         ),

package/handlers/open-module.ts

@@ -1,4 +1,4 @@
-import { isOwner } from "mioki";
+import { isOwner } from "mioku";
 import { isGroupAdmin } from "../utils";
 import type { HandlerContext } from "./types";
 

package/handlers/pk.ts

@@ -9,7 +9,7 @@ export async function handlePk(h: HandlerContext): Promise<void> {
   if (!cdState.ok) {
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text(
           `你已经pk不动了喵, 请等待${roundTo(cdState.remaining, 3)}秒后再pk喵`,
         ),
@@ -27,7 +27,7 @@ export async function handlePk(h: HandlerContext): Promise<void> {
   if (at === Number(uid)) {
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text("你不能pk自己喵"),
       ],
       false,
@@ -45,7 +45,7 @@ export async function handlePk(h: HandlerContext): Promise<void> {
     clearCooldown(cd.pk, uid);
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text(
           `你或对面还没有创建${pickJj()}喵, 咱全帮你创建了喵, 你们的${pickJj()}长度都是10cm喵`,
         ),
@@ -62,7 +62,7 @@ export async function handlePk(h: HandlerContext): Promise<void> {
     await db.addJjLength(at, -delta);
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text(
           `对决胜利喵, 你的${pickJj()}增加了${roundTo(
             delta / 2,
@@ -77,7 +77,7 @@ export async function handlePk(h: HandlerContext): Promise<void> {
     await db.addJjLength(at, delta / 2);
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text(
           `对决失败喵, 在对面牛子的阴影笼罩下你的${pickJj()}减小了${delta}cm喵, 对面增加了${roundTo(
             delta / 2,

package/handlers/queryjj.ts

@@ -10,7 +10,7 @@ export async function handleQueryJj(h: HandlerContext): Promise<void> {
     if (db.isUserInTable(uid)) {
       await event.reply(
         [
-          ctx.segment.at(uid),
+          ctx.segment.at(String(uid)),
           ctx.segment.text(`你的${pickJj()}目前长度为${db.getJjLength(uid)}cm喵`),
         ],
         false,
@@ -19,7 +19,7 @@ export async function handleQueryJj(h: HandlerContext): Promise<void> {
       await db.addNewUser(uid);
       await event.reply(
         [
-          ctx.segment.at(uid),
+          ctx.segment.at(String(uid)),
           ctx.segment.text(
             `你还没有创建${pickJj()}喵, 咱帮你创建了喵, 目前长度是10cm喵`,
           ),
@@ -33,7 +33,7 @@ export async function handleQueryJj(h: HandlerContext): Promise<void> {
   if (db.isUserInTable(at)) {
     await event.reply(
       [
-        ctx.segment.at(uid),
+        ctx.segment.at(String(uid)),
         ctx.segment.text(`TA的${pickJj()}目前长度为${db.getJjLength(at)}cm喵`),
       ],
       false,
@@ -42,7 +42,7 @@ export async function handleQueryJj(h: HandlerContext): Promise<void> {
     await db.addNewUser(at);
     await event.reply(
       [
-        ctx.segment.at(uid),
+        ctx.segment.at(String(uid)),
         ctx.segment.text(
           `TA还没有创建${pickJj()}喵, 咱帮他创建了喵, 目前长度是10cm喵`,
         ),

package/handlers/rank.ts

@@ -26,7 +26,7 @@ export async function handleRank(h: HandlerContext): Promise<void> {
     await db.addNewUser(Number(event.user_id));
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text(
           `你还没有创建${pickJj()}看不到rank喵, 咱帮你创建了喵, 目前长度是10cm喵`,
         ),
@@ -36,10 +36,9 @@ export async function handleRank(h: HandlerContext): Promise<void> {
     return;
   }
 
-  const selfId = Number(event.self_id);
   const rows: RankRow[] = await Promise.all(
     [...top5, ...last5].map(async (r) => ({
-      name: await getStrangerNickname(ctx, selfId, r.userId),
+      name: await getStrangerNickname(event.bot, r.userId),
       userId: r.userId,
       jjLength: r.jjLength,
     })),
@@ -49,7 +48,7 @@ export async function handleRank(h: HandlerContext): Promise<void> {
 
   await event.reply(
     [
-      ctx.segment.at(Number(event.user_id)),
+      ctx.segment.at(String(event.user_id)),
       ctx.segment.image(imagePath),
       ctx.segment.text(`你的排名为${myIndex + 1}喵`),
     ],

package/handlers/suo.ts

@@ -9,7 +9,7 @@ export async function handleSuo(h: HandlerContext): Promise<void> {
   if (!cdState.ok) {
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text(
           `你已经嗦不动了喵, 请等待${roundTo(cdState.remaining, 3)}秒后再嗦喵`,
         ),
@@ -27,7 +27,7 @@ export async function handleSuo(h: HandlerContext): Promise<void> {
       await db.addJjLength(Number(uid), delta);
       await event.reply(
         [
-          ctx.segment.at(Number(event.user_id)),
+          ctx.segment.at(String(event.user_id)),
           ctx.segment.text(
             `你的${pickJj()}很满意喵, 嗦长了${delta}cm喵, 目前长度为${db.getJjLength(
               Number(uid),
@@ -41,7 +41,7 @@ export async function handleSuo(h: HandlerContext): Promise<void> {
       clearCooldown(cd.suo, uid);
       await event.reply(
         [
-          ctx.segment.at(Number(event.user_id)),
+          ctx.segment.at(String(event.user_id)),
           ctx.segment.text(
             `你还没有创建${pickJj()}喵, 咱帮你创建了喵, 目前长度是10cm喵`,
           ),
@@ -57,7 +57,7 @@ export async function handleSuo(h: HandlerContext): Promise<void> {
     await db.addJjLength(at, delta);
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text(
           `对方的${pickJj()}很满意喵, 嗦长了${delta}cm喵, 目前长度为${db.getJjLength(
             at,
@@ -71,7 +71,7 @@ export async function handleSuo(h: HandlerContext): Promise<void> {
     clearCooldown(cd.suo, uid);
     await event.reply(
       [
-        ctx.segment.at(Number(event.user_id)),
+        ctx.segment.at(String(event.user_id)),
         ctx.segment.text(
           `TA还没有创建${pickJj()}喵, 咱帮TA创建了喵, 目前长度是10cm喵`,
         ),

package/handlers/types.ts

@@ -1,11 +1,11 @@
 import type { ScreenshotService } from "mioku";
-import type { MiokiContext } from "mioki";
+import type { MiokuContext } from "mioku";
 import type { ImpactConfig } from "../configs/base";
 import type { ImpactDatabase } from "../db";
 import type { CooldownState } from "../types";
 
 export interface HandlerContext {
-  ctx: MiokiContext;
+  ctx: MiokuContext;
   db: ImpactDatabase;
   cd: CooldownState;
   config: ImpactConfig;

package/handlers/yinpa.ts

@@ -1,4 +1,4 @@
-import { isOwner } from "mioki";
+import { isOwner } from "mioku";
 import { checkCooldown, clearCooldown, markCooldown } from "../state";
 import {
   getAtUserId,
@@ -35,7 +35,7 @@ export async function handleYinpa(
   if (!cdState.ok && !isOwner(event)) {
     await event.reply(
       [
-        ctx.segment.at(uid),
+        ctx.segment.at(String(uid)),
         ctx.segment.text(
           `你已经榨不出来任何东西了, 请先休息${roundTo(cdState.remaining, 3)}秒`,
         ),
@@ -47,13 +47,17 @@ export async function handleYinpa(
   markCooldown(cd.fuck, uidKey);
 
   const reqUserCard = getSenderName(event);
-  const selfId = Number(event.self_id);
   let prepList: PrepMember[];
   try {
-    const raw = await ctx
-      .pickBot(selfId)
-      .api("get_group_member_list", { group_id: Number(event.group_id) });
-    prepList = (raw as PrepMember[]) ?? [];
+    const bot = h.event.bot;
+    if (!bot) throw new Error("bot not found");
+    const members = await bot.getGroupMembers(String(event.group_id));
+    prepList = members.map((m: import("mioku").MemberInfo) => ({
+      user_id: Number(m.user_id),
+      role: (m.role as PrepMember["role"]) ?? "member",
+      card: m.card,
+      nickname: m.nickname,
+    }));
   } catch (err) {
     clearCooldown(cd.fuck, uidKey);
     ctx.logger.error(`impact: 获取群成员列表失败: ${err}`);

package/index.ts

@@ -1,4 +1,4 @@
-import { definePlugin, type MiokiContext } from "mioki";
+import { definePlugin, type MiokuContext } from "mioku";
 import {
   cloneConfig,
   DEFAULT_CONFIG,
@@ -25,7 +25,7 @@ const impactPlugin = definePlugin({
   version: "1.0.0",
   description: "让群友们眼前一黑的淫趴插件（牛子比拼），移植自 nonebot_plugin_impact",
 
-  async setup(ctx: MiokiContext) {
+  async setup(ctx: MiokuContext) {
     ctx.logger.info("impact 插件正在初始化...");
 
     let db: ImpactDatabase;
@@ -94,7 +94,7 @@ const impactPlugin = definePlugin({
         // 其余命令需要群开启了银趴
         if (!db.isGroupAllowed(Number(event.group_id))) {
           await event.reply(
-            [ctx.segment.at(Number(event.user_id)), ctx.segment.text(NOT_ALLOW_TEXT)],
+            [ctx.segment.at(String(event.user_id)), ctx.segment.text(NOT_ALLOW_TEXT)],
             false,
           );
           return;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "mioku-plugin-impact",
-  "version": "1.1.2",
+  "version": "2.0.1",
   "description": "让群友们眼前一黑的淫趴插件",
   "main": "index.ts",
   "type": "module",
@@ -114,11 +114,9 @@
     }
   },
   "peerDependencies": {
-    "mioku": "^0.8.0",
-    "mioki": "^0.16.0"
+    "mioku": "^1.0.0"
   },
   "devDependencies": {
-    "mioku": "workspace:*",
-    "mioki": "^0.16.0"
+    "mioku": "workspace:*"
   }
 }

package/utils.ts

@@ -1,4 +1,5 @@
-import type { MiokiContext } from "mioki";
+import type { MiokuContext } from "mioku";
+
 
 export const JJ_VARIABLES = ["牛子", "牛牛", "丁丁", "JJ"] as const;
 
@@ -67,16 +68,11 @@ export function getSenderName(event: any): string {
 }
 
 export async function getStrangerNickname(
-  ctx: MiokiContext,
-  selfId: number,
+  bot: import("mioku").Bot | undefined,
   userId: number,
 ): Promise<string> {
   try {
-    const info = (await ctx
-      .pickBot(selfId)
-      .api("get_stranger_info", { user_id: userId, no_cache: false })) as
-      | { nickname?: string }
-      | undefined;
+    const info = bot ? await bot.getFriendInfo(userId) : undefined;
     const name = String(info?.nickname || "").trim();
     if (name) return name;
   } catch {