Merge pull request #503 from rubyowo/feat/yearsandmonths_next

feat: fix leap year rules, add year and month to the delay string

Author: Dragory

backend/src/data/GuildCases.ts

@@ -1,5 +1,4 @@
-import { In, InsertResult, Repository } from "typeorm";
-import { FindOptionsWhere } from "typeorm";
+import { FindOptionsWhere, In, InsertResult, Repository } from "typeorm";
 import { Queue } from "../Queue.js";
 import { chunkArray } from "../utils.js";
 import { BaseGuildRepository } from "./BaseGuildRepository.js";

backend/src/humanizeDuration.ts

@@ -0,0 +1,34 @@
+import humanizeduration from "humanize-duration";
+
+export const delayStringMultipliers = {
+  y: 1000 * 60 * 60 * 24 * (365 + 1 / 4 - 1 / 100 + 1 / 400),
+  mo: (1000 * 60 * 60 * 24 * (365 + 1 / 4 - 1 / 100 + 1 / 400)) / 12,
+  w: 1000 * 60 * 60 * 24 * 7,
+  d: 1000 * 60 * 60 * 24,
+  h: 1000 * 60 * 60,
+  m: 1000 * 60,
+  s: 1000,
+  x: 1,
+};
+
+export const humanizeDurationShort = humanizeduration.humanizer({
+  language: "shortEn",
+  languages: {
+    shortEn: {
+      y: () => "y",
+      mo: () => "mo",
+      w: () => "w",
+      d: () => "d",
+      h: () => "h",
+      m: () => "m",
+      s: () => "s",
+      ms: () => "ms",
+    },
+  },
+  spacer: "",
+  unitMeasures: delayStringMultipliers,
+});
+
+export const humanizeDuration = humanizeduration.humanizer({
+  unitMeasures: delayStringMultipliers,
+});

backend/src/humanizeDurationShort.ts

@@ -44,7 +44,15 @@ import { availableGlobalPlugins, availableGuildPlugins } from "./plugins/availab
 import { setProfiler } from "./profiler.js";
 import { logRateLimit } from "./rateLimitStats.js";
 import { startUptimeCounter } from "./uptime.js";
-import { MINUTES, SECONDS, errorMessage, isDiscordAPIError, isDiscordHTTPError, sleep, successMessage } from "./utils.js";
+import {
+  MINUTES,
+  SECONDS,
+  errorMessage,
+  isDiscordAPIError,
+  isDiscordHTTPError,
+  sleep,
+  successMessage,
+} from "./utils.js";
 import { DecayingCounter } from "./utils/DecayingCounter.js";
 import { enableProfiling } from "./utils/easyProfiler.js";
 import { loadYamlSafely } from "./utils/loadYamlSafely.js";

backend/src/index.ts

@@ -2,7 +2,12 @@ import { GuildPluginData } from "knub";
 import { convertDelayStringToMS } from "../../../utils.js";
 import { AutomodContext, AutomodPluginType, TRule } from "../types.js";
 
