capytal/dislate
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

refactor: simplify error checking

Browse Source
This commit is contained in:
Gustavo "Guz" L. de Mello
2024-08-22 08:56:43 -03:00
parent 162d58f204
commit a1cf216e36
3 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
internals/discord/bot/commands/channels.go
View File

@@ -317,7 +317,7 @@ func (c ChannelsSetLang) Subcommands() []Command {
func getChannel(db guilddb.GuildDB, guildID, channelID string) (gdb.Channel, error) {
ch, err := db.Channel(guildID, channelID)
if err != nil && errors.Is(err, gdb.ErrNotFound) {
if errors.Is(err, gdb.ErrNotFound) {
if err := db.ChannelInsert(gdb.NewChannel(guildID, channelID, lang.EN)); err != nil {
return gdb.Channel{}, err
}
@@ -334,7 +334,7 @@ func getChannel(db guilddb.GuildDB, guildID, channelID string) (gdb.Channel, err
func getChannelInfo(db guilddb.GuildDB, ch gdb.Channel) (*dgo.MessageEmbed, error) {
group, err := db.ChannelGroup(ch.GuildID, ch.ID)
if err != nil && !errors.Is(err, gdb.ErrNotFound) {
if !errors.Is(err, gdb.ErrNotFound) {
return nil, err
}

8
internals/discord/bot/events/messages.go
View File

@@ -31,7 +31,7 @@ func (h MessageCreate) Serve(s *dgo.Session, e *dgo.MessageCreate) {
}
ch, err := h.db.Channel(e.GuildID, e.ChannelID)
if err != nil && errors.Is(err, guilddb.ErrNotFound) {
if errors.Is(err, guilddb.ErrNotFound) {
h.log.Debug("Channel is not in database, ignoring.", slog.String("guild", e.GuildID), slog.String("channel", e.ChannelID))
return
} else if err != nil {
@@ -44,7 +44,7 @@ func (h MessageCreate) Serve(s *dgo.Session, e *dgo.MessageCreate) {
}
gc, err := h.db.ChannelGroup(ch.GuildID, ch.ID)
if err != nil && errors.Is(err, guilddb.ErrNotFound) {
if errors.Is(err, guilddb.ErrNotFound) {
h.log.Debug("Channel is not in a group, ignoring.", slog.String("guild", e.GuildID), slog.String("channel", e.ChannelID))
return
} else if err != nil {
@@ -168,7 +168,7 @@ func (h MessageCreate) Serve(s *dgo.Session, e *dgo.MessageCreate) {
func (h MessageCreate) getMessage(m *dgo.Message, lang lang.Language) (guilddb.Message, error) {
msg, err := h.db.Message(m.GuildID, m.ChannelID, m.ID)
if err != nil && errors.Is(err, guilddb.ErrNotFound) {
if errors.Is(err, guilddb.ErrNotFound) {
if err := h.db.MessageInsert(guilddb.NewMessage(m.GuildID, m.ChannelID, m.ID, lang)); err != nil {
return guilddb.Message{}, err
}
@@ -185,7 +185,7 @@ func (h MessageCreate) getMessage(m *dgo.Message, lang lang.Language) (guilddb.M
func (h MessageCreate) getTranslatedMessage(m, original *dgo.Message, lang lang.Language) (guilddb.Message, error) {
msg, err := h.db.Message(m.GuildID, m.ChannelID, m.ID)
if err != nil && errors.Is(err, guilddb.ErrNotFound) {
if errors.Is(err, guilddb.ErrNotFound) {
if err := h.db.MessageInsert(guilddb.NewTranslatedMessage(
m.GuildID,
m.ChannelID,

2
internals/guilddb/sqlite.go
View File

@@ -468,7 +468,7 @@ func (db *SQLiteDB) Guild(ID string) (Guild, error) {
if err := db.sql.QueryRow(`
SELECT "ID" FROM guilds
WHERE "ID" = $1
`, ID).Scan(g.ID); err != nil && errors.Is(err, sql.ErrNoRows) {
`, ID).Scan(g.ID); errors.Is(err, sql.ErrNoRows) {
return Guild{}, errors.Join(ErrNotFound, err)
} else if err != nil {
return Guild{}, errors.Join(ErrInternal, err)