While backfilling, message ids must now be valid snowflakes, cannot be in the future, and cannot overwrite existing messages
This commit is contained in:
parent
ccf4386d70
commit
2e84840213
@ -16,6 +16,8 @@ import multer from "multer";
|
|||||||
import { route } from "@fosscord/api";
|
import { route } from "@fosscord/api";
|
||||||
import { handleMessage, postHandleMessage } from "@fosscord/api";
|
import { handleMessage, postHandleMessage } from "@fosscord/api";
|
||||||
import { MessageCreateSchema } from "../index";
|
import { MessageCreateSchema } from "../index";
|
||||||
|
import { Snowflake } from "@fosscord/util";
|
||||||
|
import { HTTPError } from "lambert-server";
|
||||||
|
|
||||||
const router = Router();
|
const router = Router();
|
||||||
// TODO: message content/embed string length limit
|
// TODO: message content/embed string length limit
|
||||||
@ -91,6 +93,22 @@ router.put(
|
|||||||
var body = req.body as MessageCreateSchema;
|
var body = req.body as MessageCreateSchema;
|
||||||
const attachments: Attachment[] = [];
|
const attachments: Attachment[] = [];
|
||||||
|
|
||||||
|
// regex to check if message contains anything other than numerals ( also no decimals )
|
||||||
|
if (!message_id.match(/^\+?\d+$/)) {
|
||||||
|
throw new HTTPError("Message IDs must be positive integers")
|
||||||
|
}
|
||||||
|
|
||||||
|
const snowflake = Snowflake.deconstruct(message_id)
|
||||||
|
if (Date.now() < snowflake.timestamp) {
|
||||||
|
// message is in the future
|
||||||
|
throw new HTTPError("You cannot backfill messages in the future", 400);
|
||||||
|
}
|
||||||
|
|
||||||
|
const exists = await Message.findOne({ where: { id: message_id, channel_id: channel_id }});
|
||||||
|
if (exists) {
|
||||||
|
throw new HTTPError("Cannot backfill to message ID that already exists", 400);
|
||||||
|
}
|
||||||
|
|
||||||
if (req.file) {
|
if (req.file) {
|
||||||
try {
|
try {
|
||||||
const file = await uploadFile(`/attachments/${req.params.channel_id}`, req.file);
|
const file = await uploadFile(`/attachments/${req.params.channel_id}`, req.file);
|
||||||
@ -100,8 +118,6 @@ router.put(
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
const channel = await Channel.findOneOrFail({ where: { id: channel_id }, relations: ["recipients", "recipients.user"] });
|
const channel = await Channel.findOneOrFail({ where: { id: channel_id }, relations: ["recipients", "recipients.user"] });
|
||||||
|
|
||||||
// TODO: check the ID is not from the future, to prevent future-faking of channel histories
|
|
||||||
|
|
||||||
const embeds = body.embeds || [];
|
const embeds = body.embeds || [];
|
||||||
if (body.embed) embeds.push(body.embed);
|
if (body.embed) embeds.push(body.embed);
|
||||||
@ -115,11 +131,9 @@ router.put(
|
|||||||
channel_id,
|
channel_id,
|
||||||
attachments,
|
attachments,
|
||||||
edited_timestamp: undefined,
|
edited_timestamp: undefined,
|
||||||
timestamp: undefined, // FIXME: calculate timestamp from snowflake
|
timestamp: new Date(snowflake.timestamp),
|
||||||
});
|
});
|
||||||
|
|
||||||
channel.last_message_id = message.id;
|
|
||||||
|
|
||||||
//Fix for the client bug
|
//Fix for the client bug
|
||||||
delete message.member
|
delete message.member
|
||||||
|
|
||||||
|
Loading…
x
Reference in New Issue
Block a user