Compare commits

..

No commits in common. "7467b1f588643962ee45dc91b8ebcf4df9c309af" and "1eef50c9991055612637064c16766584058aed53" have entirely different histories.

2 changed files with 18 additions and 21 deletions

View File

@ -26,10 +26,3 @@ diesel = { version = "2.0.4", features = ["sqlite", "returning_clauses_for_sqlit
diesel_migrations = { version = "2.0.0", features = [ "sqlite" ] }
# Force sqlite3 to be bundled, allowing for a fully static binary
libsqlite3-sys = { version = "*", features = ["bundled"] }
# https://stackoverflow.com/a/54842093
[profile.release]
lto = true # Enable link-time optimization
codegen-units = 1 # Reduce number of codegen units to increase optimizations
panic = 'abort' # Abort on panic
strip = true # Strip symbols from binary*

View File

@ -48,22 +48,25 @@ fn resource_to_embed_field(resource: Resource) -> EmbedField {
#[poise::command(prefix_command, slash_command)]
pub async fn available(ctx: Context<'_>, date: HumanNaiveDate) -> Result<(), Error> {
let client = &ctx.data().client;
let date: NaiveDate = date.into();
let mut resources = client.available(STERRE_BIB_ID, date, 1).await?;
let mut resources = client
.available(STERRE_BIB_ID, date.clone().into(), 1)
.await?;
// Cloning here isn't super efficient, but this list only consists of a handful of elements so
// it's fine
resources.sort_by_key(|k| k.resource_name.clone());
ctx.send(|f| {
f.embed(|e| {
e.description(format!("Available booking dates for {}.", date))
.fields(
resources
.into_iter()
.map(resource_to_embed_field)
.collect::<Vec<EmbedField>>(),
)
e.description(format!(
"Available booking dates for {}.",
Into::<NaiveDate>::into(date)
))
.fields(
resources
.into_iter()
.map(resource_to_embed_field)
.collect::<Vec<EmbedField>>(),
)
})
})
.await?;
@ -88,7 +91,6 @@ pub async fn book(
let guild_id = ctx.guild_id().unwrap();
let discord_id = ctx.author().id.0 as i64;
let date: NaiveDate = date.into();
let user = {
let mut conn = ctx.data().pool.get()?;
@ -105,7 +107,9 @@ pub async fn book(
let user = user.unwrap();
let client = &ctx.data().client;
let resources = client.available(STERRE_BIB_ID, date, 1).await?;
let resources = client
.available(STERRE_BIB_ID, date.clone().into(), 1)
.await?;
let chosen_resource = resources
.iter()
.filter(|r| capacity.is_none() || capacity.unwrap() <= r.capacity)
@ -115,7 +119,7 @@ pub async fn book(
let reservation = Reservation {
auth_type: None,
email: user.email.clone(),
date,
date: date.clone().into(),
start_time,
end_time,
note: "coworking space".to_string(),
@ -132,7 +136,7 @@ pub async fn book(
ctx.send(|f| {
f.embed(|e| {
e.description("A new reservation has been made.")
.field("when", format!("{} {} - {}", date, start_time.format(TIME_FORMAT), end_time.format(TIME_FORMAT)), false)
.field("when", format!("{} {} - {}", Into::<NaiveDate>::into(date), start_time.format(TIME_FORMAT), end_time.format(TIME_FORMAT)), false)
.field("where", &chosen_resource.resource_name, false)
.footer(|ft| ft.text(
format!("A confirmation mail has been sent to {}. Please check your email and confirm your reservation within two hours.", user.email)))