Replace all tabs with 4 spaces

Author: Kiiyya

Cargo.toml

@@ -4,10 +4,10 @@ panic = 'abort'     # Abort on panic. Supposedly helps reduzing binary size.
 
 [workspace]
 members = [
-	"battlefield_rcon",
-	"battlefox",
-	"battlefox_discord",
-	"battlelog",
-	"battlefox_shared",
-	"battlefox_database",
+    "battlefield_rcon",
+    "battlefox",
+    "battlefox_discord",
+    "battlelog",
+    "battlefox_shared",
+    "battlefox_database",
 ]

battlefox/src/ban_enforcer.rs

@@ -13,77 +13,77 @@ use crate::players::Players;
 
 #[derive(Debug, Clone, Deserialize, Serialize, Default)]
 pub struct Config {
-	enabled: bool,
+    enabled: bool,
 }
 
 pub struct BanEnforcer {
-	config: Config,
-	db: BfoxDb,
+    config: Config,
+    db: BfoxDb,
 }
 
 impl BanEnforcer {
-	pub fn new(config: Config, _players: Arc<Players>, db: BfoxDb) -> Self {
-		Self { config, db }
-	}
+    pub fn new(config: Config, _players: Arc<Players>, db: BfoxDb) -> Self {
+        Self { config, db }
+    }
 
-	async fn event(self: Arc<Self>, bf4: Arc<Bf4Client>, event: Event) -> RconResult<()> {
-		#[allow(clippy::single_match)]
-		match event {
-			Event::Authenticated { player } => {
-				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 is_banned_time = now < ban.end;
+    async fn event(self: Arc<Self>, bf4: Arc<Bf4Client>, event: Event) -> RconResult<()> {
+        #[allow(clippy::single_match)]
+        match event {
+            Event::Authenticated { player } => {
+                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 is_banned_time = now < ban.end;
 
-							if !is_banned_time {
-								warn!("Ban for player {player} is \"Active\" but endTime is in the past. All times (assumed) in UTC. Now = {}, ban_end = {}", &now, &ban.end);
-							}
-							is_banned_time
-						} else {
-							false
-						};
+                            if !is_banned_time {
+                                warn!("Ban for player {player} is \"Active\" but endTime is in the past. All times (assumed) in UTC. Now = {}, ban_end = {}", &now, &ban.end);
+                            }
+                            is_banned_time
+                        } else {
+                            false
+                        };
 
-						if banned {
-							info!("Player {player} is banned, and will be kicked via tempban for one second: {ban:#?}");
+                        if banned {
+                            info!("Player {player} is banned, and will be kicked via tempban for one second: {ban:#?}");
 
-							match bf4.ban_add(
-								Ban::Guid(player.eaid),
-								BanTimeout::Time(Duration::from_secs(1)), // I guess rcon will remove this by itself?
-								Some(ban.reason.clone()) // reason
-							).await {
-								Ok(()) => (),
-								Err(BanListError::BanListFull) => warn!("Ban list is full?!"),
-								Err(BanListError::NotFound) => unreachable!(),
-								Err(BanListError::Rcon(rcon_err)) => error!("Failed to tempban player for a second: {rcon_err:?}"),
-							}
+                            match bf4.ban_add(
+                                Ban::Guid(player.eaid),
+                                BanTimeout::Time(Duration::from_secs(1)), // I guess rcon will remove this by itself?
+                                Some(ban.reason.clone()) // reason
+                            ).await {
+                                Ok(()) => (),
+                                Err(BanListError::BanListFull) => warn!("Ban list is full?!"),
+                                Err(BanListError::NotFound) => unreachable!(),
+                                Err(BanListError::Rcon(rcon_err)) => error!("Failed to tempban player for a second: {rcon_err:?}"),
+                            }
 
-							match bf4.kick(player.name, ban.reason).await {
-								Ok(()) => (),
-								Err(PlayerKickError::PlayerNotFound) => (),
-								Err(PlayerKickError::Rcon(rcon_err)) => error!("Failed to kick player: {rcon_err:?}"),
-							}
-						} else {
-							debug!("Player {player} is in adkats_bans, but the ban has expired.");
-						}
-					},
-					Ok(None) => (), // player is not banned
-					Err(e) => error!("While checking player {player} for ban, got db error, but will ignore it and continue: {e}"),
-				}
-			},
-			_ => (),
-		}
+                            match bf4.kick(player.name, ban.reason).await {
+                                Ok(()) => (),
+                                Err(PlayerKickError::PlayerNotFound) => (),
+                                Err(PlayerKickError::Rcon(rcon_err)) => error!("Failed to kick player: {rcon_err:?}"),
+                            }
+                        } else {
+                            debug!("Player {player} is in adkats_bans, but the ban has expired.");
+                        }
+                    },
+                    Ok(None) => (), // player is not banned
+                    Err(e) => error!("While checking player {player} for ban, got db error, but will ignore it and continue: {e}"),
+                }
+            },
+            _ => (),
+        }
 
