Spacebar/server
1
0
Fork 0
mirror of https://github.com/spacebarchat/server.git synced 2024-11-10 20:52:42 +01:00
Code Issues Releases Activity

🐛 fix message sending

Browse Source
This commit is contained in:
Flam3rboy 2021-09-03 04:04:34 +02:00
parent 1350f2cbac
commit 11b2176773
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
api/src/middlewares/ErrorHandler.ts
View File

@ -2,7 +2,7 @@ import { NextFunction, Request, Response } from "express";
import { HTTPError } from "lambert-server";
import { EntityNotFoundError } from "typeorm";
import { FieldError } from "../util/instanceOf";
import {ApiError} from "../util/ApiError";
import { ApiError } from "../util/ApiError";
// TODO: update with new body/typorm validation
export function ErrorHandler(error: Error, req: Request, res: Response, next: NextFunction) {
@ -19,16 +19,15 @@ export function ErrorHandler(error: Error, req: Request, res: Response, next: Ne
code = error.code;
message = error.message;
httpcode = error.httpStatus;
}
else if (error instanceof EntityNotFoundError) {
message = `${(error as any).stringifyTarget} can not be found`;
} else if (error as EntityNotFoundError) {
message = `${(error as any).stringifyTarget} could not be found`;
code = 404;
} else if (error instanceof FieldError) {
code = Number(error.code);
message = error.message;
errors = error.errors;
} else {
console.error(`[Error] ${code} ${req.url}`, errors || error, "body:", req.body);
console.error(`[Error] ${code} ${req.url}\n`, errors || error, "\nbody:", req.body);
if (req.server?.options?.production) {
// don't expose internal errors to the user, instead human errors should be thrown as HTTPError

5
api/src/routes/channels/#channel_id/messages/#message_id/index.ts
View File

@ -20,7 +20,8 @@ router.patch("/", check(MessageCreateSchema), async (req: Request, res: Response
}
const new_message = await handleMessage({
// TODO: should be message_reference overridable?
...message,
// TODO: should message_reference be overridable?
// @ts-ignore
message_reference: message.message_reference,
...body,
@ -35,7 +36,7 @@ router.patch("/", check(MessageCreateSchema), async (req: Request, res: Response
await emitEvent({
event: "MESSAGE_UPDATE",
channel_id,
data: { ...message, nonce: undefined }
data: { ...new_message, nonce: undefined }
} as MessageUpdateEvent)
]);

1
bundle/.gitignore vendored Normal file
View File

@ -0,0 +1 @@
files/

2
util/src/entities/Message.ts
View File

@ -102,7 +102,7 @@ export class Message extends BaseClass {
@CreateDateColumn()
timestamp: Date;
@Column()
@Column({ nullable: true })
edited_timestamp?: Date;
@Column({ nullable: true })