Autisticats/mautrix-discord
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Don't try to insert nothing into the database. Fixes #11

Browse Source
This commit is contained in:
Tulir Asokan
2022-07-02 23:18:49 +03:00
parent 152fb5c7ce
commit ac7be4bb4e
2 changed files with 8 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
database/message.go
View File

@@ -132,6 +132,9 @@ type MessagePart struct {
} }
func (m *Message) MassInsert(msgs []MessagePart) { func (m *Message) MassInsert(msgs []MessagePart) {
if len(msgs) == 0 {
return
}
valueStringFormat := "($1, $%d, $2, $3, $4, $5, $6, $7, $%d)" valueStringFormat := "($1, $%d, $2, $3, $4, $5, $6, $7, $%d)"
if m.db.Dialect == dbutil.SQLite { if m.db.Dialect == dbutil.SQLite {
valueStringFormat = strings.ReplaceAll(valueStringFormat, "$", "?") valueStringFormat = strings.ReplaceAll(valueStringFormat, "$", "?")

6
portal.go
View File

@@ -645,7 +645,11 @@ func (portal *Portal) handleDiscordMessageCreate(user *User, msg *discordgo.Mess
parts = append(parts, *part) parts = append(parts, *part)
} }
} }
portal.markMessageHandled(msg.ID, 0, msg.Author.ID, ts, threadID, parts) if len(parts) == 0 {
portal.log.Warnfln("Unhandled message %q", msg.ID)
} else {
portal.markMessageHandled(msg.ID, 0, msg.Author.ID, ts, threadID, parts)
}
} }
func (portal *Portal) handleDiscordMessageUpdate(user *User, msg *discordgo.Message) { func (portal *Portal) handleDiscordMessageUpdate(user *User, msg *discordgo.Message) {