mirror of
https://github.com/Mezeporta/Erupe.git
synced 2026-03-21 23:22:34 +01:00
8fead0b1f3
Several handler files discarded errors from repository and service calls, creating nil-dereference risks and silent data corruption: - guild_adventure: 3 GetByCharID calls could panic on nil guild - gacha: GetGachaPoints silently returned zero balances on DB error - house: HasApplication called before nil check on guild; GetHouseContents error discarded with 7 return values - distitem: 3 distRepo calls had no error logging - guild_ops: Disband/Leave service errors were invisible - shop: gacha type/weight/fpoint lookups had no error logging - discord: bcrypt error could result in nil password being set
100 lines
3.2 KiB
Go
100 lines
3.2 KiB
Go
package channelserver
|
|
|
|
import (
|
|
"fmt"
|
|
"github.com/bwmarrin/discordgo"
|
|
"golang.org/x/crypto/bcrypt"
|
|
"strings"
|
|
"unicode"
|
|
)
|
|
|
|
// onInteraction handles slash commands
|
|
func (s *Server) onInteraction(ds *discordgo.Session, i *discordgo.InteractionCreate) {
|
|
switch i.Interaction.ApplicationCommandData().Name {
|
|
case "link":
|
|
_, err := s.userRepo.LinkDiscord(i.Member.User.ID, i.ApplicationCommandData().Options[0].StringValue())
|
|
if err == nil {
|
|
_ = ds.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
|
|
Type: discordgo.InteractionResponseChannelMessageWithSource,
|
|
Data: &discordgo.InteractionResponseData{
|
|
Content: "Your Erupe account was linked successfully.",
|
|
Flags: discordgo.MessageFlagsEphemeral,
|
|
},
|
|
})
|
|
} else {
|
|
_ = ds.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
|
|
Type: discordgo.InteractionResponseChannelMessageWithSource,
|
|
Data: &discordgo.InteractionResponseData{
|
|
Content: "Failed to link Erupe account.",
|
|
Flags: discordgo.MessageFlagsEphemeral,
|
|
},
|
|
})
|
|
}
|
|
case "password":
|
|
password, err := bcrypt.GenerateFromPassword([]byte(i.ApplicationCommandData().Options[0].StringValue()), 10)
|
|
if err != nil {
|
|
_ = ds.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
|
|
Type: discordgo.InteractionResponseChannelMessageWithSource,
|
|
Data: &discordgo.InteractionResponseData{
|
|
Content: "Failed to hash password.",
|
|
Flags: discordgo.MessageFlagsEphemeral,
|
|
},
|
|
})
|
|
return
|
|
}
|
|
err = s.userRepo.SetPasswordByDiscordID(i.Member.User.ID, password)
|
|
if err == nil {
|
|
_ = ds.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
|
|
Type: discordgo.InteractionResponseChannelMessageWithSource,
|
|
Data: &discordgo.InteractionResponseData{
|
|
Content: "Your Erupe account password has been updated.",
|
|
Flags: discordgo.MessageFlagsEphemeral,
|
|
},
|
|
})
|
|
} else {
|
|
_ = ds.InteractionRespond(i.Interaction, &discordgo.InteractionResponse{
|
|
Type: discordgo.InteractionResponseChannelMessageWithSource,
|
|
Data: &discordgo.InteractionResponseData{
|
|
Content: "Failed to update Erupe account password.",
|
|
Flags: discordgo.MessageFlagsEphemeral,
|
|
},
|
|
})
|
|
}
|
|
}
|
|
}
|
|
|
|
// onDiscordMessage handles receiving messages from discord and forwarding them ingame.
|
|
func (s *Server) onDiscordMessage(ds *discordgo.Session, m *discordgo.MessageCreate) {
|
|
// Ignore messages from bots, or messages that are not in the correct channel.
|
|
if m.Author.Bot || m.ChannelID != s.erupeConfig.Discord.RelayChannel.RelayChannelID {
|
|
return
|
|
}
|
|
|
|
paddedName := strings.TrimSpace(strings.Map(func(r rune) rune {
|
|
if r > unicode.MaxASCII {
|
|
return -1
|
|
}
|
|
return r
|
|
}, m.Author.Username))
|
|
for i := 0; i < 8-len(m.Author.Username); i++ {
|
|
paddedName += " "
|
|
}
|
|
message := s.discordBot.NormalizeDiscordMessage(fmt.Sprintf("[D] %s > %s", paddedName, m.Content))
|
|
if len(message) > s.erupeConfig.Discord.RelayChannel.MaxMessageLength {
|
|
return
|
|
}
|
|
|
|
var messages []string
|
|
lineLength := 61
|
|
for i := 0; i < len(message); i += lineLength {
|
|
end := i + lineLength
|
|
if end > len(message) {
|
|
end = len(message)
|
|
}
|
|
messages = append(messages, message[i:end])
|
|
}
|
|
for i := range messages {
|
|
s.BroadcastChatMessage(messages[i])
|
|
}
|
|
}
|