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

logs: allow per-log-channel log formats

Browse source
This commit is contained in:
Dragory 2020-07-30 02:28:11 +03:00
parent 8b22ce267d
commit 28de8a592b
No known key found for this signature in database
GPG key ID: 5F387BA66DF8AAC1
3 changed files with 20 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
backend/src/plugins/Logs/types.ts
View file

@ -5,7 +5,10 @@ import { GuildLogs } from "src/data/GuildLogs";
import { GuildSavedMessages } from "src/data/GuildSavedMessages"; import { GuildSavedMessages } from "src/data/GuildSavedMessages";
import { GuildArchives } from "src/data/GuildArchives"; import { GuildArchives } from "src/data/GuildArchives";
import { GuildCases } from "src/data/GuildCases"; import { GuildCases } from "src/data/GuildCases";
import { tMessageContent } from "../../utils"; import { tMessageContent, tNullable } from "../../utils";
export const tLogFormats = t.record(t.string, t.union([t.string, tMessageContent]));
export type TLogFormats = t.TypeOf<typeof tLogFormats>;
const LogChannel = t.partial({ const LogChannel = t.partial({
include: t.array(t.string), include: t.array(t.string),
@ -15,22 +18,21 @@ const LogChannel = t.partial({
excluded_users: t.array(t.string), excluded_users: t.array(t.string),
excluded_message_regexes: t.array(TSafeRegex), excluded_message_regexes: t.array(TSafeRegex),
excluded_channels: t.array(t.string), excluded_channels: t.array(t.string),
format: tNullable(tLogFormats),
}); });
export type TLogChannel = t.TypeOf<typeof LogChannel>; export type TLogChannel = t.TypeOf<typeof LogChannel>;
const LogChannelMap = t.record(t.string, LogChannel); const LogChannelMap = t.record(t.string, LogChannel);
export type TLogChannelMap = t.TypeOf<typeof LogChannelMap>; export type TLogChannelMap = t.TypeOf<typeof LogChannelMap>;
const tLogFormats = t.intersection([
t.record(t.string, t.union([t.string, tMessageContent])),
t.type({
timestamp: t.string,
}),
]);
export const ConfigSchema = t.type({ export const ConfigSchema = t.type({
channels: LogChannelMap, channels: LogChannelMap,
format: tLogFormats, format: t.intersection([
tLogFormats,
t.type({
timestamp: t.string,
}),
]),
ping_user: t.boolean, ping_user: t.boolean,
}); });
export type TConfigSchema = t.TypeOf<typeof ConfigSchema>; export type TConfigSchema = t.TypeOf<typeof ConfigSchema>;

11
backend/src/plugins/Logs/util/getLogMessage.ts
View file

@ -1,5 +1,5 @@
import { PluginData } from "knub"; import { PluginData } from "knub";
import { LogsPluginType } from "../types"; import { LogsPluginType, TLogFormats } from "../types";
import { LogType } from "src/data/LogType"; import { LogType } from "src/data/LogType";
import { import {
verboseUserMention, verboseUserMention,
@ -14,9 +14,14 @@ import { renderTemplate, TemplateParseError } from "src/templateFormatter";
import { logger } from "src/logger"; import { logger } from "src/logger";
import moment from "moment-timezone"; import moment from "moment-timezone";
export async function getLogMessage(pluginData: PluginData<LogsPluginType>, type: LogType, data: any): Promise<string> { export async function getLogMessage(
pluginData: PluginData<LogsPluginType>,
type: LogType,
data: any,
formats?: TLogFormats,
): Promise<string> {
const config = pluginData.config.get(); const config = pluginData.config.get();
const format = config.format[LogType[type]] || ""; const format = (formats && formats[LogType[type]]) || config.format[LogType[type]] || "";
if (format === "") return; if (format === "") return;
const values = { const values = {

2
backend/src/plugins/Logs/util/log.ts
View file

@ -57,7 +57,7 @@ export async function log(pluginData: PluginData<LogsPluginType>, type: LogType,
} }
} }
const message = await getLogMessage(pluginData, type, data); const message = await getLogMessage(pluginData, type, data, opts.format);
if (message) { if (message) {
// For non-string log messages (i.e. embeds) batching or chunking is not possible, so send them immediately // For non-string log messages (i.e. embeds) batching or chunking is not possible, so send them immediately
if (typeof message !== "string") { if (typeof message !== "string") {