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

Temp fix for circular dependency

Browse source
This commit is contained in:
Dragory 2021-08-18 02:01:56 +03:00
parent bed6589d48
commit 8edaa75064
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
2 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
backend/src/plugins/Logs/LogsPlugin.ts
View file

@ -7,7 +7,6 @@ import { GuildSavedMessages } from "../../data/GuildSavedMessages";
import { LogType } from "../../data/LogType";
import { logger } from "../../logger";
import { discardRegExpRunner, getRegExpRunner } from "../../regExpRunners";
import { CasesPlugin } from "../Cases/CasesPlugin";
import { TimeAndDatePlugin } from "../TimeAndDate/TimeAndDatePlugin";
import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
import { LogsChannelCreateEvt, LogsChannelDeleteEvt, LogsChannelUpdateEvt } from "./events/LogsChannelModifyEvts";
@ -140,7 +139,7 @@ export const LogsPlugin = zeppelinGuildPlugin<LogsPluginType>()({
prettyName: "Logs",
},
dependencies: [TimeAndDatePlugin, CasesPlugin],
dependencies: [TimeAndDatePlugin],
configSchema: ConfigSchema,
defaultOptions,

53
backend/src/plugins/Logs/events/LogsGuildMemberAddEvt.ts
View file

@ -2,7 +2,6 @@ import humanizeDuration from "humanize-duration";
import moment from "moment-timezone";
import { LogType } from "../../../data/LogType";
import { memberToTemplateSafeMember } from "../../../utils/templateSafeObjects";
import { CasesPlugin } from "../../Cases/CasesPlugin";
import { logsEvt } from "../types";
import { logMemberJoin } from "../logFunctions/logMemberJoin";
import { logMemberJoinWithPriorRecords } from "../logFunctions/logMemberJoinWithPriorRecords";
@ -18,31 +17,33 @@ export const LogsGuildMemberAddEvt = logsEvt({
member,
});
const cases = (await pluginData.state.cases.with("notes").getByUserId(member.id)).filter(c => !c.is_hidden);
cases.sort((a, b) => (a.created_at > b.created_at ? -1 : 1));
// TODO: Uncomment below once circular dependencies in Knub have been fixed
if (cases.length) {
const recentCaseLines: string[] = [];
const recentCases = cases.slice(0, 2);
const casesPlugin = pluginData.getPlugin(CasesPlugin);
for (const theCase of recentCases) {
recentCaseLines.push((await casesPlugin.getCaseSummary(theCase))!);
}
let recentCaseSummary = recentCaseLines.join("\n");
if (recentCases.length < cases.length) {
const remaining = cases.length - recentCases.length;
if (remaining === 1) {
recentCaseSummary += `\n*+${remaining} case*`;
} else {
recentCaseSummary += `\n*+${remaining} cases*`;
}
}
logMemberJoinWithPriorRecords(pluginData, {
member,
recentCaseSummary,
});
}
// const cases = (await pluginData.state.cases.with("notes").getByUserId(member.id)).filter(c => !c.is_hidden);
// cases.sort((a, b) => (a.created_at > b.created_at ? -1 : 1));
//
// if (cases.length) {
// const recentCaseLines: string[] = [];
// const recentCases = cases.slice(0, 2);
// const casesPlugin = pluginData.getPlugin(CasesPlugin);
// for (const theCase of recentCases) {
// recentCaseLines.push((await casesPlugin.getCaseSummary(theCase))!);
// }
//
// let recentCaseSummary = recentCaseLines.join("\n");
// if (recentCases.length < cases.length) {
// const remaining = cases.length - recentCases.length;
// if (remaining === 1) {
// recentCaseSummary += `\n*+${remaining} case*`;
// } else {
// recentCaseSummary += `\n*+${remaining} cases*`;
// }
// }
//
// logMemberJoinWithPriorRecords(pluginData, {
// member,
// recentCaseSummary,
// });
// }
},
});