-		Ok(())
-	}
+        Ok(())
+    }
 }
 
 #[async_trait]
 impl Plugin for BanEnforcer {
     const NAME: &'static str = "ban_enforcer";
-	fn enabled(&self) -> bool { self.config.enabled }
+    fn enabled(&self) -> bool { self.config.enabled }
 
     async fn event(self: Arc<Self>, bf4: Arc<Bf4Client>, event: Event) -> RconResult<()> {
-		self.event(bf4, event).await
-	}
+        self.event(bf4, event).await
+    }
 }

battlefox/src/commands.rs

@@ -14,23 +14,23 @@ use combine::{Parser, EasyParser, many1, sep_by, token};
 use combine::parser::char::{letter, space};
 
 pub trait Command {
-	type Parameter;
+    type Parameter;
 
-	fn target(arg: Self::Parameter);
+    fn target(arg: Self::Parameter);
 }
 
 pub trait ParserCommand : Command {
-	fn parser<Input: Stream>() -> Box<dyn Parser<Input, Output = Self::Parameter, PartialState = ()>>;
+    fn parser<Input: Stream>() -> Box<dyn Parser<Input, Output = Self::Parameter, PartialState = ()>>;
 }
 
 pub struct CmdLifetime {
-	handle: usize,
-	commands: Arc<Commands>,
+    handle: usize,
+    commands: Arc<Commands>,
 }
 
 impl Drop for CmdLifetime {
     fn drop(&mut self) {
-		self.commands.cancel(self.handle);
+        self.commands.cancel(self.handle);
     }
 }
 
@@ -39,58 +39,58 @@ struct Inner {
 }
 
 impl Inner {
-	fn rebuild() {
-		debug!("Rebuilding commands parser")
-	}
+    fn rebuild() {
+        debug!("Rebuilding commands parser")
+    }
 }
 
 pub enum Matcher {
-	/// For example `ban` will match `!ban PocketWolfy`, `/ban` etc.
-	Exact(String),
-
-	/// For example `pearl`
-	ExactOrPrefix {
-		prefix: String,
-		minlen: usize,
-	}
+    /// For example `ban` will match `!ban PocketWolfy`, `/ban` etc.
+    Exact(String),
+
+    /// For example `pearl`
+    ExactOrPrefix {
+        prefix: String,
+        minlen: usize,
+    }
 }
 
 pub struct Commands {
-	inner: Mutex<Inner>,
+    inner: Mutex<Inner>,
 }
 
 impl Commands {
-	pub fn new() -> Self {
-		Self {
-			inner: Mutex::new(Inner {
-			}),
-		}
-	}
-
-	pub async fn run(&self, bf4: Arc<Bf4Client>) -> RconResult<()> {
+    pub fn new() -> Self {
+        Self {
+            inner: Mutex::new(Inner {
+            }),
+        }
+    }
+
+    pub async fn run(&self, bf4: Arc<Bf4Client>) -> RconResult<()> {
         let mut events = bf4.event_stream().await?;
         while let Some(event) = events.next().await {
             match event {
                 Ok(Chat { vis, player, msg }) => {
 
-				},
-				_ => (),
+                },
+                _ => (),
             }
-		}
+        }
 
-		Ok(())
-	}
+        Ok(())
+    }
 
-	pub fn add_stage() {
+    pub fn add_stage() {
 
-	}
+    }
 
-	pub fn add_command() {
+    pub fn add_command() {
 
-	}
+    }
 
-	fn cancel(&self, handle: usize) {
+    fn cancel(&self, handle: usize) {
 
-	}
+    }
 }