Merge pull request #40 from ictsc/integration-with-rstate

rstateとの連携を実装した

Cargo.toml

@@ -9,11 +9,13 @@ edition = "2021"
 anyhow = "1.0.53"
 async-trait = "0.1.52"
 base64 = "0.13.0"
+chrono = { version = "0.4.31", features = ["serde"] }
 clap = { version = "4.4.2", features = ["derive"] }
 derive_builder = "0.12.0"
 reqwest = { version = "0.11.9", features = ["json"] }
 serde = "1.0.131"
 serde_derive = "1.0.131"
+serde_json = "1.0.108"
 serde_yaml = "0.8.21"
 serenity = { version = "0.11.6", default-features = false, features = ["client", "collector", "gateway", "rustls_backend", "model", "unstable_discord_api"] }
 thiserror = "1.0.30"

Makefile

@@ -3,7 +3,7 @@ NAME ?= ictsc-discord-bot
 IMAGE_TAG ?= latest
 IMAGE ?= ghcr.io/ictsc/ictsc-discord-bot:$(IMAGE_TAG)
 
-DOCKER_ARGS ?= --name $(NAME) -v "$(shell pwd)/bot.yaml:/bot.yaml"
+DOCKER_ARGS ?= -v "$(shell pwd)/bot.yaml:/bot.yaml" --net host --env RUST_LOG=info,bot=debug
 
 all:
 
@@ -13,8 +13,17 @@ build:
 
 .PHONY: start
 start:
-	DOCKER_BUILDKIT=1 docker run -d $(DOCKER_ARGS) $(IMAGE) -f /bot.yaml start
+	docker run -d --name $(NAME) $(DOCKER_ARGS) $(IMAGE) -f /bot.yaml start
 
-.PHONY: start
+.PHONY: sync-channels sync-roles
+sync-channels sync-roles:
+	docker run -it $(DOCKER_ARGS) $(IMAGE) -f /bot.yaml $@
+
+.PHONY: stop
 stop:
-	DOCKER_BUILDKIT=1 docker rm -f $(NAME)
+	docker rm -f $(NAME)
+
+.PHONY: logs
+logs:
+	docker logs -f $(NAME)
+

src/bot/commands/ask.rs

@@ -85,7 +85,9 @@ impl Bot {
             _ => return Err(AskCommandError::InvalidChannelTypeError),
         };
 
-        let title = self.get_option_as_str(interaction, "title").unwrap();
+        let title = self
+            .get_option_as_str(&interaction.data.options, "title")
+            .unwrap();
 
         // 可読性や識別性から、質問タイトルは32文字以内に制限している。
         if title.chars().count() > 32 {

src/bot/commands/join.rs

@@ -78,7 +78,7 @@ impl Bot {
         }
 
         let invitation_code = self
-            .get_option_as_str(interaction, "invitation_code")
+            .get_option_as_str(&interaction.data.options, "invitation_code")
             .unwrap();
 
         self.find_role_name_by_invitation_code(invitation_code)