Reorganise premium commands

Author: GnomedDev

tts_commands/src/lib.rs

@@ -55,7 +55,7 @@ pub async fn premium_command_check(ctx: Context<'_>) -> Result<bool> {
             Cow::Borrowed("Hey, this is a premium command so it must be run in a server!")
         }
         Some(FailurePoint::PremiumUser) => Cow::Borrowed(
-            "Hey, this server isn't premium, please purchase TTS Bot Premium! (`/premium`)",
+            "Hey, this server isn't premium, please purchase TTS Bot Premium! (`/premium info`)",
         ),
         Some(FailurePoint::NotSubscribed(premium_user_id)) => {
             let premium_user = premium_user_id.to_user(serenity_ctx).await?;

tts_commands/src/premium.rs

@@ -88,10 +88,9 @@ pub async fn premium(ctx: Context<'_>) -> CommandResult {
     guild_only,
     prefix_command,
     slash_command,
-    aliases("activate"),
     required_bot_permissions = "SEND_MESSAGES | EMBED_LINKS"
 )]
-pub async fn premium_activate(ctx: Context<'_>) -> CommandResult {
+pub async fn activate(ctx: Context<'_>) -> CommandResult {
     let guild_id = ctx.guild_id().unwrap();
     let data = ctx.data();
 
@@ -168,7 +167,7 @@ pub async fn premium_activate(ctx: Context<'_>) -> CommandResult {
     slash_command,
     required_bot_permissions = "SEND_MESSAGES | EMBED_LINKS"
 )]
-pub async fn list_premium(ctx: Context<'_>) -> CommandResult {
+pub async fn list(ctx: Context<'_>) -> CommandResult {
     let data = ctx.data();
     let Some(premium_info) = data.fetch_premium_info(ctx.http(), ctx.author().id).await? else {
         ctx.say("I cannot confirm you are subscribed to premium, so you don't have any premium servers!").await?;
@@ -191,7 +190,7 @@ pub async fn list_premium(ctx: Context<'_>) -> CommandResult {
     let author = ctx.author();
     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`!");
+        embed_desc = Cow::Borrowed("None... set some servers with `/premium activate`!");
     }
 
     let footer = aformat!("You have {remaining_guilds} server(s) remaining for premium activation");
@@ -212,10 +211,9 @@ pub async fn list_premium(ctx: Context<'_>) -> CommandResult {
     prefix_command,
     slash_command,
     guild_only,
-    aliases("premium_remove", "premium_delete"),
     required_bot_permissions = "SEND_MESSAGES | EMBED_LINKS"
 )]
-pub async fn premium_deactivate(ctx: Context<'_>) -> CommandResult {
+pub async fn deactivate(ctx: Context<'_>) -> CommandResult {
     let data = ctx.data();
     let author = ctx.author();
     let guild_id = ctx.guild_id().unwrap();
@@ -240,11 +238,17 @@ pub async fn premium_deactivate(ctx: Context<'_>) -> CommandResult {
     Ok(())
 }
 
-pub fn commands() -> [Command; 4] {
-    [
-        premium(),
-        premium_activate(),
-        list_premium(),
-        premium_deactivate(),
-    ]
+pub fn commands() -> [Command; 1] {
+    [Command {
+        subcommands: vec![
+            Command {
+                name: "info".into(),
+                ..premium()
+            },
+            list(),
+            activate(),
+            deactivate(),
+        ],
+        ..premium()
+    }]
 }

tts_commands/src/settings/mod.rs

@@ -306,10 +306,10 @@ async fn can_change_mode(
             .colour(PREMIUM_NEUTRAL_COLOUR)
             .thumbnail(data.premium_avatar_url.as_str())
             .footer(CreateEmbedFooter::new(
-                "If this server has purchased premium, please run the `/premium_activate` command to link yourself to this server!"
+                "If this server has purchased premium, please run the `/premium activate` command to link yourself to this server!"
             ))
             .description(aformat!("
-                The `{mode}` TTS Mode is only for TTS Bot Premium subscribers, please check out the `/premium` command!
+                The `{mode}` TTS Mode is only for TTS Bot Premium subscribers, please check out the `/premium info` command!
             ").as_str())
         )).await?;
 

tts_core/src/common.rs

@@ -156,7 +156,7 @@ pub fn random_footer(server_invite: &str, client_id: serenity::UserId) -> Cow<'s
             "You can vote for me or review me on top.gg!\nhttps://top.gg/bot/{client_id}"
         )),
         2 => Cow::Borrowed(
-            "If you want to support the development and hosting of TTS Bot, check out `/premium`!",
+            "If you want to support the development and hosting of TTS Bot, check out `/premium info`!",
         ),
         3 => Cow::Borrowed("There are loads of customizable settings, check out `/help set`"),
         _ => unreachable!(),