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] : [];
}
diff --git a/src/api/routes/users/@me/index.ts b/src/api/routes/users/@me/index.ts
index ad11a428..cddc3a08 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",
},
});
@@ -160,6 +160,15 @@ router.patch(
},
});
}
+
+ if (!body.password) {
+ throw FieldErrors({
+ password: {
+ message: req.t("auth:login.INVALID_PASSWORD"),
+ code: "INVALID_PASSWORD",
+ },
+ });
+ }
}
if (body.discriminator) {
|
