From f72f3183afe9507d10bffa5dfe6865119b1f22f9 Mon Sep 17 00:00:00 2001 From: n1lsqn Date: Mon, 13 Nov 2023 14:51:51 +0900 Subject: [PATCH 1/5] fix --- src/modules/core/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/core/index.ts b/src/modules/core/index.ts index 68fb47a..0e8b659 100644 --- a/src/modules/core/index.ts +++ b/src/modules/core/index.ts @@ -73,7 +73,7 @@ export default class extends Module { return true; } - if (!safeForInterpolate(name)) { + if (safeForInterpolate(name)) { msg.reply(serifs.core.invalidName); return true; } From b72dc81d6c2f90e6ff5899c36e28c57fc17909df Mon Sep 17 00:00:00 2001 From: n1lsqn Date: Mon, 13 Nov 2023 15:00:16 +0900 Subject: [PATCH 2/5] fix --- src/modules/core/index.ts | 74 +++++++++++++++++++++++++-------------- 1 file changed, 47 insertions(+), 27 deletions(-) diff --git a/src/modules/core/index.ts b/src/modules/core/index.ts index 0e8b659..d138a17 100644 --- a/src/modules/core/index.ts +++ b/src/modules/core/index.ts @@ -60,39 +60,59 @@ export default class extends Module { return true; } - @autobind - private setName(msg: Message): boolean { - if (!msg.text) return false; - if (!msg.text.includes('って呼んで')) return false; - if (msg.text.startsWith('って呼んで')) return false; +@autobind + private setName(msg: Message): boolean { + if (!msg.text) { + console.error("Message text is empty or undefined."); + return false; + } - const name = msg.text.match(/^(.+?)って呼んで/)![1]; + if (!msg.text.includes('って呼んで')) { + console.error("Message text does not include 'って呼んで'."); + return false; + } - if (name.length > 10) { - msg.reply(serifs.core.tooLong); - return true; - } + if (msg.text.startsWith('って呼んで')) { + console.error("Message text starts with 'って呼んで'."); + return false; + } - if (safeForInterpolate(name)) { - msg.reply(serifs.core.invalidName); - return true; - } + const matchResult = msg.text.match(/^(.+?)って呼んで/); - const withSan = titles.some(t => name.endsWith(t)); + if (!matchResult) { + console.error("Name not found in the message text."); + return false; + } - if (withSan) { - msg.friend.updateName(name); - msg.reply(serifs.core.setNameOk(name)); - } else { - msg.reply(serifs.core.san).then(reply => { - this.subscribeReply(msg.userId, reply.id, { - name: name - }); - }); - } + const name = matchResult[1]; - return true; - } + if (name.length > 10) { + console.error("Name length exceeds 10 characters."); + msg.reply(serifs.core.tooLong); + return true; + } + + if (safeForInterpolate(name)) { + console.error("Invalid name."); + msg.reply(serifs.core.invalidName); + return true; + } + + const withSan = titles.some(t => name.endsWith(t)); + + if (withSan) { + msg.friend.updateName(name); + msg.reply(serifs.core.setNameOk(name)); + } else { + msg.reply(serifs.core.san).then(reply => { + this.subscribeReply(msg.userId, reply.id, { + name: name + }); + }); + } + + return true; +} @autobind private modules(msg: Message): boolean { From 2139fc4b0ca863abfe85a7023625e4d034f9ba1f Mon Sep 17 00:00:00 2001 From: n1lsqn Date: Mon, 13 Nov 2023 15:15:06 +0900 Subject: [PATCH 3/5] =?UTF-8?q?feat:=20=E7=B7=A9=E5=92=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/core/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/core/index.ts b/src/modules/core/index.ts index d138a17..a430077 100644 --- a/src/modules/core/index.ts +++ b/src/modules/core/index.ts @@ -86,7 +86,7 @@ export default class extends Module { const name = matchResult[1]; - if (name.length > 10) { + if (name.length > 20) { console.error("Name length exceeds 10 characters."); msg.reply(serifs.core.tooLong); return true; From 9dffcb2086349e5225b40896613a1c80be09ff70 Mon Sep 17 00:00:00 2001 From: n1lsqn Date: Mon, 13 Nov 2023 15:17:22 +0900 Subject: [PATCH 4/5] =?UTF-8?q?feat:=20=E7=B7=A9=E5=92=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/core/index.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/modules/core/index.ts b/src/modules/core/index.ts index a430077..d2c2b96 100644 --- a/src/modules/core/index.ts +++ b/src/modules/core/index.ts @@ -86,7 +86,7 @@ export default class extends Module { const name = matchResult[1]; - if (name.length > 20) { + if (name.length > 30) { console.error("Name length exceeds 10 characters."); msg.reply(serifs.core.tooLong); return true; From 1b07eb4f7a6f50ed49b8d32f05c3828e45728c69 Mon Sep 17 00:00:00 2001 From: n1lsqn Date: Mon, 13 Nov 2023 15:22:24 +0900 Subject: [PATCH 5/5] =?UTF-8?q?feat:=20@ai=E3=82=92=E5=8F=96=E3=82=8A?= =?UTF-8?q?=E9=99=A4=E3=81=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/modules/core/index.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/modules/core/index.ts b/src/modules/core/index.ts index d2c2b96..67eb272 100644 --- a/src/modules/core/index.ts +++ b/src/modules/core/index.ts @@ -101,12 +101,12 @@ export default class extends Module { const withSan = titles.some(t => name.endsWith(t)); if (withSan) { - msg.friend.updateName(name); + msg.friend.updateName(name.replace("@ai", "")); msg.reply(serifs.core.setNameOk(name)); } else { msg.reply(serifs.core.san).then(reply => { this.subscribeReply(msg.userId, reply.id, { - name: name + name: name.replace("@ai", "") }); }); }