Fix user agent parsing

Author: moehreag

src/endpoints/global_data.rs

@@ -172,8 +172,6 @@ pub async fn metrics(
 		writeln!(response, "online_players {online_players}");
 		let data_container = global_data.read().await;
 		let request_agents = data_container.data.request_user_agents.clone();
-		let request_agents_count = request_agents.len();
-		writeln!(response, "request_agents_count {request_agents_count}");
 		for (agent, count) in request_agents {
 			if let Some((mod_ver, minecraft_ver, note)) = parse_user_agent(agent) {
 				writeln!(response, "request_count{{mod_version=\"{mod_ver}\", minecraft_version=\"{minecraft_ver}\", mod=\"{note}\"}} {count}");
@@ -204,17 +202,18 @@ static MCVER_REGEX: LazyLock<Regex> = LazyLock::new(|| {
 	.unwrap()
 });
 static OLD_1_UA: LazyLock<Regex> =
-	LazyLock::new(|| Regex::new(r".*\((?:(AxolotlClient)/)(.+)(?:\+mc)?(.+)\) .*").unwrap());
-static OLD_2_UA: LazyLock<Regex> =
-	LazyLock::new(|| Regex::new(r".*\((?:(AxolotlClient)/)(.+) \(Minecraft .+\).*").unwrap());
+	LazyLock::new(|| Regex::new(r".*(?:(AxolotlClient)/.* )\((.+)(?:\+mc)(.+)\).*").unwrap());
+static OLD_2_UA: LazyLock<Regex> = LazyLock::new(|| Regex::new(r".*(?:(AxolotlClient)/.* )\((.+)\+(.+)\).*").unwrap());
+static OLD_3_UA: LazyLock<Regex> =
+	LazyLock::new(|| Regex::new(r".*\((?:(AxolotlClient)/)(.+) \(Minecraft (.+)\)\).*").unwrap());
 static CURRENT_UA: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(AxolotlClient)/(.+) Minecraft/(.+)").unwrap());
 static SNAPPER_UA: LazyLock<Regex> = LazyLock::new(|| Regex::new(r"(Snapper)/(.+)\+(.+)").unwrap());
 
 fn parse_user_agent(agent: String) -> Option<(String, String, String)> {
 	if agent.starts_with("Java-http-client") {
 		return None;
 	}
-	for regex in [&OLD_1_UA, &OLD_2_UA, &CURRENT_UA, &SNAPPER_UA] {
+	for regex in [&OLD_1_UA, &OLD_2_UA, &OLD_3_UA, &CURRENT_UA, &SNAPPER_UA] {
 		if regex.is_match(&agent) {
 			let captures = regex.captures(&agent).unwrap();
 			let mod_name_capture = captures.get(1);