From fbfd31e1cfbb18f8a0d2c1cdccb00099487e2f04 Mon Sep 17 00:00:00 2001
From: Mia <49593536+mia-pi-git@users.noreply.github.com>
Date: Tue, 4 Aug 2020 04:18:57 -0500
Subject: [PATCH] Support configuring when crashes are private (#7122)
---
server/rooms.ts | 16 ++++++++++++----
1 file changed, 12 insertions(+), 4 deletions(-)
diff --git a/server/rooms.ts b/server/rooms.ts
index dbc465bf69..9ca16abee0 100644
--- a/server/rooms.ts
+++ b/server/rooms.ts
@@ -1415,15 +1415,23 @@ export class GlobalRoomState {
return;
}
this.lastReportedCrash = time;
- // @ts-ignore
- const stackLines = (err ? Utils.escapeHTML(err.stack).split(`\n`) : []);
- const stack = stackLines.slice(1).join(`
`);
+ const stack = err.stack || err.message || err.name || '';
+ const stackLines = (err ? Utils.escapeHTML(stack).split(`\n`) : []);
let crashMessage = `|html|${crasher} crashed: ${stackLines[0]}
${stack}
`;
let privateCrashMessage = null;
const upperStaffRoom = Rooms.get('upperstaff');
- if (stack.includes("private")) {
+
+ let hasPrivateTerm = stack.includes('private');
+ for (const term of (Config.privatecrashterms || [])) {
+ if (typeof term === 'string' ? stack.includes(term) : term.test(stack)) {
+ hasPrivateTerm = true;
+ break;
+ }
+ }
+
+ if (hasPrivateTerm) {
if (upperStaffRoom) {
privateCrashMessage = crashMessage;
crashMessage = `|html|`;