Kyren223/eko
1
1
Fork 0
mirror of https://github.com/Kyren223/eko.git synced 2026-04-30 08:33:56 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed sqlc codegen issues

Browse Source
This commit is contained in:
Kyren223
2024-11-27 21:29:09 +02:00
parent 180bb557b1
commit 82533fa7a5
7 changed files with 29 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
cmd/server/main.go
View File

@@ -46,8 +46,8 @@ func main() {
cancel()
}()
server := server.NewServer(port)
if err := server.Run(ctx); err != nil {
server := server.NewServer(ctx, port)
if err := server.Run(); err != nil {
log.Println(err)
}
}

10
internal/data/frequencies.sql.go
View File

@@ -17,8 +17,8 @@ INSERT INTO frequencies (
name, hex_color,
perms, position
) VALUES (
?, ?, ?, ?, ?,
(SELECT COUNT(*) FROM frequencies WHERE network_id = ?)
?1, ?2, ?3, ?4, ?5,
(SELECT COUNT(*) FROM frequencies WHERE network_id = ?2)
)
RETURNING id, network_id, name, hex_color, perms, position
`
@@ -195,10 +195,10 @@ func (q *Queries) SetFrequencyPerms(ctx context.Context, arg SetFrequencyPermsPa
const swapFrequencies = `-- name: SwapFrequencies :exec
UPDATE frequencies SET
position = CASE
WHEN position = ? THEN ?
WHEN position = ? THEN ?
WHEN position = ?1 THEN ?2
WHEN position = ?2 THEN ?1
END
WHERE network_id = ? AND position IN (?, ?)
WHERE network_id = ?3 AND position IN (?1, ?2)
`
type SwapFrequenciesParams struct {

14
internal/data/networks.sql.go
View File

@@ -16,7 +16,7 @@ INSERT INTO networks (
id, owner_id, name, is_public,
icon, bg_hex_color, fg_hex_color
) VALUES (
?, ?, ?, ?,
?, ?, ?, ?,
?, ?, ?
)
RETURNING id, owner_id, name, icon, bg_hex_color, fg_hex_color, is_public
@@ -312,15 +312,15 @@ INSERT INTO users_networks (
is_member, is_admin, is_muted,
is_banned, ban_reason
) VALUES (
?, ?,
?, ?, ?,
?, ?
?1, ?2,
?3, ?4, ?5,
?6, ?7
)
ON CONFLICT DO
UPDATE SET
is_member = ?, is_admin = ?, is_muted = ?,
is_banned = ?, ban_reason = ?
WHERE user_id = ? AND network_id = ?
is_member = ?3, is_admin = ?4, is_muted = ?5,
is_banned = ?6, ban_reason = ?7
WHERE user_id = ?1 AND network_id = ?2
RETURNING user_id, network_id, joined_at, is_member, is_admin, is_muted, is_banned, ban_reason
`

4
internal/packet/types.go
View File

@@ -73,7 +73,7 @@ type Member struct {
}
type FullNetwork struct {
Network data.Network
data.Network
Frequencies []data.Frequency
Members []Member
}
@@ -137,8 +137,8 @@ func (m *SendMessage) Type() PacketType {
}
type EditMessage struct {
Message snowflake.ID
Content string
Message snowflake.ID
}
func (m *EditMessage) Type() PacketType {

9
internal/server/api/api.go
View File

@@ -116,7 +116,7 @@ func CreateNetwork(ctx context.Context, sess *session.Session, request *packet.C
FgHexColor: request.FgHexColor,
})
if err != nil {
log.Println("database error:", err)
log.Println("database error 1:", err)
return &internalError
}
@@ -128,7 +128,7 @@ func CreateNetwork(ctx context.Context, sess *session.Session, request *packet.C
Perms: PermReadWrite,
})
if err != nil {
log.Println("database error:", err)
log.Println("database error 2:", err)
return &internalError
}
@@ -142,13 +142,13 @@ func CreateNetwork(ctx context.Context, sess *session.Session, request *packet.C
BanReason: nil,
})
if err != nil {
log.Println("database error:", err)
log.Println("database error 3:", err)
return &internalError
}
user, err := qtx.GetUserById(ctx, network.OwnerID)
if err != nil {
log.Println("database error:", err)
log.Println("database error 4:", err)
return &internalError
}
@@ -166,4 +166,3 @@ func CreateNetwork(ctx context.Context, sess *session.Session, request *packet.C
Networks: []packet.FullNetwork{fullNetwork},
}
}

4
query/frequencies.sql
View File

@@ -12,7 +12,7 @@ INSERT INTO frequencies (
name, hex_color,
perms, position
) VALUES (
?, @network_id, ?, ?, ?,
@id, @network_id, @name, @hex_color, @perms,
(SELECT COUNT(*) FROM frequencies WHERE network_id = @network_id)
)
RETURNING *;
@@ -23,7 +23,7 @@ UPDATE frequencies SET
WHEN position = @pos1 THEN @pos2
WHEN position = @pos2 THEN @pos1
END
WHERE network_id = ? AND position IN (@pos1, @pos2);
WHERE network_id = @network_id AND position IN (@pos1, @pos2);
-- name: SetFrequencyName :one
UPDATE frequencies SET

14
query/networks.sql
View File

@@ -11,7 +11,7 @@ INSERT INTO networks (
id, owner_id, name, is_public,
icon, bg_hex_color, fg_hex_color
) VALUES (
?, ?, ?, ?,
?, ?, ?, ?,
?, ?, ?
)
RETURNING *;
@@ -69,13 +69,13 @@ INSERT INTO users_networks (
is_member, is_admin, is_muted,
is_banned, ban_reason
) VALUES (
?, ?,
?, ?, ?,
?, ?
?1, ?2,
?3, ?4, ?5,
?6, ?7
)
ON CONFLICT DO
UPDATE SET
is_member = ?, is_admin = ?, is_muted = ?,
is_banned = ?, ban_reason = ?
WHERE user_id = ? AND network_id = ?
is_member = ?3, is_admin = ?4, is_muted = ?5,
is_banned = ?6, ban_reason = ?7
WHERE user_id = ?1 AND network_id = ?2
RETURNING *;