Remove APIMemberArray

5 files changed, 5 insertions, 17 deletions

diff --git a/assets/openapi.json b/assets/openapi.json

index b13eba95..91807e0b 100644
--- a/assets/openapi.json
+++ b/assets/openapi.json
@@ -4906,12 +4906,6 @@
                     "$ref": "#/components/schemas/Channel"
                 }
             },
-            "APIMemberArray": {
-                "type": "array",
-                "items": {
-                    "$ref": "#/components/schemas/Member"
-                }
-            },
             "APIGuildWithJoinedAt": {
                 "type": "object",
                 "properties": {
@@ -21716,7 +21710,7 @@
                         "content": {
                             "application/json": {
                                 "schema": {
-                                    "$ref": "#/components/schemas/APIMemberArray"
+                                    "$ref": "#/components/schemas/PublicMemberArray"
                                 }
                             }
                         }
diff --git a/assets/schemas.json b/assets/schemas.json

index 9a21b5bf..6b696fd4 100644
--- a/assets/schemas.json
+++ b/assets/schemas.json
@@ -5205,13 +5205,6 @@
         },
         "$schema": "http://json-schema.org/draft-07/schema#"
     },
-    "APIMemberArray": {
-        "type": "array",
-        "items": {
-            "$ref": "#/definitions/Member"
-        },
-        "$schema": "http://json-schema.org/draft-07/schema#"
-    },
     "APIGuildWithJoinedAt": {
         "type": "object",
         "properties": {
diff --git a/src/api/routes/guilds/#guild_id/members/index.ts b/src/api/routes/guilds/#guild_id/members/index.ts

index 3c97a289..8373265e 100644
--- a/src/api/routes/guilds/#guild_id/members/index.ts
+++ b/src/api/routes/guilds/#guild_id/members/index.ts
@@ -42,7 +42,7 @@ router.get(
         },
         responses: {
             200: {
-                body: "APIMemberArray",
+                body: "PublicMemberArray",
             },
             403: {
                 body: "APIErrorResponse",
@@ -65,7 +65,7 @@ router.get(
             order: { id: "ASC" },
         });
 
-        return res.json(members);
+        return res.json(members.map((m) => m.toPublicMember()));
     },
 );
 
diff --git a/src/schemas/api/users/Member.ts b/src/schemas/api/users/Member.ts

index 0cfaa0c9..f6778509 100644
--- a/src/schemas/api/users/Member.ts
+++ b/src/schemas/api/users/Member.ts
@@ -115,3 +115,5 @@ export type PublicMember = Omit<Pick<Member, PublicMemberKeys>, "roles"> & {
     user: PublicUser;
     roles: string[]; // only role ids not objects
 };
+
+export type PublicMemberArray = PublicMember[];
diff --git a/src/schemas/responses/TypedResponses.ts b/src/schemas/responses/TypedResponses.ts

index afc147cf..2cf9d6f8 100644
--- a/src/schemas/responses/TypedResponses.ts
+++ b/src/schemas/responses/TypedResponses.ts
@@ -45,7 +45,6 @@ export type APIWebhookArray = Webhook[];
 export type APIDiscoveryCategoryArray = Categories[];
 export type APIGeneralConfiguration = GeneralConfiguration;
 export type APIChannelArray = Channel[];
-export type APIMemberArray = Member[];
 
 export interface APIGuildWithJoinedAt extends GuildCreateResponse {
     joined_at: string;