Fixed everything on the server-side

1 files changed, 13 insertions, 2 deletions

diff --git a/internal/server/api/helpers.go b/internal/server/api/helpers.go
index 0ab6ae5..f98e2ad 100644
--- a/internal/server/api/helpers.go
+++ b/internal/server/api/helpers.go
@@ -33,9 +33,9 @@ func isValidHexColor(color string) (bool, string) {
 }
 
 func IsNetworkAdmin(ctx context.Context, queries *data.Queries, userId, networkId snowflake.ID) (bool, error) {
-	userNetwork, err := queries.GetUserNetwork(ctx, data.GetUserNetworkParams{
-		UserID:    userId,
+	userNetwork, err := queries.GetMemberById(ctx, data.GetMemberByIdParams{
 		NetworkID: networkId,
+		UserID:    userId,
 	})
 	if err != nil {
 		return false, err
@@ -87,3 +87,14 @@ func NetworkPropagate(
 
 	return payload
 }
+
+func SplitMembersAndUsers(membersAndUsers []data.GetNetworkMembersRow) ([]data.Member, []data.User) {
+	members := make([]data.Member, 0, len(membersAndUsers))
+	users := make([]data.User, 0, len(membersAndUsers))
+	for _, memberAndUser := range membersAndUsers {
+		members = append(members, memberAndUser.Member)
+		users = append(users, memberAndUser.User)
+	}
+
+	return members, users
+}