xevion/r2park
1
0
Fork 0
mirror of https://github.com/Xevion/r2park.git synced 2025-12-07 22:08:04 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix submission context identifier acquisition/parse, use RegisterVehicle email API

Browse Source
This commit is contained in:
Xevion
2024-02-28 04:36:59 -06:00
parent e41878f070
commit 980f4ebead
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
submit.go
View File

@@ -2,6 +2,7 @@ package main
import ( import (
"strconv" "strconv"
"strings"
"github.com/bwmarrin/discordgo" "github.com/bwmarrin/discordgo"
"github.com/samber/lo" "github.com/samber/lo"
@@ -31,7 +32,6 @@ func RegisterModalHandler(session *discordgo.Session, interaction *discordgo.Int
}) })
log.Infof("dataByCustomID: %+v", dataByCustomID) log.Infof("dataByCustomID: %+v", dataByCustomID)
// email := dataByCustomID["email"].(*discordgo.TextInput).Value
// Collect the form parameters provided by the user // Collect the form parameters provided by the user
formParams := map[string]string{} formParams := map[string]string{}
@@ -44,14 +44,21 @@ func RegisterModalHandler(session *discordgo.Session, interaction *discordgo.Int
formParams[fieldName] = component.(*discordgo.TextInput).Value formParams[fieldName] = component.(*discordgo.TextInput).Value
} }
// The ID of the original interaction is used as the identifier for the registration context (uint64) // The custom ID of the interaction response is the original identifier (register:\d+)
registerIdentifier, parseErr := strconv.ParseUint(interaction.ID, 10, 64) _, identifier, _ := strings.Cut(data.CustomID, ":")
originalIdentifier, parseErr := strconv.ParseUint(identifier, 10, 64)
if parseErr != nil { if parseErr != nil {
HandleError(session, interaction, parseErr, "Error occurred while parsing interaction message identifier") HandleError(session, interaction, parseErr, "Failed to parse original identifier")
return
} }
// Get the context that we stored prior to emitting the modal // Get the contextInterface that we stored prior to emitting the modal
context := SubmissionContexts.GetValue(registerIdentifier).(*RegisterContext) contextInterface := SubmissionContexts.GetValue(originalIdentifier)
if contextInterface == nil {
HandleError(session, interaction, nil, "Failed to retrieve registration context")
return
}
context := contextInterface.(*RegisterContext)
// Register the vehicle // Register the vehicle
result, err := RegisterVehicle(formParams, context.propertyId, context.residentId, context.hiddenKeys) result, err := RegisterVehicle(formParams, context.propertyId, context.residentId, context.hiddenKeys)
@@ -61,7 +68,20 @@ func RegisterModalHandler(session *discordgo.Session, interaction *discordgo.Int
return return
} }
log.Infof("RegisterVehicle result: %+v", result) // Send email confirmation if an email was provided
email := dataByCustomID["email"].(*discordgo.TextInput).Value
if email != "" {
success, err := RegisterEmailConfirmation(email, result.vehicleId, strconv.Itoa(int(context.propertyId)))
if err != nil {
HandleError(session, interaction, err, "Failed to send email confirmation")
return
}
if !success {
HandleError(session, interaction, nil, "Failed to send email confirmation")
return
}
}
// TODO: Edit response to indicate success/failure // TODO: Edit response to indicate success/failure
// TODO: Validate license plate // TODO: Validate license plate