From 8fb29f807ff77e9e4a34c87daeb3939ccb88634a Mon Sep 17 00:00:00 2001
From: GnomedDev <david2005thomas@gmail.com>
Date: Tue, 27 Aug 2024 14:26:30 +0100
Subject: [PATCH] Remove unused PatreonInfo::tier

---
 tts_commands/src/premium.rs |  4 ++--
 tts_core/src/structs.rs     | 12 +++++++-----
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/tts_commands/src/premium.rs b/tts_commands/src/premium.rs
index f084b42..ec6c9e7 100644
--- a/tts_commands/src/premium.rs
+++ b/tts_commands/src/premium.rs
@@ -59,7 +59,7 @@ pub async fn premium_activate(ctx: Context<'_>) -> CommandResult {
     let linked_guilds = get_premium_guild_count(&data.pool, author.id).await?;
     let error_msg = match data.fetch_patreon_info(author.id).await? {
         Some(tier) => {
-            if linked_guilds as u8 >= tier.entitled_servers {
+            if linked_guilds >= tier.entitled_servers.get().into() {
                 Some(Cow::Owned(format!("Hey, you already have {linked_guilds} servers linked, you are only subscribed to the {} tier!", tier.entitled_servers)))
             } else {
                 None
@@ -146,7 +146,7 @@ pub async fn list_premium(ctx: Context<'_>) -> CommandResult {
     }
 
     let author = ctx.author();
-    let remaining_guilds = premium_info.entitled_servers - premium_guilds;
+    let remaining_guilds = premium_info.entitled_servers.get() - premium_guilds;
     if embed_desc.is_empty() {
         embed_desc = Cow::Borrowed("None... set some servers with `/premium_activate`!");
     }
diff --git a/tts_core/src/structs.rs b/tts_core/src/structs.rs
index 008b256..198d0d1 100644
--- a/tts_core/src/structs.rs
+++ b/tts_core/src/structs.rs
@@ -1,7 +1,11 @@
 use std::{
     borrow::Cow,
     collections::BTreeMap,
-    sync::{atomic::{AtomicBool, Ordering}, Arc, OnceLock},
+    num::NonZeroU8,
+    sync::{
+        atomic::{AtomicBool, Ordering},
+        Arc, OnceLock,
+    },
 };
 
 use aformat::{aformat, CapStr};
@@ -126,8 +130,7 @@ pub enum FailurePoint {
 
 #[derive(serde::Deserialize, Clone, Copy)]
 pub struct PatreonInfo {
-    pub tier: u8,
-    pub entitled_servers: u8,
+    pub entitled_servers: NonZeroU8,
 }
 
 pub struct RegexCache {
@@ -261,8 +264,7 @@ impl Data {
         } else {
             // Return fake PatreonInfo if `patreon_service` has not been set to simplify self-hosting.
             Ok(Some(PatreonInfo {
-                tier: u8::MAX,
-                entitled_servers: u8::MAX,
+                entitled_servers: NonZeroU8::MAX,
             }))
         }
     }