From 481cf38373037415594dd86695f94a3aeb17406e Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Sun, 28 Jul 2024 05:48:21 +0200
Subject: [PATCH 1/5] Fix sort order when using ?around

---
 .../routes/channels/#channel_id/messages/index.ts  | 14 ++++++++++----
 1 file changed, 10 insertions(+), 4 deletions(-)

diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
index 645c6db2..d4635b1d 100644
--- a/src/api/routes/channels/#channel_id/messages/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -130,19 +130,25 @@ router.get(
 			query.take = Math.floor(limit / 2);
 			if (query.take != 0) {
 				const [right, left] = await Promise.all([
-					Message.find({ ...query, where: { id: LessThan(around) } }),
 					Message.find({
 						...query,
-						where: { id: MoreThanOrEqual(around) },
+						where: { channel_id, id: LessThan(around) },
+					}),
+					Message.find({
+						...query,
+						where: { channel_id, id: MoreThanOrEqual(around) },
+						order: { timestamp: "ASC" },
 					}),
 				]);
 				left.push(...right);
-				messages = left;
+				messages = left.sort(
+					(a, b) => a.timestamp.getTime() - b.timestamp.getTime(),
+				);
 			} else {
 				query.take = 1;
 				const message = await Message.findOne({
 					...query,
-					where: { id: around },
+					where: { channel_id, id: around },
 				});
 				messages = message ? [message] : [];
 			}

From b682f170b9e6156d7db66fc1527f451b734300db Mon Sep 17 00:00:00 2001
From: Cyber <mateusz.hf18@gmail.com>
Date: Sun, 21 Jul 2024 20:00:14 +0200
Subject: [PATCH 2/5] fix: return an error on username change with no password

---
 src/api/routes/users/@me/index.ts | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts
index ad11a428..95f572af 100644
--- a/src/api/routes/users/@me/index.ts
+++ b/src/api/routes/users/@me/index.ts
@@ -120,7 +120,7 @@ router.patch(
 			if (!body.password)
 				throw FieldErrors({
 					password: {
-						message: req.t("auth:register.INVALID_PASSWORD"),
+						message: req.t("auth:login.INVALID_PASSWORD"),
 						code: "INVALID_PASSWORD",
 					},
 				});
@@ -162,6 +162,15 @@ router.patch(
 			}
 		}
 
+		if (!body.password) {
+			throw FieldErrors({
+				password: {
+					message: req.t("auth:login.INVALID_PASSWORD"),
+					code: "INVALID_PASSWORD",
+				},
+			});
+		}
+
 		if (body.discriminator) {
 			if (
 				await User.findOne({

From f047f93b77f04a574380851cda5f361e6efb2310 Mon Sep 17 00:00:00 2001
From: Cyber <mateusz.hf18@gmail.com>
Date: Thu, 25 Jul 2024 19:41:56 +0200
Subject: [PATCH 3/5] fix: check for password only if `username` is present in
 body

---
 src/api/routes/users/@me/index.ts | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts
index 95f572af..cddc3a08 100644
--- a/src/api/routes/users/@me/index.ts
+++ b/src/api/routes/users/@me/index.ts
@@ -160,15 +160,15 @@ router.patch(
 					},
 				});
 			}
-		}
 
