From 5b6cef93e4f9d19857045e444f6df91172988f71 Mon Sep 17 00:00:00 2001 From: raiga0310 Date: Sat, 26 Nov 2022 07:42:10 +0900 Subject: [PATCH 01/11] =?UTF-8?q?feat:=20=E3=82=AA=E3=83=97=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/command/meme/takopi.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/service/command/meme/takopi.ts b/src/service/command/meme/takopi.ts index eb17fe3e..bc59f4ea 100644 --- a/src/service/command/meme/takopi.ts +++ b/src/service/command/meme/takopi.ts @@ -1,15 +1,19 @@ import type { MemeTemplate } from '../../../model/meme-template.js'; -const takopiFlags = ['f'] as const; +const takopiFlags = ['f', 'c'] as const; export const takopi: MemeTemplate = { commandNames: ['takopi'], description: - '「〜、出して」\n`-f` で教員と自分の名前の位置を反対にします。([idea: フライさん](https://github.com/approvers/OreOreBot2/issues/90))', + '「〜、出して」\n`-f` で教員と自分の名前の位置を反対にします。\n`-c`で教員の名前も変更可能です。\n([idea: フライさん](https://github.com/approvers/OreOreBot2/issues/90))', flagsKeys: takopiFlags, optionsKeys: [], errorMessage: '(引数が)わ、わかんないっピ.......', generate(args, author) { + if (args.flags.c) + return `${author}「${args.body.split(' ')[0]}、出して」\n${ + args.body.split(' ')[1] + }「わ、わかんないっピ.......」`; if (args.flags.f) return `${author}「${args.body}、出して」\n教員「わ、わかんないっピ.......」`; return `教員「${args.body}、出して」\n${author}「わ、わかんないっピ.......」`; From 17d92d966f0c03c1bead6fdc497c357552283c26 Mon Sep 17 00:00:00 2001 From: raiga0310 Date: Sat, 26 Nov 2022 07:42:37 +0900 Subject: [PATCH 02/11] =?UTF-8?q?=E3=82=AA=E3=83=97=E3=82=B7=E3=83=A7?= =?UTF-8?q?=E3=83=B3=E8=BF=BD=E5=8A=A0=E5=AE=9F=E8=A3=85=E3=81=AB=E4=BC=B4?= =?UTF-8?q?=E3=81=86=E3=83=86=E3=82=B9=E3=83=88=E3=82=B1=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/command/meme.test.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/service/command/meme.test.ts b/src/service/command/meme.test.ts index 77debdac..0818a65a 100644 --- a/src/service/command/meme.test.ts +++ b/src/service/command/meme.test.ts @@ -94,6 +94,25 @@ describe('meme', () => { ); }); + it('use case of takopi (-c)', async () => { + await responder.on( + createMockMessage( + parseStringsOrThrow( + ['takopi', '-c', 'こるく いっそう'], + responder.schema + ), + (message) => { + expect(message).toStrictEqual({ + description: `りにあ「こるく、出して」\nいっそう「わ、わかんないっピ.......」` + }); + }, + { + senderName: 'りにあ' + } + ) + ); + }); + it('use case of n', async () => { await responder.on( createMockMessage( From a25ad6410774af773d84a0796f19984bde023ac4 Mon Sep 17 00:00:00 2001 From: raiga0310 Date: Sat, 26 Nov 2022 13:23:29 +0900 Subject: [PATCH 03/11] =?UTF-8?q?chore:=20=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=81=AE=E5=BC=95=E6=95=B0=E3=81=AE=E5=A4=89=E6=9B=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/command/meme.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/command/meme.test.ts b/src/service/command/meme.test.ts index 0818a65a..07cc7b6c 100644 --- a/src/service/command/meme.test.ts +++ b/src/service/command/meme.test.ts @@ -98,7 +98,7 @@ describe('meme', () => { await responder.on( createMockMessage( parseStringsOrThrow( - ['takopi', '-c', 'こるく いっそう'], + ['takopi', '-c', 'こるく', 'いっそう'], responder.schema ), (message) => { From 8942ace4085b279d85d5998e21e87632cdb5d7f9 Mon Sep 17 00:00:00 2001 From: raiga0310 Date: Sat, 26 Nov 2022 13:24:23 +0900 Subject: [PATCH 04/11] =?UTF-8?q?refactor:=20=E3=82=AA=E3=83=97=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E5=BC=95=E6=95=B0=E3=81=B8=E3=81=AE=E5=86=8D?= =?UTF-8?q?=E8=A8=AD=E8=A8=88(=20#586=20=E5=AF=BE=E5=BF=9C=E5=BE=85?= =?UTF-8?q?=E3=81=A1=20)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/command/meme/takopi.ts | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/src/service/command/meme/takopi.ts b/src/service/command/meme/takopi.ts index bc59f4ea..744952eb 100644 --- a/src/service/command/meme/takopi.ts +++ b/src/service/command/meme/takopi.ts @@ -1,8 +1,13 @@ import type { MemeTemplate } from '../../../model/meme-template.js'; -const takopiFlags = ['f', 'c'] as const; +const takopiFlags = ['f'] as const; +//waiting merge #586 +const takopiOptions = ['c'] as const; -export const takopi: MemeTemplate = { +export const takopi: MemeTemplate< + typeof takopiFlags[number], + typeof takopiOptions[number] +> = { commandNames: ['takopi'], description: '「〜、出して」\n`-f` で教員と自分の名前の位置を反対にします。\n`-c`で教員の名前も変更可能です。\n([idea: フライさん](https://github.com/approvers/OreOreBot2/issues/90))', @@ -10,10 +15,8 @@ export const takopi: MemeTemplate = { optionsKeys: [], errorMessage: '(引数が)わ、わかんないっピ.......', generate(args, author) { - if (args.flags.c) - return `${author}「${args.body.split(' ')[0]}、出して」\n${ - args.body.split(' ')[1] - }「わ、わかんないっピ.......」`; + if (args.options.c) + return `${author}「${args.body}、出して」\n${args.options.c}「わ、わかんないっピ.......」`; if (args.flags.f) return `${author}「${args.body}、出して」\n教員「わ、わかんないっピ.......」`; return `教員「${args.body}、出して」\n${author}「わ、わかんないっピ.......」`; From 30cacae93ced8a7997098b7bfc4cc5d0d33cc815 Mon Sep 17 00:00:00 2001 From: raiga0310 Date: Sat, 26 Nov 2022 18:18:37 +0900 Subject: [PATCH 05/11] =?UTF-8?q?fix:=20=E3=82=AA=E3=83=97=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=81=AE=E8=A8=AD=E5=AE=9A=E3=82=82=E3=82=8C?= =?UTF-8?q?=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/command/meme/takopi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/command/meme/takopi.ts b/src/service/command/meme/takopi.ts index 744952eb..608577bf 100644 --- a/src/service/command/meme/takopi.ts +++ b/src/service/command/meme/takopi.ts @@ -12,7 +12,7 @@ export const takopi: MemeTemplate< description: '「〜、出して」\n`-f` で教員と自分の名前の位置を反対にします。\n`-c`で教員の名前も変更可能です。\n([idea: フライさん](https://github.com/approvers/OreOreBot2/issues/90))', flagsKeys: takopiFlags, - optionsKeys: [], + optionsKeys: takopiOptions, errorMessage: '(引数が)わ、わかんないっピ.......', generate(args, author) { if (args.options.c) From 1731e18577c2daab689ba1d7be917d049e960f02 Mon Sep 17 00:00:00 2001 From: raiga0310 Date: Sat, 26 Nov 2022 18:19:06 +0900 Subject: [PATCH 06/11] =?UTF-8?q?chore:=20=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=82=B1=E3=83=BC=E3=82=B9=E3=81=AE=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/command/meme.test.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/command/meme.test.ts b/src/service/command/meme.test.ts index 07cc7b6c..038c13f5 100644 --- a/src/service/command/meme.test.ts +++ b/src/service/command/meme.test.ts @@ -103,7 +103,7 @@ describe('meme', () => { ), (message) => { expect(message).toStrictEqual({ - description: `りにあ「こるく、出して」\nいっそう「わ、わかんないっピ.......」` + description: `りにあ「いっそう、出して」\nこるく「わ、わかんないっピ.......」` }); }, { From 6b3f9aa95584681ad06e3ebb45a29f8d6b0bc105 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=82=AC=E3=83=BC?= <44018535+raiga0310@users.noreply.github.com> Date: Sat, 26 Nov 2022 18:23:29 +0900 Subject: [PATCH 07/11] chore: deletion comment MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Mikuroさいな --- src/service/command/meme/takopi.ts | 1 - 1 file changed, 1 deletion(-) diff --git a/src/service/command/meme/takopi.ts b/src/service/command/meme/takopi.ts index 608577bf..d53a9816 100644 --- a/src/service/command/meme/takopi.ts +++ b/src/service/command/meme/takopi.ts @@ -1,7 +1,6 @@ import type { MemeTemplate } from '../../../model/meme-template.js'; const takopiFlags = ['f'] as const; -//waiting merge #586 const takopiOptions = ['c'] as const; export const takopi: MemeTemplate< From 666d4481c901bf0b055d162d406c9e66585a0e7d Mon Sep 17 00:00:00 2001 From: raiga0310 Date: Sat, 26 Nov 2022 18:59:09 +0900 Subject: [PATCH 08/11] =?UTF-8?q?fix:=20=E3=83=86=E3=82=B9=E3=83=88?= =?UTF-8?q?=E3=82=B1=E3=83=BC=E3=82=B9=E3=81=AE=E8=BF=BD=E5=8A=A0=20?= =?UTF-8?q?=E4=BF=AE=E6=AD=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/command/meme.test.ts | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/service/command/meme.test.ts b/src/service/command/meme.test.ts index 038c13f5..9fef9b25 100644 --- a/src/service/command/meme.test.ts +++ b/src/service/command/meme.test.ts @@ -101,6 +101,25 @@ describe('meme', () => { ['takopi', '-c', 'こるく', 'いっそう'], responder.schema ), + (message) => { + expect(message).toStrictEqual({ + description: `こるく「いっそう、出して」\nりにあ「わ、わかんないっピ.......」` + }); + }, + { + senderName: 'りにあ' + } + ) + ); + }); + + it('use case of takopi (-f, -c)', async () => { + await responder.on( + createMockMessage( + parseStringsOrThrow( + ['takopi', '-f', '-c', 'こるく', 'いっそう'], + responder.schema + ), (message) => { expect(message).toStrictEqual({ description: `りにあ「いっそう、出して」\nこるく「わ、わかんないっピ.......」` From b49748e254927f066ded76485f1d73aecbefc38e Mon Sep 17 00:00:00 2001 From: raiga0310 Date: Sat, 26 Nov 2022 18:59:39 +0900 Subject: [PATCH 09/11] =?UTF-8?q?refactor:=20=E3=82=AA=E3=83=97=E3=82=B7?= =?UTF-8?q?=E3=83=A7=E3=83=B3=E3=83=BB=E3=83=95=E3=83=A9=E3=82=B0=E3=81=AE?= =?UTF-8?q?=E9=87=8D=E8=A4=87=E6=99=82=E3=81=B8=E3=81=AE=E5=AF=BE=E5=BF=9C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/command/meme/takopi.ts | 17 ++++++++++++----- 1 file changed, 12 insertions(+), 5 deletions(-) diff --git a/src/service/command/meme/takopi.ts b/src/service/command/meme/takopi.ts index d53a9816..3c7f0b18 100644 --- a/src/service/command/meme/takopi.ts +++ b/src/service/command/meme/takopi.ts @@ -14,10 +14,17 @@ export const takopi: MemeTemplate< optionsKeys: takopiOptions, errorMessage: '(引数が)わ、わかんないっピ.......', generate(args, author) { - if (args.options.c) - return `${author}「${args.body}、出して」\n${args.options.c}「わ、わかんないっピ.......」`; - if (args.flags.f) - return `${author}「${args.body}、出して」\n教員「わ、わかんないっピ.......」`; - return `教員「${args.body}、出して」\n${author}「わ、わかんないっピ.......」`; + const takopiArgs = { + takopi: author, + shizuka: args.options.c ?? '教員', + goods: args.body ?? '課題' + }; + + if (args.flags.f) { + const temp: string = takopiArgs.takopi; + takopiArgs.takopi = takopiArgs.shizuka; + takopiArgs.shizuka = temp; + } + return `${takopiArgs.shizuka}「${takopiArgs.goods}、出して」\n${takopiArgs.takopi}「わ、わかんないっピ.......」`; } }; From 751f41bb155751efb19cb8bca5bbea35e9c34ee6 Mon Sep 17 00:00:00 2001 From: raiga0310 Date: Sat, 26 Nov 2022 22:53:32 +0900 Subject: [PATCH 10/11] =?UTF-8?q?feat:=20=E5=BC=95=E6=95=B0=E4=B8=8D?= =?UTF-8?q?=E8=B6=B3=E6=99=82=E3=81=AE=E3=83=86=E3=82=B9=E3=83=88=E3=82=B1?= =?UTF-8?q?=E3=83=BC=E3=82=B9=E3=81=AE=E8=BF=BD=E5=8A=A0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/service/command/meme.test.ts | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/src/service/command/meme.test.ts b/src/service/command/meme.test.ts index 9fef9b25..289725ad 100644 --- a/src/service/command/meme.test.ts +++ b/src/service/command/meme.test.ts @@ -132,6 +132,20 @@ describe('meme', () => { ); }); + it('few arguments of takopi (-c)', async () => { + await responder.on( + createMockMessage( + parseStringsOrThrow(['takopi', '-c', 'こるく'], responder.schema), + (message) => { + expect(message).toStrictEqual({ + description: '(引数が)わ、わかんないっピ.......', + title: '引数が不足してるみたいだ。' + }); + } + ) + ); + }); + it('use case of n', async () => { await responder.on( createMockMessage( From ac2d8c46eaba72e75c73372329e88f4b54fd69b1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E3=83=A9=E3=82=A4=E3=82=AC=E3=83=BC?= <44018535+raiga0310@users.noreply.github.com> Date: Sat, 26 Nov 2022 23:02:09 +0900 Subject: [PATCH 11/11] =?UTF-8?q?chore:=20=E3=83=98=E3=83=AB=E3=83=97?= =?UTF-8?q?=E3=83=A1=E3=83=83=E3=82=BB=E3=83=BC=E3=82=B8=E3=81=AE=E8=A6=AA?= =?UTF-8?q?=E5=88=87=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: m2en --- src/service/command/meme/takopi.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/service/command/meme/takopi.ts b/src/service/command/meme/takopi.ts index 3c7f0b18..4a920313 100644 --- a/src/service/command/meme/takopi.ts +++ b/src/service/command/meme/takopi.ts @@ -9,7 +9,7 @@ export const takopi: MemeTemplate< > = { commandNames: ['takopi'], description: - '「〜、出して」\n`-f` で教員と自分の名前の位置を反対にします。\n`-c`で教員の名前も変更可能です。\n([idea: フライさん](https://github.com/approvers/OreOreBot2/issues/90))', + '「〜、出して」\n`-f` で教員と自分の名前の位置を反対にします。\n`-c <教員の名前> <出すもの>`で教員の名前も変更可能です。\n([idea: フライさん](https://github.com/approvers/OreOreBot2/issues/90))', flagsKeys: takopiFlags, optionsKeys: takopiOptions, errorMessage: '(引数が)わ、わかんないっピ.......',