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

fix(sqlite,guilddb): ChannelGroup json parsing

Browse Source
This commit is contained in:
Gustavo "Guz" L. de Mello
2024-08-20 16:09:11 -03:00
parent ff98782492
commit 4111f6fd36
1 changed files with 6 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
internals/guilddb/sqlite.go
View File

@@ -279,12 +279,12 @@ func (db *SQLiteDB) ChannelDelete(c Channel) error {
}
func (db *SQLiteDB) ChannelGroup(guildID, channelID string) (ChannelGroup, error) {
var g string
var j string
err := db.sql.QueryRow(fmt.Sprintf(`
SELECT Channels FROM channelGroups, json_each(Channels)
WHERE "GuildID" = $1 AND json_each.value='%s';
`, channelID), guildID).Scan(&g)
`, channelID), guildID).Scan(&j)
if errors.Is(err, sql.ErrNoRows) {
return ChannelGroup{}, errors.Join(ErrNotFound, err)
@@ -292,12 +292,10 @@ func (db *SQLiteDB) ChannelGroup(guildID, channelID string) (ChannelGroup, error
return ChannelGroup{}, errors.Join(ErrInternal, err)
}
ids := strings.Split(g, ",")
if !slices.IsSorted(ids) {
return ChannelGroup{}, errors.Join(
ErrInvalidObject,
fmt.Errorf("Channel in database is invalid, ids are not sorted: %s", ids),
)
var ids []string
err = json.Unmarshal([]byte(j), &ids)
if err != nil {
return ChannelGroup{}, errors.Join(ErrInternal, err)
}
for i, v := range ids {
ids[i] = fmt.Sprintf("\"ID\" = %s", v)