defered timed message deleted

ritsec · Sep 14, 2023 · 322f5c1 · 322f5c1
1 parent 4f006b9
commit 322f5c1
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 12 deletions.
diff --git a/commands/slash/kudos.go b/commands/slash/kudos.go
@@ -161,14 +161,16 @@ func Kudos() *structs.SlashCommand {
 				logging.Error(s, err.Error(), i.Member.User, span, logrus.Fields{"error": err})
 			}
 
-			wg.Wait()
+			defer func() {
+				err = s.ChannelMessageDelete(KudosApprovalChannelID, approvalMessage.ID)
+				if err != nil {
+					logging.Error(s, "Error deleting channel message", i.Member.User, span, logrus.Fields{"error": err})
+				}
+				delete(*ComponentHandlers, approve_slug)
+				delete(*ComponentHandlers, deny_slug)
+			}()
 
-			err = s.ChannelMessageDelete(KudosApprovalChannelID, approvalMessage.ID)
-			if err != nil {
-				logging.Error(s, "Error deleting channel message", i.Member.User, span, logrus.Fields{"error": err})
-			}
-			delete(*ComponentHandlers, approve_slug)
-			delete(*ComponentHandlers, deny_slug)
+			wg.Wait()
 		},
 	}
 }
diff --git a/commands/slash/signin.go b/commands/slash/signin.go
@@ -231,12 +231,14 @@ func Signin() *structs.SlashCommand {
 				logging.Error(s, err.Error(), i.Member.User, span, logrus.Fields{"error": err})
 			}
 
-			time.Sleep(time.Duration(delay) * time.Hour)
+			defer func() {
+				err = s.ChannelMessageDelete(i.ChannelID, message.ID)
+				if err != nil {
+					logging.Error(s, "Error encounted while deleting message\n\n"+err.Error(), i.Member.User, span, logrus.Fields{"error": err})
+				}
+			}()
 
-			err = s.ChannelMessageDelete(i.ChannelID, message.ID)
-			if err != nil {
-				logging.Error(s, "Error encounted while deleting message\n\n"+err.Error(), i.Member.User, span, logrus.Fields{"error": err})
-			}
+			time.Sleep(time.Duration(delay) * time.Hour)
 		},
 	}
 }