update packages

Author: zefanjajobse

.DS_Store

@@ -9,15 +9,15 @@ tokio = { version = "1.35", features = ["rt", "rt-multi-thread"] }
 anyhow = "1.0"
 serde_json = { version = "1.0" }
 serde = { version = "1.0", features = ["derive"] }
-rusttype = "0.9"
-imageproc = "0.23"
+ab_glyph = "0.2"
+imageproc = "0.25"
 chrono = "0.4"
 warp = "0.3"
-flexi_logger = "0.27"
+flexi_logger = "0.28"
 log = "0.4"
 
 [dependencies.image]
-version = "0.24"
+version = "0.25"
 default-features = false
 features = ["jpeg", "png"]
 
@@ -27,6 +27,6 @@ default-features = false
 features = ["client", "gateway", "rustls_backend", "model", "cache"]
 
 [dependencies.reqwest]
-version = "0.11"
+version = "0.12"
 default-features = false
 features = ["rustls-tls", "json"]

Cargo.lock

@@ -1,4 +1,4 @@
-FROM rust:1.75 AS builder
+FROM rust:1.79 as builder
 WORKDIR /usr/src/myapp
 COPY . .
 ARG github_token

Cargo.toml

@@ -5,6 +5,7 @@ This bot shows info about your battlefield servers and updates it every 2 minute
 ### Environment items:
 
 ```yaml
+token: discord bot token
 guid: serverid (optional)
 game: game name (tunguska, casablanca, kingston, bf4)
 ownerId: server owner playerid (optional for casablanca and kingston)

Dockerfile

@@ -31,7 +31,6 @@ impl EventHandler for Handler {
             since_empty: false,
             previous_request: Vec::new(),
             since_player_trigger: 5,
-            status: String::from(""),
         };
 
         let statics = message::Static {
@@ -87,7 +86,7 @@ impl EventHandler for Handler {
             warp::serve(hello).run(([0, 0, 0, 0], 3030)).await;
         });
 
-        // loop in seperate async
+        // loop in separate async
         tokio::spawn(async move {
             // set update_avatar to 1 minute ago to allow changing on startup
             let mut update_avatar = chrono::Utc::now()

Readme.md

@@ -12,7 +12,6 @@ pub struct Global {
     pub since_empty: bool,
     pub previous_request: Vec<i32>,
     pub since_player_trigger: i32,
-    pub status: String,
 }
 
 #[derive(Clone, Debug)]

src/main.rs

@@ -1,9 +1,9 @@
 use super::message;
+use ab_glyph::{FontRef, PxScale};
 use anyhow::Result;
 use image::{io::Reader as ImageReader, Rgba};
 use imageproc::drawing::draw_text_mut;
 use reqwest::Url;
-use rusttype::{Font, Scale};
 use serde::{Deserialize, Serialize};
 use serde_json::json;
 use serenity::{client::Context, gateway::ActivityData};
@@ -304,25 +304,22 @@ pub async fn gen_img(status: ServerInfo, statics: message::Static) -> Result<Str
         .decode()?
         .brighten(-25);
 
-    let font: Font = if &statics.game[..] == "kingston" || &statics.game[..] == "bf2042" {
-        let font_name = Vec::from(include_bytes!("BF_Modernista-Regular.ttf") as &[u8]);
-        Font::try_from_vec(font_name).unwrap()
+    let font: FontRef = if &statics.game[..] == "kingston" || &statics.game[..] == "bf2042" {
+        FontRef::try_from_slice(include_bytes!("BF_Modernista-Regular.ttf") as &[u8]).unwrap()
     } else {
-        let font_name = Vec::from(include_bytes!("Futura.ttf") as &[u8]);
-        Font::try_from_vec(font_name).unwrap()
+        FontRef::try_from_slice(include_bytes!("Futura.ttf") as &[u8]).unwrap()
     };
 
-    let small_font = Vec::from(include_bytes!("DejaVuSans.ttf") as &[u8]);
-    let small_font = Font::try_from_vec(small_font).unwrap();
+    let small_font = FontRef::try_from_slice(include_bytes!("DejaVuSans.ttf") as &[u8]).unwrap();
 
-    let img_size = Scale {
+    let img_size = PxScale {
         x: img2.width() as f32,
         y: img2.height() as f32,
     };
     let mut orig_img2 = img2.clone();
 
     // only smallmode
-    let scale = Scale {
+    let scale = PxScale {
         x: (img2.width() / 3) as f32,
         y: (img2.height() as f32 / 1.9),
     };
@@ -345,7 +342,7 @@ pub async fn gen_img(status: ServerInfo, statics: message::Static) -> Result<Str
     img2.save("./map_mode.jpg")?;
 
     // with favorites except bf5
-    let small_scale = Scale {
+    let small_scale = PxScale {
         x: (img2.width() / 9) as f32,
         y: (img2.height() / 6) as f32,
     };
@@ -363,7 +360,7 @@ pub async fn gen_img(status: ServerInfo, statics: message::Static) -> Result<Str
     img2.save("./info_image.jpg")?;
 
     // only favorites except bf5
-    let fav_scale = Scale {
+    let fav_scale = PxScale {
         x: (img2.width() / 7) as f32,
         y: (img2.height() as f32) / 4.5,
     };