update OK Bot

Author: mattbruv

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "OK"
-version = "0.1.2"
+version = "0.1.3"
 edition = "2024"
 
 [dependencies]

src/main.rs

@@ -11,7 +11,7 @@ use std::{
 use args::{OKAction, OKArgs};
 use commit::Commit;
 use diff::find_differences;
-use objdiff_core::bindings::report::{Report, ReportItem};
+use objdiff_core::bindings::report::Report;
 use pr::PullRequestReport;
 
 fn main() {
@@ -20,7 +20,17 @@ fn main() {
     let previous = load_report(&args.previous);
     let current = load_report(&args.current);
 
-    let diffs = find_differences(previous.units, current.units);
+    let mut diffs = find_differences(previous.units, current.units);
+
+    diffs.sections = diffs
+        .sections
+        .iter()
+        // ghetto hack to remove this one text section which is showing up in all PRS:
+        // might be related to this:
+        // https://github.com/encounter/objdiff/issues/120#issuecomment-2770545367
+        .filter(|x| !(x.unit_name == "main/SB/Game/zNPCTypeCommon" && x.name == ".text"))
+        .map(|x| x.clone())
+        .collect();
 
     let diff_json = serde_json::to_string_pretty(&diffs).expect("Failed to serialize diffs");
     let mut file = File::create("diff.json").unwrap();

src/pr.rs

@@ -18,9 +18,10 @@ use crate::diff::{DifferenceReport, ReportItemDifference};
 pub struct DiffSummary {
     pub unit_name: String,
     pub name: String,
+    pub fuzzy_percent: f32,
     pub percent_difference: f32,
     pub size: u64,
-    pub size_difference: u64,
+    pub size_difference: i64,
 }
 
 // test
@@ -34,31 +35,33 @@ impl DiffSummary {
                 None => diff.name.clone(),
             },
             size: diff.size,
+            fuzzy_percent: diff.new_fuzzy_match_percent,
             percent_difference: percent_diff,
-            size_difference: (((diff.size as f32) * (percent_diff / 100.0)) as u64),
+            size_difference: (((diff.size as f32) * (percent_diff / 100.0)) as i64),
         }
     }
 
     pub fn to_string(&self) -> String {
         let direction = if self.percent_difference > 0.0 {
             "+"
         } else {
-            "-"
+            "" // Don't need to add the minus sign, Rust will do it on its own
         };
+
         //println!("{:?}", self);
-        let percent = format!("{:.2}%", self.percent_difference);
+        let percent = format!("{:.2}%", self.fuzzy_percent);
 
-        let emoji = match self.percent_difference {
+        let emoji = match self.fuzzy_percent {
             100.00 => "✅",
             _ => match self.percent_difference > 0.0 {
                 true => "📈",
-                false => "📉",
+                false => "⚠️",
             },
         };
 
         format!(
-            "{emoji} `{}` - `{}`: {direction}{} ({direction}{})",
-            self.unit_name, self.name, percent, self.size_difference
+            "{emoji} `{} - {}` {direction}{} bytes -> {percent}",
+            self.unit_name, self.name, self.size_difference
         )
     }
 }
@@ -90,17 +93,22 @@ impl PullRequestReport {
             .iter()
             .filter(|i| i.new_fuzzy_match_percent < i.old_fuzzy_match_percent)
             .map(|i| Regression(DiffSummary::new(i)))
+            .filter(|x| x.0.size_difference != 0)
             .collect()
     }
 
     pub fn get_progressions(&self) -> Vec<Progression> {
         let mut items: Vec<ReportItemDifference> = self.diffs.sections.clone();
-        items.extend(self.diffs.functions.clone());
+        items.sort_by_key(|x| x.size as i32 * -1);
+        let mut fns = self.diffs.functions.clone();
+        fns.sort_by_key(|x| x.size as i32 * -1);
+        items.extend(fns);
 
         items
             .iter()
             .filter(|i| i.new_fuzzy_match_percent > i.old_fuzzy_match_percent)
             .map(|i| Progression(DiffSummary::new(i)))
+            .filter(|x| x.0.size_difference != 0)
             .collect()
     }
 
@@ -122,6 +130,7 @@ impl PullRequestReport {
             false => "No Regressions 🎉".to_owned(),
             true => format!("Regressions: {regression_count}"),
         };
+
         let regressions_string = match regressions_exist {
             false => "".to_owned(),
             true => {
@@ -144,9 +153,29 @@ impl PullRequestReport {
             }
         };
 
+        let size_diff = progressions
+            .iter()
+            .map(|x| x.0.size_difference)
+            .sum::<i64>();
+        let size_direction = if size_diff >= 0 { "+" } else { "" };
+
+        let ok_rating = match size_diff {
+            diff if diff >= 5_000 => "You are a decomp GOD, can I have your autograph?",
+            diff if diff >= 2_000 => "Amazing contribution, you are the decomp GOAT 🐐",
+            diff if diff >= 1_000 => "A Fantastic contribution! ✨🎉",
+            diff if diff > 750 => "Ay, dios mio, gracias por la contribución!",
+            diff if diff > 500 => "A solid contribution, Спасибо!",
+            diff if diff > 250 => "A decent contribution. Thank you!",
+            diff if diff < 100 => "A small but commendable contribution",
+            diff if diff < 0 => "You're going in the wrong direction..?",
+            diff if diff < -1_000 => "You really screwed up 🙉",
+            _ => "I don't have an opinion",
+        };
+
         let lines: Vec<String> = vec![
-            // h
             format!("# {}", header),
+            format!("{}{} bytes", size_direction, size_diff),
+            format!("🆗 Bot Rating: {}", ok_rating),
             format!("## {}", regressions_header),
             regressions_string,
             format!("## {}", progress_header),