Skip to content

Commit

Permalink
Remove unused PatreonInfo::tier
Browse files Browse the repository at this point in the history
  • Loading branch information
GnomedDev committed Aug 28, 2024
1 parent d33c60c commit 8fb29f8
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 7 deletions.
4 changes: 2 additions & 2 deletions tts_commands/src/premium.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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`!");
}
Expand Down
12 changes: 7 additions & 5 deletions tts_core/src/structs.rs
Original file line number Diff line number Diff line change
@@ -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};
Expand Down Expand Up @@ -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 {
Expand Down Expand Up @@ -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,
}))
}
}
Expand Down

0 comments on commit 8fb29f8

Please sign in to comment.