Fixed sqlc codegen issues

7 files changed, 29 insertions, 30 deletions

diff --git a/cmd/server/main.go b/cmd/server/main.go
index 6ac03ea..fa04d69 100644
--- a/cmd/server/main.go
+++ b/cmd/server/main.go
@@ -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)
 	}
 }
diff --git a/internal/data/frequencies.sql.go b/internal/data/frequencies.sql.go
index 3782309..7460e01 100644
--- a/internal/data/frequencies.sql.go
+++ b/internal/data/frequencies.sql.go
@@ -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 {
diff --git a/internal/data/networks.sql.go b/internal/data/networks.sql.go
index 5e1e0db..70ee823 100644
--- a/internal/data/networks.sql.go
+++ b/internal/data/networks.sql.go
@@ -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
 `
 
diff --git a/internal/packet/types.go b/internal/packet/types.go
index 031e983..98db72a 100644
--- a/internal/packet/types.go
+++ b/internal/packet/types.go
@@ -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 {
diff --git a/internal/server/api/api.go b/internal/server/api/api.go
index fba6cdf..5d79f16 100644
--- a/internal/server/api/api.go
+++ b/internal/server/api/api.go
@@ -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},
 	}
 }
-
diff --git a/query/frequencies.sql b/query/frequencies.sql
index 6e67c24..464f371 100644
--- a/query/frequencies.sql
+++ b/query/frequencies.sql
@@ -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
diff --git a/query/networks.sql b/query/networks.sql
index 0b0303f..b2720b7 100644
--- a/query/networks.sql
+++ b/query/networks.sql
@@ -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 *;