Merge remote-tracking branch 'origin/main' into better-themes

types/interfaces.ts

@@ -31,6 +31,13 @@ export interface GuildMemberResponse {
 	user: UserResponse
 }
 
+export interface GuildMembersResponse {
+	objects: GuildMemberResponse[],
+	amount: number,
+	pages: number,
+	page: number
+}
+
 export interface ChannelResponse {
 	uuid: string,
 	guild_uuid: string,
@@ -45,7 +52,7 @@ export interface MessageResponse {
 	user_uuid: string,
 	message: string,
 	reply_to: string | null,
-	user: UserResponse,
+	member: GuildMemberResponse,
 }
 
 export interface InviteResponse {

types/props.ts

@@ -1,9 +1,9 @@
-import type { MessageResponse, UserResponse } from "./interfaces";
+import type { GuildMemberResponse, MessageResponse, UserResponse } from "./interfaces";
 
 export interface MessageProps {
 	class?: string,
 	img?: string | null,
-	author: UserResponse
+	author: GuildMemberResponse
 	text: string,
 	timestamp: number,
 	format: "12" | "24",