Reduce memory usage by dropping more cache fields

GnomedDev · GnomedDev · commit 91cebeb8cdae · 2026-04-19T09:14:28.000+01:00
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,24 +1,41 @@
 {
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
+    nixpkgs-unpatched.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     flake-utils.url = "github:numtide/flake-utils";
 
     tts-utils.url = "github:Discord-TTS/shared-workflows";
   };
 
   outputs =
     {
-      nixpkgs,
+      nixpkgs-unpatched,
       flake-utils,
       tts-utils,
       ...
     }:
     flake-utils.lib.eachDefaultSystem (
       system:
       let
-        pkgs = import nixpkgs { inherit system; };
+        pkgsUnpatched = import nixpkgs-unpatched { inherit system; };
+        nixpkgs = pkgsUnpatched.applyPatches {
+          name = "nixpkgs-patched";
+          src = nixpkgs-unpatched;
+          patches = [
+            # Bumps Rust to 1.94.1
+            (pkgsUnpatched.fetchpatch2 {
+              url = "https://github.com/NixOS/nixpkgs/pull/503830.patch";
+              hash = "sha256-wCC+IJqZJTxyteNV//+M/+31xh+Pns0tQ/qgDkSOQaQ=";
+            })
+            # Bumps Rust to 1.95
+            (pkgsUnpatched.fetchpatch2 {
+              url = "https://github.com/NixOS/nixpkgs/pull/510674.patch";
+              hash = "sha256-7s7lcdifXJd31XTECFoPwrZE3UrUiMn9dHSHPXHn4dc=";
+            })
+          ];
+        };
 
+        pkgs = import nixpkgs { inherit system; };
         pkgDesc = (pkgs.lib.importTOML ./Cargo.toml).package;
         botPkg = pkgs.rustPlatform.buildRustPackage {
           pname = pkgDesc.name;
@@ -29,8 +46,8 @@
           cargoLock = {
             lockFile = ./Cargo.lock;
             outputHashes = {
-              "poise-0.6.1" = "sha256-qCTEkOWCpKgEXCt7apg+tiScE+X0Br0giTNNBxqNCs0=";
-              "serenity-0.12.5" = "sha256-xlBuX0qdTclrKaZkAwK3kXZdurxFT3UVYC7Eh/f+emA=";
+              "poise-0.6.1" = "sha256-6NU1UOQUz8WO77Luv7VLp/RL1May65Y7JmMWxaPbgvo=";
+              "serenity-0.12.5" = "sha256-lyleiOtGDFH5zuHu3z4pUEE5lyyJZvZQkzH3pwu2XGA=";
             };
           };
 
diff --git a/src/main.rs b/src/main.rs
@@ -126,7 +126,7 @@ async fn main_(start_time: std::time::SystemTime) -> Result<()> {
         voice_connections: parking_lot::Mutex::default(),
         update_startup_lock: tokio::sync::Mutex::new(()),
         entitlement_cache: mini_moka::sync::Cache::builder()
-            .time_to_live(Duration::from_secs(60 * 60))
+            .time_to_live(Duration::from_hours(1))
             .build(),
 
         gtts_voices,
diff --git a/tts_commands/src/other.rs b/tts_commands/src/other.rs
@@ -209,7 +209,7 @@ pub async fn botstats(ctx: Context<'_>) -> CommandResult {
                 .to_arraystring(),
             guilds
                 .into_iter()
-                .map(|g| g.member_count)
+                .map(|g| u64::from(g.member_count.get()))
                 .sum::<u64>()
                 .to_formatted_string(&Locale::en),
         )
diff --git a/tts_commands/src/owner.rs b/tts_commands/src/owner.rs
@@ -481,7 +481,7 @@ pub async fn guild_info(ctx: Context<'_>, guild_id: Option<serenity::GuildId>) -
     let response = ctx
         .channel_id()
         .collect_component_interactions(ctx.serenity_context())
-        .timeout(Duration::from_secs(60 * 5))
+        .timeout(Duration::from_mins(5))
         .author_id(ctx.author().id)
         .custom_ids(custom_ids)
         .await;
diff --git a/tts_commands/src/settings/setup.rs b/tts_commands/src/settings/setup.rs
@@ -108,7 +108,7 @@ async fn show_channel_select_menu(
     let interaction = reply_message
         .id
         .collect_component_interactions(ctx.serenity_context())
-        .timeout(std::time::Duration::from_secs(60 * 5))
+        .timeout(std::time::Duration::from_mins(5))
         .author_id(ctx.author().id)
         .await;
 
diff --git a/tts_commands/src/settings/voice_paginator.rs b/tts_commands/src/settings/voice_paginator.rs
@@ -97,7 +97,7 @@ impl<'a> MenuPaginator<'a> {
         loop {
             let builder = message_id
                 .collect_component_interactions(serenity_context)
-                .timeout(std::time::Duration::from_secs(60 * 5))
+                .timeout(std::time::Duration::from_mins(5))
                 .author_id(self.ctx.author().id);
 
             let Some(interaction) = builder.await else {
diff --git a/tts_core/src/common.rs b/tts_core/src/common.rs
@@ -182,7 +182,7 @@ pub async fn confirm_dialog_wait(
 ) -> Result<Option<bool>> {
     let interaction = message_id
         .collect_component_interactions(ctx)
-        .timeout(std::time::Duration::from_secs(60 * 5))
+        .timeout(std::time::Duration::from_mins(5))
         .author_id(author_id)
         .await;
 
diff --git a/tts_core/src/lib.rs b/tts_core/src/lib.rs
@@ -1,5 +1,5 @@
 #![expect(async_fn_in_trait)]
-#![feature(if_let_guard, type_alias_impl_trait)]
+#![feature(type_alias_impl_trait)]
 
 pub mod analytics;
 pub mod common;
diff --git a/tts_core/src/opt_ext.rs b/tts_core/src/opt_ext.rs
@@ -2,7 +2,7 @@ use anyhow::Result;
 
 #[cold]
 fn create_err(line: u32, file: &str) -> anyhow::Error {
-    anyhow::anyhow!("Unexpected None value on line {line} in {file}",)
+    anyhow::anyhow!("Unexpected None value on line {line} in {file}")
 }
 
 pub trait OptionTryUnwrap<T> {
diff --git a/tts_events/src/lib.rs b/tts_events/src/lib.rs
@@ -101,16 +101,21 @@ impl serenity::EventHandler for EventHandler {
         mut event: Box<serenity::Event>,
     ) -> Option<Box<serenity::Event>> {
         use extract_map::ExtractMap;
+        use serenity::small_fixed_array::FixedArray;
 
         // Filter out Guild::emojis and Guild::stickers as we do not read them.
         match &mut *event {
             serenity::Event::GuildCreate(event) => {
                 event.guild.emojis = ExtractMap::new();
                 event.guild.stickers = ExtractMap::new();
+                event.guild.features = FixedArray::new();
+                event.guild.incidents_data = None;
             }
             serenity::Event::GuildUpdate(event) => {
                 event.guild.emojis = ExtractMap::new();
                 event.guild.stickers = ExtractMap::new();
+                event.guild.features = FixedArray::new();
+                event.guild.incidents_data = None;
             }
             serenity::Event::GuildEmojisUpdate(event) => event.emojis = ExtractMap::new(),
             serenity::Event::GuildStickersUpdate(event) => event.stickers = ExtractMap::new(),
diff --git a/tts_tasks/src/web_updater.rs b/tts_tasks/src/web_updater.rs
@@ -20,7 +20,7 @@ fn remember_to_update_analytics_query() {
 }
 
 fn count_members<'a>(guilds: impl Iterator<Item = serenity::cache::GuildRef<'a>>) -> u64 {
-    guilds.map(|g| g.member_count).sum()
+    guilds.map(|g| u64::from(g.member_count.get())).sum()
 }
 
 #[derive(serde::Serialize)]

Original file line number	Diff line number	Diff line change
`@@ -209,7 +209,7 @@ pub async fn botstats(ctx: Context<'_>) -> CommandResult {`
`209`	`209`	`.to_arraystring(),`
`210`	`210`	`guilds`
`211`	`211`	`.into_iter()`
`212`		`- .map(\|g\| g.member_count)`
	`212`	`+ .map(\|g\| u64::from(g.member_count.get()))`
`213`	`213`	`.sum::<u64>()`
`214`	`214`	`.to_formatted_string(&Locale::en),`
`215`	`215`	`)`