koishi-plugin-subscription 0.0.6 → 0.0.7

package/lib/index.d.ts

@@ -1,4 +1,9 @@
 import { Context, Dict, Schema, Service, Fragment } from 'koishi';
+interface RecordsItem {
+    app: string;
+    id: string;
+    createdAt: Date;
+}
 interface SubscriptionItem {
     id: number;
     app: string;
@@ -31,16 +36,19 @@ declare module 'koishi' {
     }
     interface Tables {
         subscription_service: SubscriptionItem;
+        subscription_records: RecordsItem;
     }
 }
 declare class SubscriptionService extends Service {
-    readonly tableName = "subscription_service";
+    readonly subTableName = "subscription_service";
+    readonly recTableName = "subscription_records";
     subsConfig: Config;
     appMap: Map<string, string>;
     accountMap: Map<string, string>;
     constructor(ctx: Context, config: Config);
     initMap(): void;
     private getApp;
+    checkExist(app: string, id: string): Promise<boolean>;
     getAccount(app: string, account: string): string;
     getName(app: string, account: string): string;
     getAvailableAccounts(app: string): string[];

package/lib/index.js

@@ -77,7 +77,8 @@ var SubscriptionService = class extends import_koishi.Service {
     __name(this, "SubscriptionService");
   }
   // 数据表名称
-  tableName = "subscription_service";
+  subTableName = "subscription_service";
+  recTableName = "subscription_records";
   subsConfig;
   appMap;
   accountMap;
@@ -85,7 +86,7 @@ var SubscriptionService = class extends import_koishi.Service {
     super(ctx, "subscription");
     this.subsConfig = config;
     this.initMap();
-    ctx.model.extend(this.tableName, {
+    ctx.model.extend(this.subTableName, {
       id: "unsigned",
       app: "string",
       account: "string",
@@ -95,6 +96,14 @@ var SubscriptionService = class extends import_koishi.Service {
       primary: "id",
       autoInc: true
     });
+    ctx.model.extend(this.recTableName, {
+      app: "string",
+      id: "string",
+      createdAt: "timestamp"
+    }, {
+      primary: ["app", "id"],
+      autoInc: false
+    });
     this.registerCommands(ctx, config);
   }
   initMap() {
@@ -124,6 +133,18 @@ var SubscriptionService = class extends import_koishi.Service {
   getApp(app) {
     return this.appMap.get(app.toLowerCase());
   }
+  async checkExist(app, id) {
+    app = this.getApp(app);
+    if ((await this.ctx.database.get(this.recTableName, { app, id })).length > 0) {
+      return true;
+    }
+    await this.ctx.database.upsert(this.recTableName, [{
+      app,
+      id,
+      createdAt: /* @__PURE__ */ new Date()
+    }]);
+    return false;
+  }
   getAccount(app, account) {
     return this.accountMap.get((app + account).toLowerCase());
   }
@@ -140,7 +161,7 @@ var SubscriptionService = class extends import_koishi.Service {
   // 根据应用和账号获取订阅了这个账号的所有群组
   async getSubscribedGroups(app, account) {
     app = this.getApp(app), account = this.getAccount(app, account);
-    const subscriptions = await this.ctx.database.get(this.tableName, {
+    const subscriptions = await this.ctx.database.get(this.subTableName, {
       app,
       account
     });
@@ -195,15 +216,26 @@ var SubscriptionService = class extends import_koishi.Service {
           },
           user: { id: bot.selfId }
         });
-        const messageIds = Array.isArray(content) ? (await Promise.all(content.map(
-          (msg) => {
+        let messageIds = [];
+        if (Array.isArray(content)) {
+          for (const msg of content) {
             try {
-              return retry(3, () => bot.sendMessage(selfChannelId, msg, void 0, { session }));
+              const ids = await retry(
+                3,
+                () => bot.sendMessage(selfChannelId, msg, void 0, { session })
+              );
+              if (Array.isArray(ids)) messageIds.push(...ids);
+              else if (ids != null) messageIds.push(ids);
             } catch (e) {
-              return Promise.resolve([]);
+              continue;
             }
           }
-        ))).flat(1) : await retry(3, () => bot.sendMessage(selfChannelId, content, void 0, { session }));
+        } else {
+          messageIds = await retry(
+            3,
+            () => bot.sendMessage(selfChannelId, content, void 0, { session })
+          );
+        }
         const forwardContent = /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { forward: true, children: messageIds.map((id) => /* @__PURE__ */ (0, import_jsx_runtime.jsx)("message", { id: `${id}` })) });
         const sessions = targets.map(({ id, guildId, locales }) => {
           const session2 = bot.session({
@@ -231,7 +263,7 @@ var SubscriptionService = class extends import_koishi.Service {
     if (!appConfig.includes(account)) {
       return { status: false, msg: "账号不在白名单中" };
     }
-    const existing = await this.ctx.database.get(this.tableName, {
+    const existing = await this.ctx.database.get(this.subTableName, {
       app,
       account,
       groupId
@@ -239,7 +271,7 @@ var SubscriptionService = class extends import_koishi.Service {
     if (existing.length > 0) {
       return { status: false, msg: "已订阅该账号" };
     }
-    await this.ctx.database.create(this.tableName, {
+    await this.ctx.database.create(this.subTableName, {
       app,
       account,
       groupId,
@@ -249,8 +281,8 @@ var SubscriptionService = class extends import_koishi.Service {
   }
   // 删除订阅
   async removeSubscription(app, account, groupId) {
-    app = this.appMap.get(app), account = this.accountMap.get(app + account);
-    const result = await this.ctx.database.remove(this.tableName, {
+    app = this.appMap.get(app), account = this.getAccount(app, account);
+    const result = await this.ctx.database.remove(this.subTableName, {
       app,
       account,
       groupId
@@ -259,11 +291,11 @@ var SubscriptionService = class extends import_koishi.Service {
   }
   // 获取群组的所有订阅
   async getGroupSubscriptions(groupId) {
-    return await this.ctx.database.get(this.tableName, { groupId });
+    return await this.ctx.database.get(this.subTableName, { groupId });
   }
   // 获取所有订阅（用于管理）
   async getAllSubscriptions() {
-    return await this.ctx.database.get(this.tableName, {});
+    return await this.ctx.database.get(this.subTableName, {});
   }
   // 按应用获取订阅统计
   async getSubscriptionStats() {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "koishi-plugin-subscription",
   "description": "给多个应用提供订阅群组管理",
-  "version": "0.0.6",
+  "version": "0.0.7",
   "main": "lib/index.js",
   "typings": "lib/index.d.ts",
   "files": [