refactor: update commit tracking and notification system

- Removed unused dependencies from Cargo.lock and updated Cargo.toml to reflect changes.
- Modified commit fetching to return a structured result with total commits and position.
- Enhanced Discord notification to include formatted commit information and total commits.
- Updated models to support new commit response structure and improved author handling.

Author: kWAYTV

Cargo.lock

@@ -7,9 +7,7 @@ edition = "2024"
 chrono = { version = "0.4.41", features = ["serde"] }
 env_logger = "0.11.8"
 log = "0.4.27"
-regex = "1.11.1"
 reqwest = { version = "0.12.16", features = ["json"] }
-scraper = "0.23.1"
 serde = { version = "1.0.219", features = ["derive"] }
 serde_json = "1.0.140"
 tokio = { version = "1.45.1", features = ["full"] }

Cargo.toml

@@ -93,7 +93,7 @@ impl Default for Config {
                 bot_avatar_url: "https://i.imgur.com/on47Qk9.png".to_string(),
             },
             monitoring: MonitoringConfig {
-                commits_url: "https://commits.facepunch.com/r/rust_reboot".to_string(),
+                commits_url: "https://commits.facepunch.com/?format=json".to_string(),
                 check_interval_secs: 50,
             },
             appearance: AppearanceConfig {

src/core/config.rs

@@ -39,14 +39,15 @@ impl CommitTracker {
     }
 
     async fn check_for_new_commits(&mut self) -> Result<(), Box<dyn Error>> {
-        let commit = self.scraper.fetch_latest_commit(&self.config.monitoring.commits_url).await?;
+        let result = self.scraper.fetch_latest_commit(&self.config.monitoring.commits_url).await?;
+        let commit = &result.commit;
 
         if commit.id > self.last_commit_id {
             self.last_commit_id = commit.id;
 
-            info!("🆕 New commit #{} by {} - {}", commit.id, commit.author, commit.message);
+            info!("🆕 New commit #{} by {} - {}", commit.id, commit.author(), commit.message);
 
-            self.notifier.send_commit_notification(&commit).await?;
+            self.notifier.send_commit_notification(&result).await?;
 
             info!("✅ Sent to Discord");
         }

src/core/tracker.rs

@@ -1,11 +1,42 @@
-#[derive(Debug, Clone)]
+use serde::Deserialize;
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct CommitsResponse {
+    pub total: u32,
+    pub skip: u32,
+    pub take: u32,
+    pub results: Vec<CommitInfo>,
+}
+
+#[derive(Debug, Clone, Deserialize)]
 pub struct CommitInfo {
     pub id: i32,
-    pub author: String,
     pub repo: String,
     pub branch: String,
     pub changeset: String,
+    pub created: String,
+    pub likes: u32,
+    pub dislikes: u32,
     pub message: String,
-    pub avatar_url: String,
-    pub link: String,
+    pub user: CommitUser,
+}
+
+#[derive(Debug, Clone, Deserialize)]
+pub struct CommitUser {
+    pub name: String,
+    pub avatar: String,
+}
+
+impl CommitInfo {
+    pub fn link(&self) -> String {
+        format!("https://commits.facepunch.com/{}", self.id)
+    }
+    
+    pub fn avatar_url(&self) -> &str {
+        &self.user.avatar
+    }
+    
+    pub fn author(&self) -> &str {
+        &self.user.name
+    }
 } 

src/models/commit.rs

@@ -1,5 +1,6 @@
 use crate::core::Config;
-use crate::models::{CommitInfo, DiscordEmbed, EmbedData, EmbedAuthor, EmbedField, EmbedFooter};
+use crate::models::{DiscordEmbed, EmbedData, EmbedAuthor, EmbedField, EmbedFooter};
+use crate::services::scraper::CommitResult;
 use chrono;
 use std::error::Error;
 
@@ -16,8 +17,8 @@ impl DiscordNotifier {
         }
     }
 
-    pub async fn send_commit_notification(&self, commit: &CommitInfo) -> Result<(), Box<dyn Error>> {
-        let embed = self.build_embed(commit);
+    pub async fn send_commit_notification(&self, result: &CommitResult) -> Result<(), Box<dyn Error>> {
+        let embed = self.build_embed(result);
 
         let response = self.client
             .post(&self.config.discord.webhook_url)
@@ -33,16 +34,18 @@ impl DiscordNotifier {
         Ok(())
     }
 
-    fn build_embed(&self, commit: &CommitInfo) -> DiscordEmbed {
+    fn build_embed(&self, result: &CommitResult) -> DiscordEmbed {
+        let commit = &result.commit;
+        
         DiscordEmbed {
             embeds: vec![EmbedData {
                 title: "🔧 New Rust Commit".to_string(),
                 description: format!("```\n{}\n```", commit.message),
                 color: self.config.rust_color(),
                 author: EmbedAuthor {
-                    name: commit.author.clone(),
+                    name: commit.author().to_string(),
                     url: self.config.monitoring.commits_url.clone(),
-                    icon_url: commit.avatar_url.clone(),
+                    icon_url: commit.avatar_url().to_string(),
                 },
                 fields: vec![
                     EmbedField {
@@ -57,16 +60,36 @@ impl DiscordNotifier {
                     },
                     EmbedField {
                         name: "🔗 Changeset".to_string(),
-                        value: format!("[`{}`]({})", commit.changeset, commit.link),
+                        value: format!("[`{}`]({})", commit.changeset, commit.link()),
                         inline: true,
                     },
                 ],
                 footer: EmbedFooter {
-                    text: self.config.discord.bot_name.clone(),
+                    text: format!("{} • Commit {} of {}", 
+                        self.config.discord.bot_name,
+                        self.format_number(result.total_commits - result.position + 1),
+                        self.format_number(result.total_commits)
+                    ),
                     icon_url: self.config.discord.bot_avatar_url.clone(),
                 },
                 timestamp: chrono::Utc::now().to_rfc3339(),
             }],
         }
     }
+
+    fn format_number(&self, num: u32) -> String {
+        // Add commas to large numbers for readability
+        let num_str = num.to_string();
+        let chars: Vec<char> = num_str.chars().collect();
+        let mut result = String::new();
+        
+        for (i, &ch) in chars.iter().enumerate() {
+            if i > 0 && (chars.len() - i) % 3 == 0 {
+                result.push(',');
+            }
+            result.push(ch);
+        }
+        
+        result
+    }
 } 

src/services/discord.rs

@@ -1,5 +1,5 @@
 pub mod scraper;
 pub mod discord;
 
-pub use scraper::*;
+pub use scraper::{CommitScraper, CommitResult};
 pub use discord::*; 

src/services/mod.rs

@@ -1,124 +1,38 @@
-use crate::models::CommitInfo;
-use regex::Regex;
-use scraper::{Html, Selector};
+use crate::models::{CommitInfo, CommitsResponse};
 use std::error::Error;
 
 pub struct CommitScraper {
     client: reqwest::Client,
 }
 
+#[derive(Debug)]
+pub struct CommitResult {
+    pub commit: CommitInfo,
+    pub total_commits: u32,
+    pub position: u32, // Position in the list (1 = latest)
+}
+
 impl CommitScraper {
     pub fn new() -> Self {
         Self {
             client: reqwest::Client::new(),
         }
     }
 
-    pub async fn fetch_latest_commit(&self, url: &str) -> Result<CommitInfo, Box<dyn Error>> {
+    pub async fn fetch_latest_commit(&self, url: &str) -> Result<CommitResult, Box<dyn Error>> {
         let response = self.client.get(url).send().await?;
-        let html_content = response.text().await?;
-        let document = Html::parse_document(&html_content);
-
-        self.parse_commit_from_html(&document)
-    }
-
-    fn parse_commit_from_html(&self, document: &Html) -> Result<CommitInfo, Box<dyn Error>> {
-        let commit_selector = Selector::parse("div.commit.columns")?;
-        let commit = document
-            .select(&commit_selector)
-            .next()
-            .ok_or("No commit found")?;
-
-        // Extract commit ID
-        let like_id = commit
-            .value()
-            .attr("like-id")
-            .ok_or("No like-id attribute found")?;
-        let id: i32 = like_id.parse()?;
-
-        // Extract author
-        let author_selector = Selector::parse("div.author")?;
-        let author = commit
-            .select(&author_selector)
-            .next()
-            .ok_or("No author found")?
-            .text()
-            .collect::<String>()
-            .trim()
-            .to_string();
+        let commits_response: CommitsResponse = response.json().await?;
 
-        // Extract repo
-        let repo_selector = Selector::parse("span.repo")?;
-        let repo = commit
-            .select(&repo_selector)
+        let commit = commits_response
+            .results
+            .into_iter()
             .next()
-            .ok_or("No repo found")?
-            .text()
-            .collect::<String>()
-            .trim()
-            .to_string();
-
-        // Extract branch
-        let branch_selector = Selector::parse("span.branch")?;
-        let branch = commit
-            .select(&branch_selector)
-            .next()
-            .ok_or("No branch found")?
-            .text()
-            .collect::<String>()
-            .trim()
-            .to_string();
-
-        // Extract changeset
-        let changeset_selector = Selector::parse("span.changeset")?;
-        let changeset = commit
-            .select(&changeset_selector)
-            .next()
-            .ok_or("No changeset found")?
-            .text()
-            .collect::<String>()
-            .trim()
-            .to_string();
-
-        // Extract commit message
-        let message_selector = Selector::parse("div.commits-message")?;
-        let message = commit
-            .select(&message_selector)
-            .next()
-            .ok_or("No commit message found")?
-            .text()
-            .collect::<String>()
-            .trim()
-            .to_string();
-
-        // Extract avatar URL
-        let avatar_selector = Selector::parse("div.avatar")?;
-        let avatar_element = commit
-            .select(&avatar_selector)
-            .next()
-            .ok_or("No avatar found")?;
-        
-        let avatar_html = avatar_element.html();
-        let url_regex = Regex::new(r"(https?://[^\s]+)")?;
-        let avatar_url = url_regex
-            .find(&avatar_html)
-            .ok_or("No URL found in avatar")?
-            .as_str()
-            .trim_end_matches("');")
-            .to_string();
-
-        // Build commit link
-        let link = format!("https://commits.facepunch.com/{}", id);
+            .ok_or("No commits found in response")?;
 
-        Ok(CommitInfo {
-            id,
-            author,
-            repo,
-            branch,
-            changeset,
-            message,
-            avatar_url,
-            link,
+        Ok(CommitResult {
+            commit,
+            total_commits: commits_response.total,
+            position: 1, // Latest commit is always position 1
         })
     }
 }