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

🚧 message acknowledge

Browse Source
This commit is contained in:
Flam3rboy 2021-07-30 17:37:16 +02:00
parent 255c84e319
commit aee1eb2949
4 changed files with 34 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
package-lock.json generated
View File

@ -9,7 +9,7 @@
"version": "1.0.0", "version": "1.0.0",
"license": "ISC", "license": "ISC",
"dependencies": { "dependencies": {
"@fosscord/server-util": "^1.3.32", "@fosscord/server-util": "^1.3.35",
"@types/jest": "^26.0.22", "@types/jest": "^26.0.22",
"@types/json-schema": "^7.0.7", "@types/json-schema": "^7.0.7",
"ajv": "^8.4.0", "ajv": "^8.4.0",
@ -677,9 +677,9 @@
} }
}, },
"node_modules/@fosscord/server-util": { "node_modules/@fosscord/server-util": {
"version": "1.3.32", "version": "1.3.35",
"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.32.tgz", "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.35.tgz",
"integrity": "sha512-wEwIvDSwCSg5t19sN88fQ/Qv873Y9jm5L35vmuNU10NhYHS+fbKawha+Lj5Ftb0+tGHM19N2qc5X8mt2Pd5kGg==", "integrity": "sha512-uXv28XjmdmpMvkCGvXArAjpmW3x9he14ts1uupfK/dOkxd5CFdLvFOjiWyWiHSddBfp2GwHdGIRlnC0BD03UhA==",
"dependencies": { "dependencies": {
"@types/jsonwebtoken": "^8.5.0", "@types/jsonwebtoken": "^8.5.0",
"@types/mongoose-autopopulate": "^0.10.1", "@types/mongoose-autopopulate": "^0.10.1",
@ -11337,9 +11337,9 @@
} }
}, },
"@fosscord/server-util": { "@fosscord/server-util": {
"version": "1.3.32", "version": "1.3.35",
"resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.32.tgz", "resolved": "https://registry.npmjs.org/@fosscord/server-util/-/server-util-1.3.35.tgz",
"integrity": "sha512-wEwIvDSwCSg5t19sN88fQ/Qv873Y9jm5L35vmuNU10NhYHS+fbKawha+Lj5Ftb0+tGHM19N2qc5X8mt2Pd5kGg==", "integrity": "sha512-uXv28XjmdmpMvkCGvXArAjpmW3x9he14ts1uupfK/dOkxd5CFdLvFOjiWyWiHSddBfp2GwHdGIRlnC0BD03UhA==",
"requires": { "requires": {
"@types/jsonwebtoken": "^8.5.0", "@types/jsonwebtoken": "^8.5.0",
"@types/mongoose-autopopulate": "^0.10.1", "@types/mongoose-autopopulate": "^0.10.1",

2
package.json
View File

@ -32,7 +32,7 @@
}, },
"homepage": "https://github.com/fosscord/fosscord-api#readme", "homepage": "https://github.com/fosscord/fosscord-api#readme",
"dependencies": { "dependencies": {
"@fosscord/server-util": "^1.3.32", "@fosscord/server-util": "^1.3.35",
"@types/jest": "^26.0.22", "@types/jest": "^26.0.22",
"@types/json-schema": "^7.0.7", "@types/json-schema": "^7.0.7",
"ajv": "^8.4.0", "ajv": "^8.4.0",

44
src/routes/channels/#channel_id/messages/#message_id/ack.ts
View File

@ -1,29 +1,35 @@
import { getPermission } from "@fosscord/server-util"; import { getPermission, MessageAckEvent, ReadStateModel } from "@fosscord/server-util";
import { MessageModel } from "@fosscord/server-util";
import { Event } from "@fosscord/server-util";
import { ChannelModel } from "@fosscord/server-util";
import { Request, Response, Router } from "express"; import { Request, Response, Router } from "express";
import { HTTPError } from "lambert-server";
import { emitEvent } from "../../../../../util/Event"; import { emitEvent } from "../../../../../util/Event";
import { check } from "../../../../../util/instanceOf";
const router = Router(); const router = Router();
// router.pot("/", async (req: Request, res: Response) => { // TODO: check if message exists
// const { channel_id, message_id } = req.params; // TODO: send read state event to all channel members
// const permission = await getPermission(req.user_id, channel?.guild_id, channel_id, { channel }); router.post("/", check({ $manual: Boolean, $mention_count: Number }), async (req: Request, res: Response) => {
// permission.hasThrow("MANAGE_MESSAGES"); const { channel_id, message_id } = req.params;
// await emitEvent({ const permission = await getPermission(req.user_id, undefined, channel_id);
// event: "MESSAGE_ACK", permission.hasThrow("VIEW_CHANNEL");
// channel_id,
// data: {
// channel_id,
// message_id
// }
// } as MessageAckEvent);
// res.sendStatus(204); await ReadStateModel.updateOne(
// }); { user_id: req.user_id, channel_id, message_id },
{ user_id: req.user_id, channel_id, message_id }
).exec();
await emitEvent({
event: "MESSAGE_ACK",
user_id: req.user_id,
data: {
channel_id,
message_id,
version: 496
}
} as MessageAckEvent);
res.sendStatus(204);
});
export default router; export default router;

2
src/util/Message.ts
View File

@ -124,7 +124,7 @@ export async function sendMessage(opts: Partial<Message>) {
await emitEvent({ event: "MESSAGE_CREATE", channel_id: opts.channel_id, data, guild_id: message.guild_id } as MessageCreateEvent); await emitEvent({ event: "MESSAGE_CREATE", channel_id: opts.channel_id, data, guild_id: message.guild_id } as MessageCreateEvent);
postHandleMessage(data); // no await as it shouldnt block the message send function postHandleMessage(data).catch((e) => {}); // no await as it shouldnt block the message send function and silently catch error
return data; return data;
} }