fixed suggestion
This commit is contained in:
+24
-6
@@ -22,9 +22,16 @@ var SuggestCommand = &discordgo.ApplicationCommand{
|
|||||||
|
|
||||||
var timeToWait = time.Minute * time.Duration(5)
|
var timeToWait = time.Minute * time.Duration(5)
|
||||||
|
|
||||||
|
|
||||||
func HandleSuggest(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
func HandleSuggest(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
||||||
userID := i.Member.User.ID
|
var userID string
|
||||||
|
|
||||||
|
if i.Member != nil {
|
||||||
|
userID = i.Member.User.ID
|
||||||
|
} else if i.User != nil {
|
||||||
|
userID = i.User.ID
|
||||||
|
} else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
// Check cooldown from DB
|
// Check cooldown from DB
|
||||||
lastSubmission, err := helpers.GetLastSubmission(userID)
|
lastSubmission, err := helpers.GetLastSubmission(userID)
|
||||||
@@ -46,7 +53,7 @@ func HandleSuggest(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
err = helpers.RemoveUserSubmittions(userID);
|
err = helpers.RemoveUserSubmittions(userID)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
log.Default().Println(fmt.Sprintf("%s", err.Error()))
|
log.Default().Println(fmt.Sprintf("%s", err.Error()))
|
||||||
}
|
}
|
||||||
@@ -98,13 +105,24 @@ func HandleSuggestModal(s *discordgo.Session, i *discordgo.InteractionCreate) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Create payload
|
// Create payload
|
||||||
|
var senderID, senderUsername string
|
||||||
|
if i.Member != nil && i.Member.User != nil {
|
||||||
|
senderID = i.Member.User.ID
|
||||||
|
senderUsername = i.Member.User.Username
|
||||||
|
} else if i.User != nil {
|
||||||
|
senderID = i.User.ID
|
||||||
|
senderUsername = i.User.Username
|
||||||
|
} else {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
payload := map[string]string{
|
payload := map[string]string{
|
||||||
"content": fmt.Sprintf("**New Suggestion from <@%s> (%s)**\n```\n%s\n```",
|
"content": fmt.Sprintf("**New Suggestion from <@%s> (%s)**\n```\n%s\n```",
|
||||||
i.Member.User.ID,
|
senderID,
|
||||||
i.Member.User.Username,
|
senderUsername,
|
||||||
content),
|
content),
|
||||||
}
|
}
|
||||||
|
|
||||||
jsonData, err := json.Marshal(payload)
|
jsonData, err := json.Marshal(payload)
|
||||||
if err != nil {
|
if err != nil {
|
||||||
helpers.HandleError(s, i, fmt.Errorf("failed to marshal payload: %w", err))
|
helpers.HandleError(s, i, fmt.Errorf("failed to marshal payload: %w", err))
|
||||||
|
|||||||
Reference in New Issue
Block a user