From 3498ffdc013e82efec16aa7b985f1e3d08bdfe99 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Sun, 27 Aug 2023 16:54:54 +1000
Subject: prevent put /guilds/id/members/id for others until we have oauth2
 scopes impled

---
 src/api/routes/guilds/#guild_id/members/#member_id/index.ts | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

(limited to 'src/api/routes')

diff --git a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts
index cafb922e..c168f2dc 100644
--- a/src/api/routes/guilds/#guild_id/members/#member_id/index.ts
+++ b/src/api/routes/guilds/#guild_id/members/#member_id/index.ts
@@ -18,6 +18,7 @@
 
 import { route } from "@spacebar/api";
 import {
+	DiscordApiErrors,
 	emitEvent,
 	Emoji,
 	getPermission,
@@ -198,7 +199,9 @@ router.put(
 			member_id = req.user_id;
 			rights.hasThrow("JOIN_GUILDS");
 		} else {
-			// TODO: join others by controller
+			// TODO: check oauth2 scope
+
+			throw DiscordApiErrors.MISSING_REQUIRED_OAUTH2_SCOPE;
 		}
 
 		const guild = await Guild.findOneOrFail({
-- 
cgit 1.5.1


From add16ab26eb37cace5663980cb3c3042871b7693 Mon Sep 17 00:00:00 2001
From: Madeline <46743919+MaddyUnderStars@users.noreply.github.com>
Date: Tue, 5 Sep 2023 23:29:22 +1000
Subject: * allow limit=1 * fix GET messages?around order

---
 .../routes/channels/#channel_id/messages/index.ts  | 32 +++++++++++++++++-----
 1 file changed, 25 insertions(+), 7 deletions(-)

(limited to 'src/api/routes')

diff --git a/src/api/routes/channels/#channel_id/messages/index.ts b/src/api/routes/channels/#channel_id/messages/index.ts
index c384a05b..a5bfcfd7 100644
--- a/src/api/routes/channels/#channel_id/messages/index.ts
+++ b/src/api/routes/channels/#channel_id/messages/index.ts
@@ -40,7 +40,13 @@ import {
 import { Request, Response, Router } from "express";
 import { HTTPError } from "lambert-server";
 import multer from "multer";
-import { FindManyOptions, FindOperator, LessThan, MoreThan } from "typeorm";
+import {
+	FindManyOptions,
+	FindOperator,
+	LessThan,
+	MoreThan,
+	MoreThanOrEqual,
+} from "typeorm";
 import { URL } from "url";
 
 const router: Router = Router();
@@ -122,12 +128,24 @@ router.get(
 
 		if (around) {
 			query.take = Math.floor(limit / 2);
-			const [right, left] = await Promise.all([
-				Message.find({ ...query, where: { id: LessThan(around) } }),
-				Message.find({ ...query, where: { id: MoreThan(around) } }),
-			]);
-			right.push(...left);
-			messages = right;
+			if (query.take != 0) {
+				const [right, left] = await Promise.all([
+					Message.find({ ...query, where: { id: LessThan(around) } }),
+					Message.find({
+						...query,
+						where: { id: MoreThanOrEqual(around) },
+					}),
+				]);
+				left.push(...right);
+				messages = left;
+			} else {
+				query.take = 1;
+				const message = await Message.findOne({
+					...query,
+					where: { id: around },
+				});
+				messages = message ? [message] : [];
+			}
 		} else {
 			if (after) {
 				if (BigInt(after) > BigInt(Snowflake.generate()))
-- 
cgit 1.5.1