From 8ed2527a8879e01f4f3f741feebaf86fee2bf18d Mon Sep 17 00:00:00 2001
From: Kyren223 <Kyren223@proton.me>
Date: Wed, 27 Nov 2024 07:47:30 +0200
Subject: Started working on refactoring packet types and some changes to the
 SQL schema

---
 internal/data/networks.sql.go | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'internal/data/networks.sql.go')

diff --git a/internal/data/networks.sql.go b/internal/data/networks.sql.go
index d690b7b..8064fa9 100644
--- a/internal/data/networks.sql.go
+++ b/internal/data/networks.sql.go
@@ -67,17 +67,15 @@ func (q *Queries) DeleteNetwork(ctx context.Context, id snowflake.ID) error {
 const getBannedUsersInNetwork = `-- name: GetBannedUsersInNetwork :many
 SELECT
   users.id, users.name, users.public_key, users.description, users.is_public_dm, users.is_deleted,
-  network_banned_users.banned_at,
-  network_banned_users.reason
-FROM network_banned_users
-JOIN users ON users.id = network_banned_users.banned_user_id
-WHERE network_banned_users.network_id = ?
+  users_networks.ban_reason
+FROM users_networks
+JOIN users ON users.id = users_networks.user_id
+WHERE users_networks.network_id = ?
 `
 
 type GetBannedUsersInNetworkRow struct {
-	User     User
-	BannedAt string
-	Reason   *string
+	User      User
+	BanReason *string
 }
 
 func (q *Queries) GetBannedUsersInNetwork(ctx context.Context, networkID snowflake.ID) ([]GetBannedUsersInNetworkRow, error) {
@@ -96,8 +94,7 @@ func (q *Queries) GetBannedUsersInNetwork(ctx context.Context, networkID snowfla
 			&i.User.Description,
 			&i.User.IsPublicDM,
 			&i.User.IsDeleted,
-			&i.BannedAt,
-			&i.Reason,
+			&i.BanReason,
 		); err != nil {
 			return nil, err
 		}
@@ -176,7 +173,7 @@ SELECT
   users_networks.is_muted
 FROM users_networks
 JOIN users ON users.id = users_networks.user_id
-WHERE users_networks.network_id = ?
+WHERE users_networks.network_id = ? AND is_member = true
 `
 
 type GetUsersInNetworkRow struct {
-- 
cgit v1.3.1