support other platforms and add serverid stuff for bf2042

Author: zefanjajobse

Dockerfile

@@ -16,6 +16,7 @@ ENV guild default_guild_value
 ENV lang 'en-us'
 ENV guid 'none'
 ENV ownerId 'none'
+ENV platform 'pc'
 
 HEALTHCHECK --interval=5m --timeout=3s --start-period=5s \
   CMD curl -f http://127.0.0.1:3030/ || exit 1

Readme.md

@@ -10,7 +10,8 @@ game: game name (tunguska, casablanca, kingston, bf4)
 ownerId: server owner playerid (optional for casablanca and kingston)
 fakeplayers: removes bots on bf4's playercount if set to yes (optional, default no)
 name: servername
-lang: language (en-us)
+lang: language (default en-us)
+platform: from which platform is the server (default pc)
 
 for status in discord:
 minplayeramount: amount of change needed to count
@@ -30,6 +31,7 @@ export prevrequestcount=5
 export channel=0
 export startedamount=50
 export game=tunguska
+export platform=pc
 cargo run
 ```
 

src/main.rs

@@ -36,6 +36,7 @@ impl EventHandler for Handler {
             server_id: env::var("guid").unwrap_or_else(|_| "none".to_string()),
             game: env::var("game").unwrap_or_else(|_| "tunguska".to_string()),
             owner_id: env::var("ownerId").unwrap_or_else(|_| "none".to_string()),
+            platform: env::var("platform").unwrap_or_else(|_| "pc".to_string()),
             fake_players: env::var("fakeplayers").unwrap_or_else(|_| "no".to_string()),
             server_name: env::var("name")
                 .expect("name wasn't given an argument!")

src/message.rs

@@ -1,5 +1,3 @@
-use std::collections::HashMap;
-
 use serenity::{client::Context, model::id::ChannelId};
 use anyhow::Result;
 use super::server_info;
@@ -17,6 +15,7 @@ pub struct Global {
 pub struct Static {
     pub server_id: String,
     pub game: String,
+    pub platform: String,
     pub owner_id: String,
     pub fake_players: String,
     pub server_name: String,
@@ -91,14 +90,27 @@ pub async fn check(ctx: Context, status: server_info::ServerInfo, mut globals: G
 pub async fn send(ctx: Context, statics: Static, image_url: &str, status: server_info::ServerInfo, title: &str,
         description: &str) -> Result<serenity::model::channel::Message, serenity::Error> {
     let paths = vec![image_url];
-    let games = HashMap::from([
+    let games = std::collections::HashMap::from([
         ("tunguska", "bf1"),
         ("casablanca", "bfv"),
         ("kingston", "bf2042"),
     ]);
+    let mut gather_type = "gameid";
+    if statics.game == "kingston" {
+        gather_type = "serverid";
+    } else if status.game_id.clone().unwrap_or_default().contains(":") {
+        gather_type = "serverip";
+    }
+    let server_link = format!(
+        "https://gametools.network/servers/{}/{}/{}/{}",
+        games.get(&statics.game[..]).unwrap_or(&&statics.game[..]),
+        gather_type,
+        status.game_id.clone().unwrap_or_default(),
+        statics.platform
+    );
     ChannelId(statics.message_channel).send_files(&ctx.http, paths, |m| {    
         m.embed(|e| {
-            e.url(format!("https://gametools.network/servers/{}/gameid/{}/pc", games.get(&statics.game[..]).unwrap_or(&&statics.game[..]), status.game_id.unwrap_or_default()));
+            e.url(server_link);
             e.title(title);
             e.description(description);
             e.footer(|f| {

src/server_info.rs

@@ -38,6 +38,8 @@ pub struct MainInfo {
     pub owner_id: Option<String>,
     #[serde(rename = "serverId")]
     pub server_id: Option<String>,
+    pub ip: Option<String>,
+    pub port: Option<String>,
 }
 #[derive(Serialize, Deserialize, Debug, Clone)]
 pub struct DetailedInfo {
@@ -180,9 +182,21 @@ async fn get(statics: message::Static, game_id: &String) -> Result<ServerInfo> {
     // update game_id if it can be gathered
     let mut game_id = game_id.to_string();
     if !info.is_null() {
-        game_id = serde_json::from_value::<MainInfo>(info.clone())?
-            .game_id
-            .unwrap_or_default();
+        let server_info = serde_json::from_value::<MainInfo>(info.clone())?;
+        if game == "bf2042" {
+            game_id = server_info.server_id.unwrap_or_default();
+        } else if server_info.game_id.is_none()
+            && server_info.ip.is_some()
+            && server_info.port.is_some()
+        {
+            game_id = format!(
+                "{}:{}",
+                server_info.ip.unwrap_or_default(),
+                server_info.port.unwrap_or_default()
+            );
+        } else {
+            game_id = server_info.game_id.unwrap_or_default();
+        }
     }
 
     // get detailed via old or new game_id