From 6501e4dab3ddfd3dfd7f5d021c447e4596fa1c32 Mon Sep 17 00:00:00 2001
From: evann <evann.regnault@pm.me>
Date: Mon, 26 Jun 2023 23:25:52 +0200
Subject: [PATCH] Switched to Debian Image

---
 Dockerfile                | 17 +++++++++--------
 src/commands/character.rs |  2 +-
 src/data/allcharacters.rs |  2 +-
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d16183a..51042fc 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,21 +1,22 @@
-# https://www.lpalmieri.com/posts/fast-rust-docker-builds/
-FROM rust:alpine AS rust
-RUN apk add musl-dev openssl-dev
+FROM rust:slim-bullseye AS base
+RUN apt-get update
+RUN apt-get install libssl-dev pkg-config -y
 RUN cargo install cargo-chef
 WORKDIR app
 
-FROM rust AS planner
+FROM base AS planner
 COPY . .
 RUN cargo chef prepare --recipe-path recipe.json
 
-FROM rust AS builder
+FROM base AS builder
 COPY --from=planner /app/recipe.json recipe.json
 RUN cargo chef cook --release --recipe-path recipe.json
 COPY . .
 RUN cargo build --release --bin obsessed-yanqing
 
-
-FROM alpine:latest
-RUN apk add --no-cache libc6-compat
+FROM rust:slim-bullseye
+RUN apt-get update
+RUN apt-get install ca-certificates -y
+WORKDIR /root/
 COPY --from=builder /app/target/release/obsessed-yanqing .
 CMD ["./obsessed-yanqing"]
\ No newline at end of file
diff --git a/src/commands/character.rs b/src/commands/character.rs
index 8091df5..84795ef 100644
--- a/src/commands/character.rs
+++ b/src/commands/character.rs
@@ -239,7 +239,7 @@ pub async fn character(
     #[description = "Character to Search"] user: String,
 ) -> Result<(), Error> {
     match get_nearest_characters(user).await {
-        None => { ctx.say(format!("Error occured")).await? }
+        None => { ctx.say(format!("Error occured, please see logs")).await? }
         Some(characters) => {
             let handler = create_menu(ctx, characters).await;
             choice_interaction_handler(ctx, &handler).await;
diff --git a/src/data/allcharacters.rs b/src/data/allcharacters.rs
index 4b90844..fb46c1e 100644
--- a/src/data/allcharacters.rs
+++ b/src/data/allcharacters.rs
@@ -31,7 +31,7 @@ pub struct Characters {
 impl PrydwenCompatible for PrydwenAllCharacters{}
 
 pub async fn get_nearest_characters(name: String) -> Option<Vec<Characters>> {
-    let mut characters = get_all_characters().await?;
+    let mut characters = get_all_characters().await.expect("Cannot get characters");
     characters.nodes.sort_by(|a, b | {
         match a.name.to_lowercase().contains(name.to_lowercase().as_str()) {
             true => {