Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: スラッシュコマンドの対応 #974

Merged
merged 28 commits into from
Aug 14, 2023
Merged

feat: スラッシュコマンドの対応 #974

merged 28 commits into from
Aug 14, 2023

Conversation

MikuroXina
Copy link
Collaborator

Close #560.

Type of Change:

機能の追加, 環境変数の追加

Details of implementation (実施内容)

コマンドのスキーマの情報を元に, これらをスラッシュコマンドのスキーマへ加工して Discord API に送信するようにしました

この実装のために既存のコマンドのスキーマでは情報が不足していました. 根本的な対策として, スキーマの interface 定義を改修し, 不足していたフィールド description をそれぞれのスキーマの記述に追記しました.

@cloudflare-workers-and-pages
Copy link

cloudflare-workers-and-pages bot commented Aug 13, 2023

Deploying with  Cloudflare Pages  Cloudflare Pages

Latest commit: dddbdc9
Status: ✅  Deploy successful!
Preview URL: https://f849f778.oreorebot2.pages.dev
Branch Preview URL: https://feat--560.oreorebot2.pages.dev

View logs

@codecov
Copy link

codecov bot commented Aug 13, 2023

Codecov Report

Merging #974 (dddbdc9) into main (812ad2e) will decrease coverage by 0.09%.
The diff coverage is 85.71%.

@@            Coverage Diff             @@
##             main     #974      +/-   ##
==========================================
- Coverage   73.92%   73.83%   -0.09%     
==========================================
  Files          74       74              
  Lines        5077     5118      +41     
  Branches      452      453       +1     
==========================================
+ Hits         3753     3779      +26     
- Misses        873      887      +14     
- Partials      451      452       +1     
Flag Coverage Δ
unittests 73.83% <85.71%> (-0.09%) ⬇️

Flags with carried forward coverage won't be shown. Click here to find out more.

Files Changed Coverage Δ
src/adaptor/proxy/command/slash.ts 47.61% <0.00%> (-4.62%) ⬇️
src/model/command-schema.ts 78.03% <100.00%> (+0.25%) ⬆️
src/service/command/channel-info.ts 90.10% <100.00%> (+0.10%) ⬆️
src/service/command/debug.ts 88.05% <100.00%> (+0.18%) ⬆️
src/service/command/dice.ts 83.05% <100.00%> (+0.14%) ⬆️
src/service/command/guild-info.ts 96.51% <100.00%> (+0.01%) ⬆️
src/service/command/gyokuon.ts 82.82% <100.00%> (+0.17%) ⬆️
src/service/command/judging.ts 79.48% <100.00%> (+0.13%) ⬆️
src/service/command/kaere.ts 71.62% <100.00%> (+0.72%) ⬆️
src/service/command/kokusei-chousa.ts 94.91% <100.00%> (+0.08%) ⬆️
... and 8 more

... and 1 file with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@MikuroXina MikuroXina marked this pull request as ready for review August 13, 2023 17:10
@MikuroXina MikuroXina requested a review from m1sk9 August 13, 2023 17:10
@MikuroXina MikuroXina enabled auto-merge (squash) August 13, 2023 17:13
src/server/index.ts Outdated Show resolved Hide resolved
README.md Show resolved Hide resolved
@MikuroXina MikuroXina requested a review from m1sk9 August 14, 2023 03:15
src/server/index.ts Outdated Show resolved Hide resolved
src/service/command/channel-info.ts Outdated Show resolved Hide resolved
@m1sk9
Copy link
Contributor

m1sk9 commented Aug 14, 2023

レビューした分と合わせて一部のコマンドが正しく実行できないようです。

  • /channelinfo
CombinedPropertyError: Received one or more errors
    at ArrayValidator.handle (/Users/m1sk9/project/github.com/approvers/OreOreBot2/node_modules/@sapphire/shapeshift/src/validators/ArrayValidator.ts:102:17)
    at ArrayValidator.parse (/Users/m1sk9/project/github.com/approvers/OreOreBot2/node_modules/@sapphire/shapeshift/src/validators/BaseValidator.ts:103:2)
    at EmbedBuilder.spliceFields (/Users/m1sk9/project/github.com/approvers/OreOreBot2/node_modules/@discordjs/builders/src/messages/embed/Embed.ts:157:29)
    at EmbedBuilder.setFields (/Users/m1sk9/project/github.com/approvers/OreOreBot2/node_modules/@discordjs/builders/src/messages/embed/Embed.ts:174:8)
    at convertEmbed (file:///Users/m1sk9/project/github.com/approvers/OreOreBot2/src/adaptor/embed-convert.ts:31:11)
    at Object.reply (file:///Users/m1sk9/project/github.com/approvers/OreOreBot2/src/adaptor/proxy/command.ts:146:20)
    at ChannelInfo.on (file:///Users/m1sk9/project/github.com/approvers/OreOreBot2/src/service/command/channel-info.ts:52:19)
    at processTicksAndRejections (node:internal/process/task_queues:95:5)
    at async DiscordCommandProxy.onInteractionCreate (file:///Users/m1sk9/project/github.com/approvers/OreOreBot2/src/adaptor/proxy/command.ts:131:5) {
  errors: [ [ 1, [CombinedPropertyError] ] ]
}
  • /help
  • 既に返信済みのインタラクションに応答してしまったようです。
Error [InteractionAlreadyReplied]: The reply to this interaction has already been sent or deferred.
    at ChatInputCommandInteraction.reply (/Users/m1sk9/project/github.com/approvers/OreOreBot2/node_modules/discord.js/src/structures/interfaces/InteractionResponses.js:102:46)
    at Object.replyPages (file:///Users/m1sk9/project/github.com/approvers/OreOreBot2/src/adaptor/proxy/command.ts:215:37)
    at HelpCommand.on (file:///Users/m1sk9/project/github.com/approvers/OreOreBot2/src/service/command/help.ts:33:19)
    at file:///Users/m1sk9/project/github.com/approvers/OreOreBot2/src/runner/command.ts:26:17
    at DiscordCommandProxy.onInteractionCreate (file:///Users/m1sk9/project/github.com/approvers/OreOreBot2/src/adaptor/proxy/command.ts:131:11)
    at processTicksAndRejections (node:internal/process/task_queues:95:5) {
  code: 'InteractionAlreadyReplied'
}

@MikuroXina
Copy link
Collaborator Author

CHANNEL の引数のパースができていなかったのを修正しました. また, deferReply を使うのをやめました. 使わなくても十分間に合うようです.

@MikuroXina MikuroXina requested a review from m1sk9 August 14, 2023 14:26
@MikuroXina MikuroXina merged commit 9f3a867 into main Aug 14, 2023
13 of 14 checks passed
@MikuroXina MikuroXina deleted the feat/#560 branch August 14, 2023 15:21
This was referenced Sep 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

スラッシュコマンドへの移行
2 participants