StyAndCo/zappyzep
3
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix case embeds breaking with notes over 1024 chars in length

Browse source
This commit is contained in:
Dragory 2020-07-29 22:48:49 +03:00
parent 3c90e5d4ab
commit ac714ea307
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
2 changed files with 22 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
backend/src/plugins/Cases/functions/getCaseEmbed.ts
View file

@ -2,10 +2,11 @@ import { Case } from "../../../data/entities/Case";
import { MessageContent } from "eris";
import moment from "moment-timezone";
import { CaseTypes } from "../../../data/CaseTypes";
import { PluginData } from "knub";
import { PluginData, helpers } from "knub";
import { CasesPluginType } from "../types";
import { CaseTypeColors } from "../../../data/CaseTypeColors";
import { resolveCaseId } from "./resolveCaseId";
import { chunkLines, chunkMessageLines, emptyEmbedValue } from "../../../utils";
export async function getCaseEmbed(
pluginData: PluginData<CasesPluginType>,
@ -51,10 +52,21 @@ export async function getCaseEmbed(
if (theCase.notes.length) {
theCase.notes.forEach((note: any) => {
const noteDate = moment(note.created_at);
embed.fields.push({
name: `${note.mod_name} at ${noteDate.format("YYYY-MM-DD [at] HH:mm")}:`,
value: note.body,
});
const chunks = chunkMessageLines(note.body, 1014);
for (let i = 0; i < chunks.length; i++) {
if (i === 0) {
embed.fields.push({
name: `${note.mod_name} at ${noteDate.format("YYYY-MM-DD [at] HH:mm")}:`,
value: chunks[i],
});
} else {
embed.fields.push({
name: emptyEmbedValue,
value: chunks[i],
});
}
}
});
} else {
embed.fields.push({

7
backend/src/utils.ts
View file

@ -633,9 +633,12 @@ export function chunkLines(str: string, maxChunkLength = 2000): string[] {
/**
* Chunks a long message to multiple smaller messages, retaining leading and trailing line breaks, open code blocks, etc.
*
* Default maxChunkLength is 1990, a bit under the message length limit of 2000, so we have space to add code block
* shenanigans to the start/end when needed. Take this into account when choosing a custom maxChunkLength as well.
*/
export function chunkMessageLines(str: string): string[] {
const chunks = chunkLines(str, 1990); // We don't split at exactly 2000 to be able to do the stuff below
export function chunkMessageLines(str: string, maxChunkLength = 1990): string[] {
const chunks = chunkLines(str, maxChunkLength);
let openCodeBlock = false;
return chunks.map(chunk => {