Merge pull request #17 from OpenTabletDriver/cleanup

Clean up redundant traits and minor bugs

Author: InfinityGhost

src/commands/mod.rs

@@ -35,6 +35,8 @@ pub async fn register(ctx: &Context) -> ApplicationCommandMap {
 pub async fn interact(ctx: &Context, interaction: &ApplicationCommandInteraction) {
   let name = &interaction.data.name;
 
+  interaction.defer(ctx).await.expect("Failed to defer interaction");
+
   match name.as_str() {
     "snippet" => snippets::snippet(ctx, interaction).await,
     "create-snippet" => snippets::create_snippet(ctx, interaction).await,
@@ -45,8 +47,6 @@ pub async fn interact(ctx: &Context, interaction: &ApplicationCommandInteraction
     _ => {
       println!("WARNING: Received invalid application command interaction!: {}", name);
 
-      interaction.defer(ctx).await.expect("Failed to defer interaction");
-
       let title = "Invalid application command";
       let content = &format!("An invalid application command was recieved: {}", name);
       respond_err(ctx, interaction, title, content).await;
@@ -144,7 +144,6 @@ impl ApplicationCommandMap {
       )
       .clone();
 
-
     let mut commands = ApplicationCommandMap(CommandHashMap::new());
 
     commands.insert("snippet", snippet);

src/commands/snippets.rs

@@ -4,7 +4,7 @@ use serenity::json::Value;
 use serenity::model::prelude::command::CommandOptionType;
 use serenity::model::prelude::interaction::application_command::{ApplicationCommandInteraction, CommandDataOptionValue};
 use serenity::prelude::Context;
-use crate::structures::{State, Snippet};
+use crate::structures::{State, Snippet, Embeddable};
 use crate::commands::{arg, respond_ok};
 
 use super::{respond_err, respond_embed, arg_opt};
@@ -27,10 +27,8 @@ pub(super) fn sync_snippets(state: &State, command: &mut CreateApplicationComman
 pub(super) async fn snippet(ctx: &Context, interaction: &ApplicationCommandInteraction) {
   match arg(interaction, "id") {
     CommandDataOptionValue::String(id) => {
-      interaction.defer(ctx).await.expect("Failed to defer interaction");
-
       if let Some(snippet) = get_snippet(ctx, &id).await {
-        let embed = snippet.create_embed();
+        let embed = snippet.embed();
 
         respond_embed(ctx, interaction, &embed, false).await;
       } else {
@@ -47,8 +45,6 @@ pub(super) async fn edit_snippet(ctx: &Context, interaction: &ApplicationCommand
   let content = arg_opt(interaction, "content");
 
   if let CommandDataOptionValue::String(id) = id {
-    interaction.defer(ctx).await.expect("Failed to defer interaction");
-
     {
       let mut data = ctx.data.write().await;
       let state = data.get_mut::<State>().expect("Failed to get state");
@@ -97,7 +93,7 @@ pub(super) async fn edit_snippet(ctx: &Context, interaction: &ApplicationCommand
 
     let mut embed = get_snippet(ctx, &id).await
       .expect("Failed to get snippet for recently modified snippet")
-      .create_embed();
+      .embed();
 
     embed.colour(super::OK_COLOUR);
 
@@ -116,8 +112,6 @@ pub(super) async fn create_snippet(ctx: &Context, interaction: &ApplicationComma
       CommandDataOptionValue::String(title),
       CommandDataOptionValue::String(content)
     ) => {
-      interaction.defer(ctx).await.expect("Failed to defer interaction");
-
       let embed = {
         let mut data = ctx.data.write().await;
         let state = data.get_mut::<State>().expect("Failed to get state");
@@ -134,7 +128,7 @@ pub(super) async fn create_snippet(ctx: &Context, interaction: &ApplicationComma
 
         println!("New snippet created '{}: {}'", id, title);
 
-        let mut embed = snippet.create_embed();
+        let mut embed = snippet.embed();
         embed.colour(super::OK_COLOUR);
 
         state.snippets.push(snippet);
@@ -159,8 +153,6 @@ pub(super) async fn remove_snippet(ctx: &Context, interaction: &ApplicationComma
 
   match id {
     CommandDataOptionValue::String(id) => {
-      interaction.defer(ctx).await.expect("Failed to defer interaction");
-
       println!("Removing snippet '{id}'");
 
       match get_snippet(ctx, &id).await {
@@ -188,16 +180,12 @@ pub(super) async fn export_snippet(ctx: &Context, interaction: &ApplicationComma
 
   match id {
     CommandDataOptionValue::String(id) => {
-      interaction.defer(ctx).await.expect("Failed to defer interaction");
-
       let snippet = get_snippet(ctx, &id).await
         .expect("Failed to get snippet");
 
-      let embed = snippet.create_embed();
-
       let result = interaction.create_followup_message(ctx, |r| r
         .content(format!("```{}```", &snippet.content.replace("\n", r#"\n"#)))
-        .add_embed(embed)
+        .add_embed(snippet.embed())
       ).await;
 
       if let Err(e) = result {
@@ -208,12 +196,8 @@ pub(super) async fn export_snippet(ctx: &Context, interaction: &ApplicationComma
   }
 }
 
-trait SnippetEmbed {
-  fn create_embed(&self) -> CreateEmbed;
-}
-
-impl SnippetEmbed for Snippet {
-  fn create_embed(&self) -> CreateEmbed {
+impl Embeddable for Snippet {
+  fn embed(&self) -> CreateEmbed {
     CreateEmbed::default()
       .title(&self.title)
       .description(&self.content)

src/commands/utils.rs

@@ -13,8 +13,6 @@ pub(super) async fn embed(ctx: &Context, interaction: &ApplicationCommandInterac
   let footer_text = arg_opt(interaction, "footer");
   let image = arg_opt(interaction, "image");
 
-  interaction.defer(ctx).await.expect("Failed to defer interaction");
-
   let mut embed = CreateEmbed::default();
 
   if let Some(CommandDataOptionValue::String(title)) = title {

src/events/code.rs

@@ -23,7 +23,9 @@ async fn get_embeds(ctx: &Context, message: &Message) -> Option<Vec<CreateEmbed>
 
   if let Some(refs) = FileReference::try_from_str(&message.content) {
     for file_ref in refs {
-      embeds.push(file_ref.create_embed().await);
+      if let Some(embed) = file_ref.create_embed().await {
+        embeds.push(embed);
+      }
     }
   }
 
@@ -98,20 +100,23 @@ impl FileReference<'_> {
     }
   }
 
-  pub async fn create_embed(&self) -> CreateEmbed {
+  pub async fn create_embed(&self) -> Option<CreateEmbed> {
     let extension = self.get_extension();
 
-    let mut content = self.display().await.expect("Failed to get content");
-    content.shrink_to(4096 - 8 - extension.len());
+    if let Some(mut content) = self.display().await {
+      content.shrink_to(4096 - 8 - extension.len());
 
-    let description = format!("```{}\n{}\n```", extension, content);
+      let description = format!("```{}\n{}\n```", extension, content);
 
-    let mut default = CreateEmbed::default();
-    default.title(self.path)
-      .description(description)
-      .colour(ACCENT_COLOUR);
+      let mut default = CreateEmbed::default();
+      default.title(self.path)
+        .description(description)
+        .colour(ACCENT_COLOUR);
 
-    default
+      Some(default)
+    } else {
+      None
+    }
   }
 
   fn get_extension(&self) -> String {
@@ -131,9 +136,13 @@ impl FileReference<'_> {
       let start = self.start - 1;
 
       if let Some(end) = self.end {
-        return Some(trim_indent(&lines[start..=end]))
+        if end <= start {
+          None
+        } else {
+          Some(trim_indent(&lines[start..end]))
+        }
       } else {
-        return Some(lines[start].trim_start().to_string())
+        Some(lines[start].trim_start().to_string())
       }
     } else {
       None

src/events/issue.rs

@@ -5,6 +5,7 @@ use serenity::builder::CreateEmbed;
 use serenity::model::prelude::Message;
 use serenity::prelude::Context;
 use serenity::utils::Colour;
+use crate::structures::Embeddable;
 
 const REPO_OWNER: &str = "OpenTabletDriver";
 const REPO_NAME: &str = "OpenTabletDriver";
@@ -62,10 +63,9 @@ async fn issue_embeds(message: &Message) -> Option<Vec<CreateEmbed>> {
   }
 }
 
-trait Embeddable {
-  fn embed(&self) -> CreateEmbed;
+trait Document {
   fn get_title(&self) -> String;
-  fn get_description(&self) -> String;
+  fn get_content(&self) -> String;
   fn get_colour(&self) -> Colour;
   fn get_labels(&self) -> Option<String>;
 }
@@ -74,8 +74,8 @@ impl Embeddable for Issue {
   fn embed(&self) -> CreateEmbed {
     let mut default = CreateEmbed::default();
     let embed = default
-      .title(format!("#{}: {}", self.number, self.title))
-      .description(self.get_description())
+      .title(self.get_title())
+      .description(self.get_content())
       .url(self.html_url.as_str())
       .colour(self.get_colour())
       .author(|a| a
@@ -94,12 +94,14 @@ impl Embeddable for Issue {
 
     embed.to_owned()
   }
+}
 
+impl Document for Issue {
   fn get_title(&self) -> String {
     format!("#{}: {}", self.number, self.title)
   }
 
-  fn get_description(&self) -> String {
+  fn get_content(&self) -> String {
     let body = self.body.as_deref().unwrap_or_default();
 
     let mut description = String::default();
@@ -139,7 +141,7 @@ impl Embeddable for PullRequest {
     let mut default = CreateEmbed::default();
     let embed = default
       .title(self.get_title())
-      .description(self.get_description())
+      .description(self.get_content())
       .colour(self.get_colour());
 
     if let Some(user) = &self.user {
@@ -164,24 +166,27 @@ impl Embeddable for PullRequest {
 
     embed.to_owned()
   }
+}
+
 
+impl Document for PullRequest {
   fn get_title(&self) -> String {
     match &self.title {
       Some(title) => format!("#{}: {}", self.number, title),
       None => format!("#{}", self.number)
     }
   }
 
-  fn get_description(&self) -> String {
+  fn get_content(&self) -> String {
     let body = self.body.as_deref().unwrap_or_default();
 
-    let mut description = String::default();
+    let mut content = String::default();
     for line in body.split("\n").take(15) {
-      description.push_str(&format!("{}\n", line));
+      content.push_str(&format!("{}\n", line));
     }
 
-    description.shrink_to(4096);
-    description
+    content.shrink_to(4096);
+    content
   }
 
   fn get_colour(&self) -> Colour {

src/structures.rs

@@ -1,5 +1,6 @@
 use serde_json::{from_reader, to_writer_pretty};
 use serde::{Deserialize, Serialize};
+use serenity::builder::CreateEmbed;
 use serenity::client::bridge::gateway::ShardManager;
 use serenity::prelude::{TypeMapKey, Mutex};
 use std::env;
@@ -13,6 +14,10 @@ impl TypeMapKey for ShardManagerContainer {
   type Value = Arc<Mutex<ShardManager>>;
 }
 
+pub trait Embeddable {
+  fn embed(&self) -> CreateEmbed;
+}
+
 #[derive(Deserialize, Serialize, Clone)]
 pub struct Snippet {
   pub id: String,