Dekescordes/spacebar
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 fix message

Browse Source
This commit is contained in:
Flam3rboy 2021-04-06 20:51:26 +02:00
parent b4655503c8
commit f1a52912bd
3 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
package-lock.json generated
View File

@ -16,7 +16,7 @@
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"express": "^4.17.1", "express": "^4.17.1",
"express-validator": "^6.9.2", "express-validator": "^6.9.2",
"fosscord-server-util": "github:fosscord/fosscord-server-util#35da56a", "fosscord-server-util": "github:fosscord/fosscord-server-util",
"i18next": "^19.8.5", "i18next": "^19.8.5",
"i18next-http-middleware": "^3.1.0", "i18next-http-middleware": "^3.1.0",
"i18next-node-fs-backend": "^2.1.3", "i18next-node-fs-backend": "^2.1.3",
@ -4614,7 +4614,7 @@
}, },
"node_modules/fosscord-server-util": { "node_modules/fosscord-server-util": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "git+ssh://git@github.com/fosscord/fosscord-server-util.git#35da56a905da28d8114225f2cec2b2c7a4166de6", "resolved": "git+ssh://git@github.com/fosscord/fosscord-server-util.git#41e72689476c639aa686074c9bb22d1cb04a6fc4",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
@ -16151,8 +16151,8 @@
"integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ=" "integrity": "sha1-mMI9qxF1ZXuMBXPozszZGw/xjIQ="
}, },
"fosscord-server-util": { "fosscord-server-util": {
"version": "git+ssh://git@github.com/fosscord/fosscord-server-util.git#35da56a905da28d8114225f2cec2b2c7a4166de6", "version": "git+ssh://git@github.com/fosscord/fosscord-server-util.git#41e72689476c639aa686074c9bb22d1cb04a6fc4",
"from": "fosscord-server-util@github:fosscord/fosscord-server-util#35da56a", "from": "fosscord-server-util@github:fosscord/fosscord-server-util",
"requires": { "requires": {
"jsonwebtoken": "^8.5.1", "jsonwebtoken": "^8.5.1",
"lambert-db": "^1.1.7", "lambert-db": "^1.1.7",

2
package.json
View File

@ -28,7 +28,7 @@
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"express": "^4.17.1", "express": "^4.17.1",
"express-validator": "^6.9.2", "express-validator": "^6.9.2",
"fosscord-server-util": "github:fosscord/fosscord-server-util#35da56a", "fosscord-server-util": "github:fosscord/fosscord-server-util",
"i18next": "^19.8.5", "i18next": "^19.8.5",
"i18next-http-middleware": "^3.1.0", "i18next-http-middleware": "^3.1.0",
"i18next-node-fs-backend": "^2.1.3", "i18next-node-fs-backend": "^2.1.3",

6
src/routes/channels/#channel_id/messages/index.ts
View File

@ -98,6 +98,7 @@ router.post("/", check(MessageCreateSchema), async (req, res) => {
const channel = await ChannelModel.findOne({ id: channel_id }, { guild_id: true, type: true, permission_overwrites: true }).exec(); const channel = await ChannelModel.findOne({ id: channel_id }, { guild_id: true, type: true, permission_overwrites: true }).exec();
if (!channel) throw new HTTPError("Channel not found", 404); if (!channel) throw new HTTPError("Channel not found", 404);
// TODO: are tts messages allowed in dm channels? should permission be checked?
if (channel.guild_id) { if (channel.guild_id) {
const permissions = await getPermission(req.user_id, channel.guild_id, channel_id, { channel }); const permissions = await getPermission(req.user_id, channel.guild_id, channel_id, { channel });
@ -113,7 +114,7 @@ router.post("/", check(MessageCreateSchema), async (req, res) => {
if (body.message_reference) { if (body.message_reference) {
if (body.message_reference.channel_id !== channel_id) throw new HTTPError("You can only reference messages from this channel"); if (body.message_reference.channel_id !== channel_id) throw new HTTPError("You can only reference messages from this channel");
// TODO: should it be checked if the message exists? // TODO: should be checked if the referenced message exists?
} }
const embeds = []; const embeds = [];
@ -124,7 +125,7 @@ router.post("/", check(MessageCreateSchema), async (req, res) => {
channel_id, channel_id,
guild_id: channel.guild_id, guild_id: channel.guild_id,
author_id: req.user_id, author_id: req.user_id,
content: req.body, content: body.content,
timestamp: new Date(), timestamp: new Date(),
mention_channels_ids: [], mention_channels_ids: [],
mention_role_ids: [], mention_role_ids: [],
@ -133,6 +134,7 @@ router.post("/", check(MessageCreateSchema), async (req, res) => {
embeds: [], embeds: [],
reactions: [], reactions: [],
type: 0, type: 0,
tts: body.tts,
}; };
await new MessageModel(message).save(); await new MessageModel(message).save();