feat: show rank change in profile command (#937)

MaxOhn · web-flow · commit e16f351aacb0 · 2025-02-11T17:47:18.000+01:00
* feat: show rank change in profile command

* fix: compromise on worse arrows for compatibility
diff --git a/bathbot/src/active/impls/compare/scores.rs b/bathbot/src/active/impls/compare/scores.rs
@@ -78,7 +78,7 @@ impl IActiveMessage for CompareScoresPagination {
         );
 
         let mut embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(false))
             .footer(footer)
             .title(title)
             .url(format!("{OSU_BASE}b/{}", self.map.map_id()));
diff --git a/bathbot/src/active/impls/most_played.rs b/bathbot/src/active/impls/most_played.rs
@@ -60,7 +60,7 @@ impl IActiveMessage for MostPlayedPagination {
         let footer_text = format!("Page {page}/{pages}");
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(false))
             .description(description)
             .footer(FooterBuilder::new(footer_text))
             .thumbnail(self.user.avatar_url.as_ref())
diff --git a/bathbot/src/active/impls/nochoke.rs b/bathbot/src/active/impls/nochoke.rs
@@ -114,7 +114,7 @@ impl IActiveMessage for NoChokePagination {
         }
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(false))
             .description(description)
             .footer(FooterBuilder::new(footer_text))
             .thumbnail(self.user.avatar_url.as_ref())
diff --git a/bathbot/src/active/impls/osustats/scores.rs b/bathbot/src/active/impls/osustats/scores.rs
@@ -155,7 +155,7 @@ impl OsuStatsScoresPagination {
 
         if self.entries.is_empty() {
             let embed = EmbedBuilder::new()
-                .author(self.user.author_builder())
+                .author(self.user.author_builder(false))
                 .description("No scores with these parameters were found")
                 .footer(FooterBuilder::new("Page 1/1 • Total scores: 0"))
                 .thumbnail(self.user.avatar_url.as_ref());
@@ -207,7 +207,7 @@ impl OsuStatsScoresPagination {
         ));
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(false))
             .description(description)
             .footer(footer)
             .thumbnail(self.user.avatar_url.as_ref());
diff --git a/bathbot/src/active/impls/profile/mod.rs b/bathbot/src/active/impls/profile/mod.rs
@@ -258,7 +258,7 @@ impl ProfileMenu {
         }
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(true))
             .description(description)
             .footer(self.footer())
             .thumbnail(self.user.avatar_url.as_ref());
@@ -456,7 +456,7 @@ impl ProfileMenu {
         ];
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(true))
             .description(description)
             .fields(fields)
             .footer(self.footer())
@@ -641,7 +641,7 @@ impl ProfileMenu {
         };
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(true))
             .description(description)
             .thumbnail(self.user.avatar_url.as_ref());
 
@@ -743,7 +743,7 @@ impl ProfileMenu {
         };
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(true))
             .description(description)
             .fields(fields)
             .thumbnail(self.user.avatar_url.as_ref());
@@ -812,7 +812,7 @@ impl ProfileMenu {
         }
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(true))
             .description(description)
             .thumbnail(self.user.avatar_url.as_ref());
 
@@ -877,7 +877,7 @@ impl ProfileMenu {
         }
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(true))
             .description(description)
             .fields(fields)
             .thumbnail(self.user.avatar_url.as_ref());
diff --git a/bathbot/src/active/impls/recent_list.rs b/bathbot/src/active/impls/recent_list.rs
@@ -98,7 +98,7 @@ impl IActiveMessage for RecentListPagination {
         }
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(false))
             .description(description)
             .footer(FooterBuilder::new(footer_text))
             .thumbnail(self.user.avatar_url.as_ref())
diff --git a/bathbot/src/active/impls/single_score.rs b/bathbot/src/active/impls/single_score.rs
@@ -84,7 +84,7 @@ impl SingleScorePagination {
             score_data,
             msg_owner,
             pages,
-            author: user.author_builder(),
+            author: user.author_builder(false),
             content,
         }
     }