-		if (!body.password) {
-			throw FieldErrors({
-				password: {
-					message: req.t("auth:login.INVALID_PASSWORD"),
-					code: "INVALID_PASSWORD",
-				},
-			});
+			if (!body.password) {
+				throw FieldErrors({
+					password: {
+						message: req.t("auth:login.INVALID_PASSWORD"),
+						code: "INVALID_PASSWORD",
+					},
+				});
+			}
 		}
 
 		if (body.discriminator) {

From a887608d30a728e677b5a8595c695fc55788f89c Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Fri, 19 Jul 2024 15:09:02 +0200
Subject: [PATCH 4/5] Fix msg component typings

---
 assets/openapi.json                           | Bin 582218 -> 601458 bytes
 assets/schemas.json                           | Bin 19589397 -> 23000385 bytes
 src/util/entities/Message.ts                  |  77 +++++++++++++++++-
 src/util/schemas/MessageCreateSchema.ts       |   4 +-
 .../responses/GuildMessagesSearchResponse.ts  |   4 +-
 5 files changed, 77 insertions(+), 8 deletions(-)

diff --git a/assets/openapi.json b/assets/openapi.json
index 2788cdb08bb2d9d7ee2a458cbee2a0f133cee203..f3ad32a91baffeb6a23de34cb69f65748e111e90 100644
GIT binary patch
delta 3936
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
JHU8`6{{SaEmS6w?

delta 516
zcmZvYKWGzi6vz4fxx4(T<PMrP646H55Gk~c;?SZgK@b&j5NkVVk|PvBrI>=7DF)Fh
zDk47h4gR}H!4ML-;h9Z}I5@OHaFJq@sdOm4Hlswn20921pXKp=pZDc${TTTAxxacX
z04rgO?%w7hfmTfJ!Y?Jwf{%|cl0DB0Jy?CsHFqd%rl4(GaEE#z-&9bY9|v0+Q0<SP
z7v<xSx~W4sy$|x0q#Mng;7_mbLE93~Ad|LmaFZRv#*{dXe_}#mvc<ywwuaUPHsU(D
zHRk>-IJ1!W{s<GhrNqWBb{O+lWw#skW^+4=nja`(p~a43{R-QQee2A?%5kP>W`dPo
zZO6#J^hQA<bh0BNUvw^rpOQR-<sok1Xcuq3m}HmGOUVp0mUJ)|_Cqmy3~nvtpcv1B
zH7wo15AQj(P5wNN(N%T|hsVSK)yMc+oJOa4I{?9OgqC0O+6-DPb^yI2n!@0QFwi-}
zBsoe<7(1mO(nwrPa`<iQxZW);)7dUjV|YF!ZeX!jWU;;|W1R+XH+8B<#5?srDf-ef
zt@Mfqf}WUSn*HlvrC^`Dui>KN1~o&{R@;MEy7P1}y@U6hIq9SM=spHHbAfM_ze3i<
A6aWAK

diff --git a/assets/schemas.json b/assets/schemas.json
index 00f86b3604f19db3f1eb55db5e1432de30d7d2a5..621a84b4476278260c1ca5e13cbce85cd24c1ed0 100644
GIT binary patch
delta 300606
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
MUng9nM#bLrKiH2WO8@`>

delta 18496
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

diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts
index d28c8c29..ea3a3cc7 100644
--- a/src/util/entities/Message.ts
+++ b/src/util/entities/Message.ts
@@ -216,7 +216,7 @@ export class Message extends BaseClass {
 	};
 
 	@Column({ type: "simple-json", nullable: true })
-	components?: MessageComponent[];
+	components?: ActionRowComponent[];
 
 	@Column({ type: "simple-json", nullable: true })
 	poll?: Poll;
