Merge pull request #28 from Kiiyya/yeet-diesel

Yeet-diesel

Author: Kiiyya

.github/workflows/build-and-deploy.yml

@@ -45,10 +45,10 @@ jobs:
             OS: ubuntu-latest
           # - TARGET: x86_64-unknown-linux-musl # test in an alpine container on a mac
           #   OS: ubuntu-latest
-          # - TARGET: aarch64-unknown-linux-gnu # tested on aws t4g.nano
-          #   OS: ubuntu-latest
-          # - TARGET: aarch64-unknown-linux-musl # tested on aws t4g.nano in alpine container
-          #   OS: ubuntu-latest
+          - TARGET: aarch64-unknown-linux-gnu # tested on aws t4g.nano
+            OS: ubuntu-latest
+          - TARGET: aarch64-unknown-linux-musl # tested on aws t4g.nano in alpine container
+            OS: ubuntu-latest
           # - TARGET: armv7-unknown-linux-gnueabihf # raspberry pi 2-3-4, not tested
           #   OS: ubuntu-latest
           # - TARGET: armv7-unknown-linux-musleabihf # raspberry pi 2-3-4, not tested

Cargo.lock

@@ -39,7 +39,7 @@ pub fn parse_map_list(words: &[AsciiString]) -> RconResult<Vec<MapListEntry>> {
             words.len() - offset
         )));
     }
-    let mut ret = Vec::with_capacity(n_maps as usize);
+    let mut ret = Vec::with_capacity(n_maps);
 
     for _ in 0..n_maps {
         ret.push(MapListEntry {

battlefield_rcon/src/bf4/map_list.rs

@@ -5,7 +5,8 @@ use async_trait::async_trait;
 use battlefield_rcon::bf4::ban_list::{Ban, BanTimeout};
 use battlefield_rcon::bf4::{Bf4Client, Event, BanListError, PlayerKickError};
 use battlefield_rcon::rcon::RconResult;
-use battlefox_database::better::{BfoxDb, OffsetDateTime, BanStatus};
+use battlefox_database::{BfoxContext, DateTime};
+use battlefox_database::adkats::bans::BanStatus;
 use serde::{Deserialize, Serialize};
 
 use crate::Plugin;
@@ -18,11 +19,11 @@ pub struct Config {
 
 pub struct BanEnforcer {
     config: Config,
-    db: BfoxDb,
+    db: BfoxContext,
 }
 
 impl BanEnforcer {
-    pub fn new(config: Config, _players: Arc<Players>, db: BfoxDb) -> Self {
+    pub fn new(config: Config, _players: Arc<Players>, db: BfoxContext) -> Self {
         Self { config, db }
     }
 
@@ -33,7 +34,7 @@ impl BanEnforcer {
                 match self.db.get_ban(format!("{}", player.eaid)).await {
                     Ok(Some(ban)) => {
                         let banned = if ban.status == BanStatus::Active {
-                            let now = OffsetDateTime::now_utc();
+                            let now = DateTime::now_utc();
                             let is_banned_time = now < ban.end;
 
                             if !is_banned_time {

battlefox/src/ban_enforcer.rs

@@ -6,13 +6,12 @@
 #[macro_use] extern crate multimap;
 extern crate battlelog;
 
-use anyhow::Context;
 use ascii::{IntoAsciiString};
 use async_trait::async_trait;
 use battlefield_rcon::bf4::Event;
 use battlefield_rcon::bf4::error::Bf4Error;
 use battlefield_rcon::rcon::RconResult;
-use battlefox_database::better::BfoxDb;
+use battlefox_database::BfoxContext;
 use dotenv::dotenv;
 use futures::StreamExt;
 use itertools::Itertools;
@@ -85,12 +84,6 @@ fn get_rcon_coninfo() -> anyhow::Result<RconConnectionInfo> {
     })
 }
 
-fn get_db_coninfo() -> anyhow::Result<String> {
-    let uri = var("DATABASE_URL")
-        .context("Need to specify AdKats db URI via env var, for example DATABASE_URL=\"mysql://username:password@host/database\"")?;
-    Ok(uri)
-}
-
 #[derive(Error, Debug)]
 enum ConfigError {
     #[error("Failed to deserialize config.")]
@@ -190,12 +183,12 @@ impl App {
     }
 
     fn has_plugin<P: Plugin, C: DeserializeOwned>(&mut self, f: impl FnOnce(C) -> P) -> Result<Arc<P>, ConfigError> {
-        let config: C = load_config(&format!("configs/{}.yaml", P::NAME))?;
+        let config: C = load_config(format!("configs/{}.yaml", P::NAME))?;
         self.has_plugin_noconfig(f(config))
     }
 
     fn has_plugin_arc<P: Plugin, C: DeserializeOwned>(&mut self, f: impl FnOnce(C) -> Arc<P>) -> Result<Arc<P>, ConfigError> {
-        let config: C = load_config(&format!("configs/{}.yaml", P::NAME))?;
+        let config: C = load_config(format!("configs/{}.yaml", P::NAME))?;
         let p = f(config);
         let exists = self.plugins.insert(P::NAME.to_string(), p.clone());
         if exists.is_some() {
@@ -245,9 +238,9 @@ async fn main() -> anyhow::Result<()> {
     let _ = UPTIME.elapsed(); // get it, so that it initializes with `Instant::now()`.
 
     let rconinfo = get_rcon_coninfo()?;
-    let adkatsinfo = get_db_coninfo()?;
 
-    let db = BfoxDb::new(&adkatsinfo).await?;
+    // TODO: Disable DB potentially.
+    let db = BfoxContext::new_env();
 
     // Initialize plugins and their dependencies.
     let mut app = App::new();
@@ -257,7 +250,7 @@ async fn main() -> anyhow::Result<()> {
     let _weaponforcer = app.has_plugin(WeaponEnforcer::new)?;
     let _loadoutenforcer = app.has_plugin(LoadoutEnforcer::new)?;
     // let _playerreport = app.has_plugin(|c| PlayerReport::new(players.clone(), rabbitmq, c))?;
-    let _playermute = app.has_plugin(|c| PlayerMute::new(players.clone(), c))?;
+    let _playermute = app.has_plugin(|c| PlayerMute::new(db.clone(), players.clone(), c))?;
     let mapman = app.has_plugin(MapManager::new)?;
     let _mapvote = app.has_plugin_arc(|c: MapVoteConfigJson|
         Mapvote::new(mapman, vips, players.clone(), admins.clone(), MapVoteConfig::from_json(c))