diff --git a/bathbot/src/active/impls/snipe/difference.rs b/bathbot/src/active/impls/snipe/difference.rs
@@ -167,7 +167,7 @@ impl SnipeDifferencePagination {
         ));
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(false))
             .description(description)
             .footer(footer)
             .thumbnail(self.user.avatar_url.as_ref())
diff --git a/bathbot/src/active/impls/snipe/player_list.rs b/bathbot/src/active/impls/snipe/player_list.rs
@@ -127,7 +127,7 @@ impl SnipePlayerListPagination {
 
         if self.scores.is_empty() {
             let embed = EmbedBuilder::new()
-                .author(self.user.author_builder())
+                .author(self.user.author_builder(false))
                 .description("No scores were found")
                 .footer(FooterBuilder::new("Page 1/1 • Total #1 scores: 0"))
                 .thumbnail(self.user.avatar_url.as_ref());
@@ -187,7 +187,7 @@ impl SnipePlayerListPagination {
         ));
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(false))
             .description(description)
             .footer(footer)
             .thumbnail(self.user.avatar_url.as_ref());
diff --git a/bathbot/src/active/impls/top.rs b/bathbot/src/active/impls/top.rs
@@ -80,7 +80,7 @@ impl TopPagination {
         );
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(false))
             .description(description)
             .footer(FooterBuilder::new(footer_text))
             .thumbnail(self.user.avatar_url.as_ref());
@@ -238,7 +238,7 @@ impl TopPagination {
         );
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(false))
             .description(description)
             .footer(FooterBuilder::new(footer_text))
             .thumbnail(self.user.avatar_url.as_ref());
diff --git a/bathbot/src/active/impls/top_if.rs b/bathbot/src/active/impls/top_if.rs
@@ -103,7 +103,7 @@ impl IActiveMessage for TopIfPagination {
         );
 
         let embed = EmbedBuilder::new()
-            .author(self.user.author_builder())
+            .author(self.user.author_builder(false))
             .description(description)
             .footer(FooterBuilder::new(footer_text))
             .thumbnail(self.user.avatar_url.as_ref())
diff --git a/bathbot/src/commands/osu/bws.rs b/bathbot/src/commands/osu/bws.rs
@@ -388,7 +388,7 @@ fn bws_embed(
     }
 
     embed
-        .author(user.author_builder())
+        .author(user.author_builder(false))
         .description(description)
         .thumbnail(user.avatar_url.as_ref().to_owned())
         .title(title)
diff --git a/bathbot/src/commands/osu/cards.rs b/bathbot/src/commands/osu/cards.rs
@@ -235,7 +235,7 @@ async fn slash_card(mut command: InteractionCommand) -> Result<()> {
     };
 
     let embed = EmbedBuilder::new()
-        .author(user.author_builder())
+        .author(user.author_builder(false))
         .image(attachment("card.png"));
 
     let builder = MessageBuilder::new()
diff --git a/bathbot/src/commands/osu/daily_challenge/user.rs b/bathbot/src/commands/osu/daily_challenge/user.rs
@@ -85,7 +85,7 @@ Best    | {:^daily_len$} | {:^6}
     let footer = format!("Played today: {}", if played_today { '✅' } else { '❌' });
 
     let embed = EmbedBuilder::new()
-        .author(user.author_builder())
+        .author(user.author_builder(false))
         .fields(fields)
         .footer(FooterBuilder::new(footer))
         .thumbnail(user.avatar_url.as_ref());
diff --git a/bathbot/src/commands/osu/graphs/mod.rs b/bathbot/src/commands/osu/graphs/mod.rs
@@ -374,7 +374,7 @@ async fn graph(orig: CommandOrigin<'_>, args: Graph) -> Result<()> {
     };
 
     let embed = EmbedBuilder::new()
-        .author(user.author_builder())
+        .author(user.author_builder(false))
         .image(attachment("graph.png"));
 
     let builder = MessageBuilder::new()
diff --git a/bathbot/src/commands/osu/rank/pp.rs b/bathbot/src/commands/osu/rank/pp.rs
@@ -247,7 +247,7 @@ pub(super) async fn pp(orig: CommandOrigin<'_>, args: RankPp<'_>) -> Result<()>
     let description = rank_data.description(scores.as_deref(), multiple);
 
     let embed = EmbedBuilder::new()