@@ -248,21 +248,90 @@ export class Message extends BaseClass {
 }
 
 export interface MessageComponent {
-	type: number;
-	style?: number;
+	type: MessageComponentType;
+}
+
+export interface ActionRowComponent extends MessageComponent {
+	type: MessageComponentType.ActionRow;
+	components: (ButtonComponent | StringSelectMenuComponent | SelectMenuComponent | TextInputComponent)[];
+}
+
+export interface ButtonComponent extends MessageComponent {
+	type: MessageComponentType.Button;
+	style: ButtonStyle;
 	label?: string;
 	emoji?: PartialEmoji;
 	custom_id?: string;
 	sku_id?: string;
 	url?: string;
 	disabled?: boolean;
-	components: MessageComponent[];
+}
+
+export enum ButtonStyle {
+	Primary = 1,
+	Secondary = 2,
+	Success = 3,
+	Danger = 4,
+	Link = 5,
+	Premium = 6,
+}
+
+export interface SelectMenuComponent extends MessageComponent {
+	type: MessageComponentType.StringSelect | MessageComponentType.UserSelect | MessageComponentType.RoleSelect | MessageComponentType.MentionableSelect | MessageComponentType.ChannelSelect;
+	custom_id: string;
+	channel_types?: number[];
+	placeholder?: string;
+	default_values?: SelectMenuDefaultOption[]; // only for non-string selects
+	min_values?: number;
+	max_values?: number;
+	disabled?: boolean;
+}
+
+export interface SelectMenuOption {
+	label: string;
+	value: string;
+	description?: string;
+	emoji?: PartialEmoji;
+	default?: boolean;
+}
+
+export interface SelectMenuDefaultOption {
+	id: string;
+	type: "user" | "role" | "channel";
+}
+
+export interface StringSelectMenuComponent extends SelectMenuComponent {
+	type: MessageComponentType.StringSelect;
+	options: SelectMenuOption[];
+}
+
+export interface TextInputComponent extends MessageComponent {
+	type: MessageComponentType.TextInput;
+	custom_id: string;
+	style: TextInputStyle;
+	label: string;
+	min_length?: number;
+	max_length?: number;
+	required?: boolean;
+	value?: string;
+	placeholder?: string;
+}
+
+export enum TextInputStyle {
+	Short = 1,
+	Paragraph = 2,
 }
 
 export enum MessageComponentType {
 	Script = 0, // self command script
 	ActionRow = 1,
 	Button = 2,
+	StringSelect = 3,
+	TextInput = 4,
+	UserSelect = 5,
+	RoleSelect = 6,
+	MentionableSelect = 7,
+	ChannelSelect = 8,
 }
 
 export interface Embed {
diff --git a/src/util/schemas/MessageCreateSchema.ts b/src/util/schemas/MessageCreateSchema.ts
index 014f6c87..2d7e4179 100644
--- a/src/util/schemas/MessageCreateSchema.ts
+++ b/src/util/schemas/MessageCreateSchema.ts
@@ -16,7 +16,7 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { Embed, MessageComponent, PollAnswer, PollMedia } from "@spacebar/util";
+import { ActionRowComponent, Embed, PollAnswer, PollMedia } from "@spacebar/util";
 
 type Attachment = {
 	id: string;
@@ -54,7 +54,7 @@ export interface MessageCreateSchema {
 	**/
 	attachments?: Attachment[];
 	sticker_ids?: string[];
-	components?: MessageComponent[];
+	components?: ActionRowComponent[];
 	// TODO: Fix TypeScript errors in src\api\util\handlers\Message.ts once this is enabled
 	poll?: PollCreationSchema;
 	enforce_nonce?: boolean; // For Discord compatibility, it's the default behavior here
diff --git a/src/util/schemas/responses/GuildMessagesSearchResponse.ts b/src/util/schemas/responses/GuildMessagesSearchResponse.ts
index 6121983e..ec41965b 100644
--- a/src/util/schemas/responses/GuildMessagesSearchResponse.ts
+++ b/src/util/schemas/responses/GuildMessagesSearchResponse.ts
@@ -17,9 +17,9 @@
 */
 
 import {
+	ActionRowComponent,
 	Attachment,
 	Embed,
-	MessageComponent,
 	MessageType,
 	Poll,
 	PublicUser,
@@ -42,7 +42,7 @@ export interface GuildMessagesSearchMessage {
 	timestamp: string;
 	edited_timestamp: string | null;
 	flags: number;
-	components: MessageComponent[];
+	components: ActionRowComponent[];
 	poll: Poll;
 	hit: true;
 }

From c41b4f6364f9a7e448830dcd5058d696a20f8ee6 Mon Sep 17 00:00:00 2001
From: TomatoCake <60300461+DEVTomatoCake@users.noreply.github.com>
Date: Fri, 19 Jul 2024 15:13:27 +0200
Subject: [PATCH 5/5] prettier .-.

---
 src/util/entities/Message.ts            | 14 ++++++++++++--
 src/util/schemas/MessageCreateSchema.ts |  7 ++++++-
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/src/util/entities/Message.ts b/src/util/entities/Message.ts
index ea3a3cc7..9ba6ff7e 100644
--- a/src/util/entities/Message.ts
+++ b/src/util/entities/Message.ts
@@ -253,7 +253,12 @@ export interface MessageComponent {
 
 export interface ActionRowComponent extends MessageComponent {
 	type: MessageComponentType.ActionRow;
-	components: (ButtonComponent | StringSelectMenuComponent | SelectMenuComponent | TextInputComponent)[];
+	components: (
+		| ButtonComponent
+		| StringSelectMenuComponent
+		| SelectMenuComponent
+		| TextInputComponent
+	)[];
 }
 
 export interface ButtonComponent extends MessageComponent {
@@ -277,7 +282,12 @@ export enum ButtonStyle {
 }
 
 export interface SelectMenuComponent extends MessageComponent {
-	type: MessageComponentType.StringSelect | MessageComponentType.UserSelect | MessageComponentType.RoleSelect | MessageComponentType.MentionableSelect | MessageComponentType.ChannelSelect;
+	type:
+		| MessageComponentType.StringSelect
+		| MessageComponentType.UserSelect
+		| MessageComponentType.RoleSelect
+		| MessageComponentType.MentionableSelect
+		| MessageComponentType.ChannelSelect;
 	custom_id: string;
 	channel_types?: number[];
 	placeholder?: string;
diff --git a/src/util/schemas/MessageCreateSchema.ts b/src/util/schemas/MessageCreateSchema.ts
index 2d7e4179..51263dce 100644
--- a/src/util/schemas/MessageCreateSchema.ts
+++ b/src/util/schemas/MessageCreateSchema.ts
@@ -16,7 +16,12 @@
 	along with this program.  If not, see <https://www.gnu.org/licenses/>.
 */
 
-import { ActionRowComponent, Embed, PollAnswer, PollMedia } from "@spacebar/util";
+import {
+	ActionRowComponent,
+	Embed,
+	PollAnswer,
+	PollMedia,
+} from "@spacebar/util";
 
 type Attachment = {
 	id: string;