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/models.go       | 12 ++++--------
 internal/data/networks.sql.go | 19 ++++++++-----------
 internal/data/users.sql.go    |  2 +-
 3 files changed, 13 insertions(+), 20 deletions(-)

(limited to 'internal/data')

diff --git a/internal/data/models.go b/internal/data/models.go
index 4bfb7a5..e6fac50 100644
--- a/internal/data/models.go
+++ b/internal/data/models.go
@@ -37,18 +37,11 @@ type Network struct {
 	IsPublic   bool
 }
 
-type NetworkBannedUser struct {
-	NetworkID    snowflake.ID
-	BannedUserID snowflake.ID
-	BannedAt     string
-	Reason       *string
-}
-
 type User struct {
 	ID          snowflake.ID
 	Name        string
 	PublicKey   ed25519.PublicKey
-	Description *string
+	Description string
 	IsPublicDM  bool
 	IsDeleted   bool
 }
@@ -68,6 +61,9 @@ type UsersNetwork struct {
 	UserID    snowflake.ID
 	NetworkID snowflake.ID
 	JoinedAt  string
+	IsMember  bool
 	IsAdmin   bool
 	IsMuted   bool
+	IsBanned  bool
+	BanReason *string
 }
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 {
diff --git a/internal/data/users.sql.go b/internal/data/users.sql.go
index 4411a80..33eab3f 100644
--- a/internal/data/users.sql.go
+++ b/internal/data/users.sql.go
@@ -117,7 +117,7 @@ RETURNING id, name, public_key, description, is_public_dm, is_deleted
 `
 
 type SetUserDescriptionParams struct {
-	Description *string
+	Description string
 	ID          snowflake.ID
 }
 
-- 
cgit v1.3.1