-        .author(user.author_builder())
+        .author(user.author_builder(false))
         .description(description)
         .thumbnail(user.avatar_url.as_ref())
         .title(title);
diff --git a/bathbot/src/embeds/osu/fix_score.rs b/bathbot/src/embeds/osu/fix_score.rs
@@ -29,7 +29,7 @@ impl FixScoreEmbed {
     pub fn new(entry: &FixEntry, mods: Option<GameModsIntermode>) -> Self {
         let FixEntry { user, map, score } = entry;
 
-        let author = user.author_builder();
+        let author = user.author_builder(false);
         let url = format!("{OSU_BASE}b/{}", map.map_id());
         let thumbnail = map.thumbnail().to_owned();
 
diff --git a/bathbot/src/embeds/osu/osustats_counts.rs b/bathbot/src/embeds/osu/osustats_counts.rs
@@ -53,7 +53,7 @@ impl OsuStatsCountsEmbed {
 
         Self {
             description,
-            author: user.author_builder(),
+            author: user.author_builder(false),
             thumbnail: user.avatar_url.as_ref().to_owned(),
             footer_timestamp,
             title: format!(
diff --git a/bathbot/src/embeds/osu/player_snipe_stats.rs b/bathbot/src/embeds/osu/player_snipe_stats.rs
@@ -147,7 +147,7 @@ impl PlayerSnipeStatsEmbed {
             fields,
             description,
             footer: FooterBuilder::new(footer_text),
-            author: user.author_builder(),
+            author: user.author_builder(false),
             title: "National #1 statistics",
             image: attachment("stats_graph.png"),
             thumbnail: avatar_url.to_owned(),
diff --git a/bathbot/src/embeds/osu/pp_missing.rs b/bathbot/src/embeds/osu/pp_missing.rs
@@ -279,7 +279,7 @@ impl PpMissingEmbed {
         });
 
         Self {
-            author: user.author_builder(),
+            author: user.author_builder(false),
             description,
             footer,
             thumbnail: user.avatar_url.as_ref().to_owned(),
diff --git a/bathbot/src/embeds/osu/ratio.rs b/bathbot/src/embeds/osu/ratio.rs
@@ -78,7 +78,7 @@ impl RatioEmbed {
         Self {
             description,
             thumbnail,
-            author: user.author_builder(),
+            author: user.author_builder(false),
         }
     }
 }
diff --git a/bathbot/src/embeds/osu/sniped.rs b/bathbot/src/embeds/osu/sniped.rs
@@ -18,7 +18,7 @@ pub struct SnipedEmbed {
 impl SnipedEmbed {
     pub fn new(user: &CachedUser, sniper: Vec<SnipedWeek>, snipee: Vec<SnipedWeek>) -> Self {
         let thumbnail = user.avatar_url.as_ref().to_owned();
-        let author = user.author_builder();
+        let author = user.author_builder(false);
         let title = "National snipe scores of the last 8 weeks";
         let username = user.username.as_str();
 
diff --git a/bathbot/src/embeds/osu/whatif.rs b/bathbot/src/embeds/osu/whatif.rs
@@ -121,7 +121,7 @@ impl WhatIfEmbed {
         };
 
         Self {
-            author: user.author_builder(),
+            author: user.author_builder(false),
             description,
             thumbnail: avatar_url.to_owned(),
             title,
diff --git a/bathbot/src/util/ext/cached_user.rs b/bathbot/src/util/ext/cached_user.rs
@@ -1,3 +1,5 @@
+use std::{cmp::Ordering, fmt::Write};
+
 use bathbot_model::{
     rkyv_util::time::ArchivedDateTime,
     rosu_v2::user::{ArchivedUser, ArchivedUserHighestRank},
@@ -8,21 +10,45 @@ use rkyv::{munge::munge, option::ArchivedOption};
 use crate::manager::redis::osu::CachedUser;
 
 pub trait CachedUserExt {
-    fn author_builder(&self) -> AuthorBuilder;
+    fn author_builder(&self, with_rank_change: bool) -> AuthorBuilder;
+    fn rank_change_since_30_days(&self) -> Option<i32>;
     fn update(&mut self, user: rosu_v2::model::user::User);
 }
 
 impl CachedUserExt for CachedUser {
-    fn author_builder(&self) -> AuthorBuilder {
+    fn author_builder(&self, with_rank_change: bool) -> AuthorBuilder {
         let stats = self.statistics.as_ref().expect("missing stats");
         let country_code = self.country_code.as_str();
 
-        let text = format!(
-            "{name}: {pp}pp (#{global} {country_code}{national})",
+        let mut text = format!(
+            "{name}: {pp}pp (#{global}",
             name = self.username,
             pp = WithComma::new(stats.pp.to_native()),
             global = WithComma::new(stats.global_rank.to_native()),
-            national = stats.country_rank
+        );
+
+        // Arguably showing the value *always* is a little much so it's
+        // probably best we only show it in some cases.
+        if with_rank_change {
+            if let Some(rank_change) = self.rank_change_since_30_days() {
+                // Alternatively '🡩' and '🡫' or '⭜' and '⭝' but they don't
+                // show properly on mobile and/or linux :(
+                match rank_change.cmp(&0) {
+                    Ordering::Greater => {
+                        let _ = write!(text, " ⬇{rank_change}");
+                    }
+                    Ordering::Less => {
+                        let _ = write!(text, " ⬆{}", -rank_change);
+                    }
+                    Ordering::Equal => {}
+                }
+            }
+        }
+
+        let _ = write!(
+            text,
+            " {country_code}{national})",
+            national = stats.country_rank,
         );
 
         let url = format!("{OSU_BASE}users/{}/{}", self.user_id, self.mode);
@@ -31,6 +57,18 @@ impl CachedUserExt for CachedUser {
         AuthorBuilder::new(text).url(url).icon_url(icon)
     }
 
+    fn rank_change_since_30_days(&self) -> Option<i32> {
+        let prev = self
+            .rank_history
+            .as_ref()
+            .get(self.rank_history.len().checked_sub(30)?)?
+            .to_native() as i32;
+
+        let curr = self.rank_history.last()?.to_native() as i32;
+
+        (curr > 0 && prev > 0).then_some(curr - prev)
+    }
+
     fn update(&mut self, user: rosu_v2::model::user::User) {
         self.mutate(|seal| {
             munge!(let ArchivedUser {

Original file line number	Diff line number	Diff line change
`@@ -114,7 +114,7 @@ impl IActiveMessage for NoChokePagination {`
`114`	`114`	`}`
`115`	`115`
`116`	`116`	`let embed = EmbedBuilder::new()`
`117`		`- .author(self.user.author_builder())`
	`117`	`+ .author(self.user.author_builder(false))`
`118`	`118`	`.description(description)`
`119`	`119`	`.footer(FooterBuilder::new(footer_text))`
`120`	`120`	`.thumbnail(self.user.avatar_url.as_ref())`
Original file line number	Diff line number	Diff line change
`@@ -98,7 +98,7 @@ impl IActiveMessage for RecentListPagination {`
`98`	`98`	`}`
`99`	`99`
`100`	`100`	`let embed = EmbedBuilder::new()`
`101`		`- .author(self.user.author_builder())`
	`101`	`+ .author(self.user.author_builder(false))`
`102`	`102`	`.description(description)`
`103`	`103`	`.footer(FooterBuilder::new(footer_text))`
`104`	`104`	`.thumbnail(self.user.avatar_url.as_ref())`
Original file line number	Diff line number	Diff line change
`@@ -84,7 +84,7 @@ impl SingleScorePagination {`
`84`	`84`	`score_data,`
`85`	`85`	`msg_owner,`
`86`	`86`	`pages,`
`87`		`- author: user.author_builder(),`
	`87`	`+ author: user.author_builder(false),`
`88`	`88`	`content,`
`89`	`89`	`}`
`90`	`90`	`}`