Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,4 @@
Cargo.lock
.env
*.log
*.code-workspace
23 changes: 14 additions & 9 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -2,25 +2,30 @@
name = "botanist"
version = "0.1.0"
authors = ["s0lst1ce <thithib.cohergne@gmail.com>"]
edition = "2018"
edition = "2021"

# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
dotenv = "0.15"
tracing = "0.1.23"
tracing-subscriber = "0.2"
tracing-subscriber = {version="0.3", features=["env-filter"]}
chrono = "0.4"
async-trait = "0.1"
db-adapter = {path="../db-adapter"}
poise = { git = "https://github.com/kangalioo/poise", branch = "develop", features = ["collector"] }

[dependencies.sqlx]
version = "0.5"
features = ["macros", "runtime-tokio-rustls", "mysql"]
[dependencies.tokio]
version = "1"
features = ["macros", "rt-multi-thread", "signal"]

[dependencies.serenity]
version = "0.10"
features = ["framework", "standard_framework", "rustls_backend", "cache"]
default-features = false
features = ["model", "rustls_backend", "cache", "collector", "client"]

[dependencies.tokio]
version = "1.0"
features = ["macros", "rt-multi-thread", "signal"]
#[patch.crates-io]
#serenity = { git = "https://github.com/kangalioo/serenity", branch = "poise-tailored" }

[patch.crates-io]
serenity = {git="https://github.com/serenity-rs/serenity", branch="next"}
7 changes: 4 additions & 3 deletions src/commands/dev.rs
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
use crate::utils::*;
use crate::ShardManagerContainer;
use serenity::model::prelude::*;
use serenity::prelude::*;
use serenity::{
client::bridge::gateway::ShardId,
framework::standard::{
macros::{command, group},
CommandError, CommandResult,
},
model::prelude::*,
prelude::*,
};
use std::env;
use tracing::error;

#[group]
#[commands(shutdown, latency, log)]
struct Development;
Expand Down Expand Up @@ -103,7 +104,7 @@ async fn log(ctx: &Context, msg: &Message) -> CommandResult {
Ok(path) => path,
Err(err) => {
error!("{:#}", err);
let error = BotError::new(
let error = BotErrorReport::new(
"LOG_FILE is missing",
Some(BotErrorKind::EnvironmentError),
Some(msg),
Expand Down
Loading