-export function applyCooldown(pluginData: GuildPluginData<AutomodPluginType>, rule: TRule, ruleName: string, context: AutomodContext) {
+export function applyCooldown(
+  pluginData: GuildPluginData<AutomodPluginType>,
+  rule: TRule,
+  ruleName: string,
+  context: AutomodContext,
+) {
   const cooldownKey = `${ruleName}-${context.user?.id}`;
 
   const cooldownTime = convertDelayStringToMS(rule.cooldown, "s");

backend/src/plugins/Automod/functions/applyCooldown.ts

@@ -1,7 +1,12 @@
 import { GuildPluginData } from "knub";
 import { AutomodContext, AutomodPluginType, TRule } from "../types.js";
 
-export function checkCooldown(pluginData: GuildPluginData<AutomodPluginType>, rule: TRule, ruleName: string, context: AutomodContext) {
+export function checkCooldown(
+  pluginData: GuildPluginData<AutomodPluginType>,
+  rule: TRule,
+  ruleName: string,
+  context: AutomodContext,
+) {
   const cooldownKey = `${ruleName}-${context.user?.id}`;
 
   return pluginData.state.cooldownManager.isOnCooldown(cooldownKey);

backend/src/plugins/Automod/functions/checkCooldown.ts

@@ -1,6 +1,6 @@
 import z from "zod";
 import { SavedMessage } from "../../../data/entities/SavedMessage.js";
-import { humanizeDurationShort } from "../../../humanizeDurationShort.js";
+import { humanizeDurationShort } from "../../../humanizeDuration.js";
 import { getBaseUrl } from "../../../pluginUtils.js";
 import { convertDelayStringToMS, sorter, zDelayString } from "../../../utils.js";
 import { RecentActionType } from "../constants.js";

backend/src/plugins/Automod/functions/createMessageSpamTrigger.ts

@@ -13,19 +13,20 @@ const baseConfig = z.strictObject({
   filetype_blacklist: z.array(z.string().max(32)).max(255).default([]),
   filetype_whitelist: z.array(z.string().max(32)).max(255).default([]),
 });
-const configWithWhitelist = baseConfig.merge(z.strictObject({
-  whitelist_enabled: z.literal(true),
-  blacklist_enabled: z.literal(false).default(false),
-}));
-const configWithBlacklist = baseConfig.merge(z.strictObject({
-  blacklist_enabled: z.literal(true),
-  whitelist_enabled: z.literal(false).default(false),
-}));
+const configWithWhitelist = baseConfig.merge(
+  z.strictObject({
+    whitelist_enabled: z.literal(true),
+    blacklist_enabled: z.literal(false).default(false),
+  }),
+);
+const configWithBlacklist = baseConfig.merge(
+  z.strictObject({
+    blacklist_enabled: z.literal(true),
+    whitelist_enabled: z.literal(false).default(false),
+  }),
+);
 
-const configSchema = z.union([
-  configWithWhitelist,
-  configWithBlacklist,
-]);
+const configSchema = z.union([configWithWhitelist, configWithBlacklist]);
 
 export const MatchAttachmentTypeTrigger = automodTrigger<MatchResultType>()({
   configSchema,

backend/src/plugins/Automod/triggers/matchAttachmentType.ts

@@ -12,19 +12,20 @@ const baseConfig = z.strictObject({
   mime_type_blacklist: z.array(z.string().max(32)).max(255).default([]),
   mime_type_whitelist: z.array(z.string().max(32)).max(255).default([]),
 });
-const configWithWhitelist = baseConfig.merge(z.strictObject({
-  whitelist_enabled: z.literal(true),
-  blacklist_enabled: z.literal(false).default(false),
-}));
-const configWithBlacklist = baseConfig.merge(z.strictObject({
-  blacklist_enabled: z.literal(true),
-  whitelist_enabled: z.literal(false).default(false),
-}));
+const configWithWhitelist = baseConfig.merge(
+  z.strictObject({
+    whitelist_enabled: z.literal(true),
+    blacklist_enabled: z.literal(false).default(false),
+  }),
+);
+const configWithBlacklist = baseConfig.merge(
+  z.strictObject({
+    blacklist_enabled: z.literal(true),
+    whitelist_enabled: z.literal(false).default(false),
+  }),
+);
 
-const configSchema = z.union([
-  configWithWhitelist,
-  configWithBlacklist,
-]);
+const configSchema = z.union([configWithWhitelist, configWithBlacklist]);
 
 export const MatchMimeTypeTrigger = automodTrigger<MatchResultType>()({
   configSchema,

backend/src/plugins/Automod/triggers/matchMimeType.ts

@@ -4,7 +4,13 @@ import { GuildPluginData } from "knub";
 import { allowTimeout } from "../../../RegExpRunner.js";
 import { ZalgoRegex } from "../../../data/Zalgo.js";
 import { ISavedMessageEmbedData, SavedMessage } from "../../../data/entities/SavedMessage.js";
-import { getInviteCodesInString, getUrlsInString, isGuildInvite, resolveInvite, resolveMember } from "../../../utils.js";
+import {
+  getInviteCodesInString,
+  getUrlsInString,
+  isGuildInvite,
+  resolveInvite,
+  resolveMember,
+} from "../../../utils.js";
 import { CensorPluginType } from "../types.js";
 import { censorMessage } from "./censorMessage.js";