Merge pull request #7 from OpenTabletDriver/bugfix/stop-typing-error

Only start typing when actively sending message

Author: InfinityGhost

src/events/issue.rs

@@ -14,15 +14,20 @@ const RESOLVED_COLOUR: Colour = Colour(0x8957e5);
 const CLOSED_COLOUR: Colour = Colour(0xda3633);
 
 pub async fn message(ctx: &Context, message: &Message) {
-  if let Some(embeds) = issue_embeds(ctx, message).await {
+  if let Some(embeds) = issue_embeds(message).await {
+    let typing = message.channel_id.start_typing(&ctx.http)
+      .expect("Failed to start typing");
+
     message.channel_id.send_message(&ctx.http, |f| f
       .reference_message(message)
       .set_embeds(embeds)
     ).await.expect("Failed to reply with github embed");
+
+    typing.stop().expect("Failed to stop typing");
   }
 }
 
-async fn issue_embeds(ctx: &Context, message: &Message) -> Option<Vec<CreateEmbed>> {
+async fn issue_embeds(message: &Message) -> Option<Vec<CreateEmbed>> {
   let mut embeds: Vec<CreateEmbed> = vec![];
   let client = octocrab::instance();
   let ratelimit = client.ratelimit();
@@ -34,9 +39,6 @@ async fn issue_embeds(ctx: &Context, message: &Message) -> Option<Vec<CreateEmbe
 
   for capture in regex.captures_iter(&message.content) {
     if let Some(m) = capture.get(1) {
-      let typing = message.channel_id.start_typing(&ctx.http)
-        .expect("Failed to start typing");
-
       let issue_num = m.as_str().parse::<u64>()
         .expect("Match is not a number");
 
@@ -50,8 +52,6 @@ async fn issue_embeds(ctx: &Context, message: &Message) -> Option<Vec<CreateEmbe
           embeds.push(issue.embed());
         }
       }
-
-      typing.stop().expect("Failed to stop typing");
     }
   }
 

src/structures/state.rs

@@ -1,7 +1,8 @@
 use serde_json::{from_reader, to_writer_pretty};
 use serde::{Deserialize, Serialize};
-use std::{path::Path, fs::{File, OpenOptions}};
-use super::{Snippet};
+use std::fs::{self, File, OpenOptions };
+use std::path::Path;
+use super::Snippet;
 
 #[derive(Deserialize, Serialize)]
 pub struct State {
@@ -30,6 +31,11 @@ impl State {
 
   pub fn write(&self, file_path: &str) {
     let path = Path::new(file_path);
+
+    if path.exists() {
+      fs::remove_file(path).expect("Failed to delete old file.");
+    }
+
     let result = OpenOptions::new()
       .read(true)
       .write(true)