koishi-plugin-onebot-verifier 1.1.5 → 1.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (3) hide show
  1. package/lib/index.d.ts +3 -9
  2. package/lib/index.js +17 -29
  3. package/package.json +1 -1
package/lib/index.d.ts CHANGED
@@ -3,23 +3,17 @@ export declare const name = "onebot-verifier";
3
3
  export declare const inject: {
4
4
  optional: string[];
5
5
  };
6
- export declare const usage = "\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n <h2 style=\"margin-top: 0; color: #4a6ee0;\">\uD83D\uDCCC \u63D2\u4EF6\u8BF4\u660E</h2>\n <p>\uD83D\uDCD6 <strong>\u4F7F\u7528\u6587\u6863</strong>\uFF1A\u8BF7\u70B9\u51FB\u5DE6\u4E0A\u89D2\u7684 <strong>\u63D2\u4EF6\u4E3B\u9875</strong> \u67E5\u770B\u63D2\u4EF6\u4F7F\u7528\u6587\u6863</p>\n <p>\uD83D\uDD0D <strong>\u66F4\u591A\u63D2\u4EF6</strong>\uFF1A\u53EF\u8BBF\u95EE <a href=\"https://github.com/YisRime\" style=\"color:#4a6ee0;text-decoration:none;\">\u82E1\u6DDE\u7684 GitHub</a> \u67E5\u770B\u672C\u4EBA\u7684\u6240\u6709\u63D2\u4EF6</p>\n</div>\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n <h2 style=\"margin-top: 0; color: #e0574a;\">\u2764\uFE0F \u652F\u6301\u4E0E\u53CD\u9988</h2>\n <p>\uD83C\uDF1F \u559C\u6B22\u8FD9\u4E2A\u63D2\u4EF6\uFF1F\u8BF7\u5728 <a href=\"https://github.com/YisRime\" style=\"color:#e0574a;text-decoration:none;\">GitHub</a> \u4E0A\u7ED9\u6211\u4E00\u4E2A Star\uFF01</p>\n <p>\uD83D\uDC1B \u9047\u5230\u95EE\u9898\uFF1F\u8BF7\u901A\u8FC7 <strong>Issues</strong> \u63D0\u4EA4\u53CD\u9988\uFF0C\u6216\u52A0\u5165 QQ \u7FA4 <a href=\"https://qm.qq.com/q/PdLMx9Jowq\" style=\"color:#e0574a;text-decoration:none;\"><strong>855571375</strong></a> \u8FDB\u884C\u4EA4\u6D41</p>\n</div>\n";
6
+ export declare const usage = "\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n <h2 style=\"margin-top: 0; color: #4a6ee0;\">\uD83D\uDCCC \u63D2\u4EF6\u8BF4\u660E</h2>\n <p>\uD83D\uDCD6 <strong>\u4F7F\u7528\u6587\u6863</strong>\uFF1A\u8BF7\u70B9\u51FB\u5DE6\u4E0A\u89D2\u7684 <strong>\u63D2\u4EF6\u4E3B\u9875</strong> \u67E5\u770B\u63D2\u4EF6\u4F7F\u7528\u6587\u6863</p>\n <p>\uD83D\uDD0D <strong>\u66F4\u591A\u63D2\u4EF6</strong>\uFF1A\u53EF\u8BBF\u95EE <a href=\"https://github.com/YisRime\" style=\"color:#4a6ee0;text-decoration:none;\">\u82E1\u6DDE\u7684 GitHub</a> \u67E5\u770B\u672C\u4EBA\u7684\u6240\u6709\u63D2\u4EF6</p>\n</div>\n<div style=\"border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);\">\n <h2 style=\"margin-top: 0; color: #e0574a;\">\u2764\uFE0F \u652F\u6301\u4E0E\u53CD\u9988</h2>\n <p>\uD83C\uDF1F \u559C\u6B22\u8FD9\u4E2A\u63D2\u4EF6\uFF1F\u8BF7\u5728 <a href=\"https://github.com/YisRime\" style=\"color:#e0574a;text-decoration:none;\">GitHub</a> \u4E0A\u7ED9\u6211\u4E00\u4E2A Star\uFF01</p>\n <p>\uD83D\uDC1B \u9047\u5230\u95EE\u9898\uFF1F\u8BF7\u901A\u8FC7 <strong>Issues</strong> \u63D0\u4EA4\u53CD\u9988\uFF0C\u6216\u52A0\u5165 QQ \u7FA4 <a href=\"https://qm.qm.qq.com/q/PdLMx9Jowq\" style=\"color:#e0574a;text-decoration:none;\"><strong>855571375</strong></a> \u8FDB\u884C\u4EA4\u6D41</p>\n</div>\n";
7
7
  export interface Config {
8
8
  notifyTarget?: string;
9
9
  debugMode?: boolean;
10
10
  kickBan?: boolean;
11
- friendTimeout: 'manual' | {
12
- action: 'accept' | 'reject';
13
- timeout: number;
14
- };
11
+ friendTimeout: false | number;
15
12
  friendLevel?: number;
16
13
  friendRegex?: string;
17
14
  minMembers?: number;
18
15
  maxCapacity?: number;
19
- memberTimeout: 'manual' | {
20
- action: 'accept' | 'reject';
21
- timeout: number;
22
- };
16
+ memberTimeout: false | number;
23
17
  verifyRules?: {
24
18
  guildId: string;
25
19
  keyword?: string;
package/lib/index.js CHANGED
@@ -39,7 +39,7 @@ var usage = `
39
39
  <div style="border-radius: 10px; border: 1px solid #ddd; padding: 16px; margin-bottom: 20px; box-shadow: 0 2px 5px rgba(0,0,0,0.1);">
40
40
  <h2 style="margin-top: 0; color: #e0574a;">❤️ 支持与反馈</h2>
41
41
  <p>🌟 喜欢这个插件？请在 <a href="https://github.com/YisRime" style="color:#e0574a;text-decoration:none;">GitHub</a> 上给我一个 Star！</p>
42
- <p>🐛 遇到问题？请通过 <strong>Issues</strong> 提交反馈，或加入 QQ 群 <a href="https://qm.qq.com/q/PdLMx9Jowq" style="color:#e0574a;text-decoration:none;"><strong>855571375</strong></a> 进行交流</p>
42
+ <p>🐛 遇到问题？请通过 <strong>Issues</strong> 提交反馈，或加入 QQ 群 <a href="https://qm.qm.qq.com/q/PdLMx9Jowq" style="color:#e0574a;text-decoration:none;"><strong>855571375</strong></a> 进行交流</p>
43
43
  </div>
44
44
  `;
45
45
  var Config = import_koishi.Schema.intersect([
@@ -50,15 +50,9 @@ var Config = import_koishi.Schema.intersect([
50
50
  }).description("基础配置"),
51
51
  import_koishi.Schema.object({
52
52
  friendTimeout: import_koishi.Schema.union([
53
- import_koishi.Schema.const("manual").description("手动"),
54
- import_koishi.Schema.object({
55
- action: import_koishi.Schema.union([
56
- import_koishi.Schema.const("accept").description("同意"),
57
- import_koishi.Schema.const("reject").description("拒绝")
58
- ]).description("操作").required(),
59
- timeout: import_koishi.Schema.number().description("时长").default(360).min(1)
60
- }).description("自动")
61
- ]).description("模式").default("manual"),
53
+ import_koishi.Schema.const(false).description("手动"),
54
+ import_koishi.Schema.number().description("正数同意/负数拒绝").default(360)
55
+ ]).description("超时处理").default(false),
62
56
  friendLevel: import_koishi.Schema.number().description("最低好友等级").default(0).min(0).max(256),
63
57
  friendRegex: import_koishi.Schema.string().description("好友验证正则"),
64
58
  minMembers: import_koishi.Schema.number().description("最低群成员数").default(0).min(0).max(3e3),
@@ -66,15 +60,9 @@ var Config = import_koishi.Schema.intersect([
66
60
  }).description("好友邀群配置"),
67
61
  import_koishi.Schema.object({
68
62
  memberTimeout: import_koishi.Schema.union([
69
- import_koishi.Schema.const("manual").description("手动"),
70
- import_koishi.Schema.object({
71
- action: import_koishi.Schema.union([
72
- import_koishi.Schema.const("accept").description("同意"),
73
- import_koishi.Schema.const("reject").description("拒绝")
74
- ]).description("操作").required(),
75
- timeout: import_koishi.Schema.number().description("超时").default(360).min(1)
76
- }).description("自动")
77
- ]).description("模式").default("manual"),
63
+ import_koishi.Schema.const(false).description("手动"),
64
+ import_koishi.Schema.number().description("正数同意/负数拒绝").default(360)
65
+ ]).description("超时处理").default(false),
78
66
  verifyRules: import_koishi.Schema.array(import_koishi.Schema.object({
79
67
  guildId: import_koishi.Schema.string().description("群号").required(),
80
68
  keyword: import_koishi.Schema.string().description("正则"),
@@ -168,7 +156,7 @@ function apply(ctx, config) {
168
156
  }
169
157
  }, "sendNotice");
170
158
  const setupManual = /* @__PURE__ */ __name(async (session, kind, specialMode, useInSitu) => {
171
- const mode = kind === "member" ? config.memberTimeout : config.friendTimeout;
159
+ const timeoutCfg = kind === "member" ? config.memberTimeout : config.friendTimeout;
172
160
  let targetStr = config.notifyTarget || "";
173
161
  if (useInSitu && kind === "member" && session.guildId) targetStr = `guild:${session.guildId}`;
174
162
  const msgIds = await sendNotice(session, kind, "waiting", targetStr);
@@ -180,23 +168,23 @@ function apply(ctx, config) {
180
168
  task.votes = { yes: /* @__PURE__ */ new Set(), no: /* @__PURE__ */ new Set() };
181
169
  }
182
170
  msgIds.forEach((id) => activeTasks.set(id, task));
183
- if (mode !== "manual" && typeof mode === "object") {
184
- const { action, timeout } = mode;
171
+ if (typeof timeoutCfg === "number") {
172
+ const waitMinutes = Math.abs(timeoutCfg);
173
+ const isPass = timeoutCfg > 0;
185
174
  task.timer = setTimeout(async () => {
186
175
  if (!activeTasks.has(msgIds[0])) return;
187
176
  msgIds.forEach((id) => activeTasks.delete(id));
188
- let finalAction = action;
189
- if (specialMode === "vote") finalAction = "reject";
190
- const isPass = finalAction === "accept";
191
- await executeAction(session, kind, isPass, isPass ? "" : "等待超时，自动拒绝");
177
+ let finalActionPass = isPass;
178
+ if (specialMode === "vote") finalActionPass = false;
179
+ await executeAction(session, kind, finalActionPass, finalActionPass ? "" : "等待超时，自动拒绝");
192
180
  const [targetType, targetId] = targetStr.split(":");
193
181
  if (targetId && session.bot) {
194
- const statusText = `已自动${isPass ? "通过" : "拒绝"}该请求`;
182
+ const statusText = `已自动${finalActionPass ? "通过" : "拒绝"}该请求`;
195
183
  await (targetType === "private" ? session.bot.sendPrivateMessage(targetId, statusText) : session.bot.sendMessage(targetId, statusText)).catch(() => {
196
184
  });
197
185
  }
198
- if (config.debugMode) logger.info(`[操作] 等待超时，默认${isPass ? "通过" : "拒绝"}`);
199
- }, timeout * 6e4);
186
+ if (config.debugMode) logger.info(`[操作] 等待超时，默认${finalActionPass ? "通过" : "拒绝"}`);
187
+ }, waitMinutes * 6e4);
200
188
  }
201
189
  }, "setupManual");
202
190
  const hookEvent = /* @__PURE__ */ __name((kind) => async (session) => {
package/package.json CHANGED
@@ -1,7 +1,7 @@
1
1
  {
2
2
  "name": "koishi-plugin-onebot-verifier",
3
3
  "description": "适用于 Onebot 的审核插件，支持自动审核好友/加群/邀请请求",
4
- "version": "1.1.5",
4
+ "version": "1.1.6",
5
5
  "contributors": [
6
6
  "Yis_Rime <yis_rime@outlook.com>"
7
7
  ],