fix: tag discord user (#5)

dwarvesf · Dec 23, 2024 · 0a009bc · 0a009bc
1 parent b7aad9a
commit 0a009bc
Showing 1 changed file with 6 additions and 4 deletions.
diff --git a/internal/discord/client.go b/internal/discord/client.go
@@ -49,15 +49,17 @@ func (d *Client) HandleNewAccessRequest(r types.AccessRequest) error {
 		fmt.Printf("Failed to get approvers: %v\n", err)
 	} else {
 		for _, a := range approvers {
-			approverIDs += fmt.Sprintf("<@%s> ", a.DiscordID)
+			if a.TlpUsername != r.GetUser() {
+				approverIDs += fmt.Sprintf("<@%s> ", a.DiscordID)
+			}
 		}
 	}
 
 	requester := r.GetUser()
 
 	dbRequester, err := repo.GetUserByTlpUsername(requester)
 	if err == nil {
-		requester = dbRequester.DiscordName
+		requester = fmt.Sprintf("<@%s>", dbRequester.DiscordID)
 	}
 
 	fields := []discordwebhook.Field{
@@ -116,7 +118,7 @@ func (d *Client) HandleApproveAccessRequest(r types.AccessRequest) error {
 
 	dbRequester, err := repo.GetUserByTlpUsername(requester)
 	if err == nil {
-		requester = dbRequester.DiscordName
+		requester = fmt.Sprintf("<@%s>", dbRequester.DiscordID)
 	}
 
 	embed := discordwebhook.Embed{
@@ -159,7 +161,7 @@ func (d *Client) HandleDenyAccessRequest(r types.AccessRequest) error {
 
 	dbRequester, err := repo.GetUserByTlpUsername(requester)
 	if err == nil {
-		requester = dbRequester.DiscordName
+		requester = fmt.Sprintf("<@%s>", dbRequester.DiscordID)
 	}
 
 	embed := discordwebhook.Embed{