Merge branch 'master' into timeout_validations

backend/src/api/guilds.ts

@@ -126,7 +126,7 @@ export function initGuildsAPI(app: express.Express) {
         if (type !== ApiPermissionTypes.User) {
           return clientError(res, "Invalid type");
         }
-        if (!isSnowflake(targetId)) {
+        if (!isSnowflake(targetId) || targetId === req.user!.userId) {
           return clientError(res, "Invalid targetId");
         }
         const validPermissions = new Set(Object.values(ApiPermissions));

backend/src/data/GuildCounters.ts

@@ -285,7 +285,11 @@ export class GuildCounters extends BaseGuildRepository {
         reverse_comparison_value: reverseComparisonValue,
       });
 
-      return (await entityManager.findOne(CounterTrigger, insertResult.identifiers[0].id))!;
+      return (await entityManager.findOne(CounterTrigger, {
+        where: {
+          id: insertResult.identifiers[0].id,
+        },
+      }))!;
     });
   }
 

backend/src/data/Mutes.ts

@@ -8,7 +8,7 @@ import { Mute } from "./entities/Mute";
 
 const OLD_EXPIRED_MUTE_THRESHOLD = 7 * DAYS;
 
-export const MAX_TIMEOUT_DURATION = 28 * DAYS;
+export const MAX_TIMEOUT_DURATION = 27 * DAYS;
 // When a timeout is under this duration but the mute expires later, the timeout will be reset to max duration
 export const TIMEOUT_RENEWAL_THRESHOLD = 21 * DAYS;
 

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

@@ -1,5 +1,6 @@
 import { escapeInlineCode, Snowflake } from "discord.js";
 import * as t from "io-ts";
+import { extname } from "path";
 import { asSingleLine, messageSummary, verboseChannelMention } from "../../../utils";
 import { automodTrigger } from "../helpers";
 
@@ -33,7 +34,7 @@ export const MatchAttachmentTypeTrigger = automodTrigger<MatchResultType>()({
     }
 
     for (const attachment of context.message.data.attachments) {
-      const attachmentType = attachment.url.split(".").pop()!.toLowerCase();
+      const attachmentType = extname(new URL(attachment.url).pathname).slice(1).toLowerCase();
 
       const blacklist = trigger.blacklist_enabled
         ? (trigger.filetype_blacklist || []).map((_t) => _t.toLowerCase())

backend/src/plugins/Mutes/MutesPlugin.ts

@@ -8,6 +8,7 @@ import { GuildMutes } from "../../data/GuildMutes";
 import { makeIoTsConfigParser, mapToPublicFn } from "../../pluginUtils";
 import { CasesPlugin } from "../Cases/CasesPlugin";
 import { LogsPlugin } from "../Logs/LogsPlugin";
+import { RoleManagerPlugin } from "../RoleManager/RoleManagerPlugin.js";
 import { zeppelinGuildPlugin } from "../ZeppelinPluginBlueprint";
 import { ClearBannedMutesCmd } from "./commands/ClearBannedMutesCmd";
 import { ClearMutesCmd } from "./commands/ClearMutesCmd";
@@ -68,7 +69,7 @@ export const MutesPlugin = zeppelinGuildPlugin<MutesPluginType>()({
     configSchema: ConfigSchema,
   },
 
-  dependencies: () => [CasesPlugin, LogsPlugin],
+  dependencies: () => [CasesPlugin, LogsPlugin, RoleManagerPlugin],
   configParser: makeIoTsConfigParser(ConfigSchema),
   defaultOptions,
 

backend/src/plugins/Utility/functions/getServerInfoEmbed.ts

@@ -205,9 +205,14 @@ export async function getServerInfoEmbed(
         [GuildPremiumTier.Tier3]: 60,
       }[restGuild.premiumTier] ?? 0;
 
+    const availableEmojis = restGuild.emojis.cache.filter((e) => e.available);
     otherStats.push(
-      `Emojis: **${restGuild.emojis.cache.size}** / ${maxEmojis * 2}${
+      `Emojis: **${availableEmojis.size}** / ${maxEmojis * 2}${
         roleLockedEmojis ? ` (__${roleLockedEmojis} role-locked__)` : ""
+      }${
+        availableEmojis.size < restGuild.emojis.cache.size
+          ? ` (__+${restGuild.emojis.cache.size - availableEmojis.size} unavailable__)`
+          : ""
       }`,
     );
     otherStats.push(`Stickers: **${restGuild.stickers.cache.size}** / ${maxStickers}`);

dashboard/src/components/docs/ConfigurationFormat.vue

@@ -20,7 +20,7 @@
         "172950000412655616": 50 # Example mod
 
       plugins:
-        mod_plugin:
+        mod_actions:
           config:
             kick_message: 'You have been kicked'
             can_kick: false

docker-compose.production.yml

@@ -21,7 +21,7 @@ services:
       MYSQL_USER: zeppelin
       MYSQL_PASSWORD: ${DOCKER_PROD_MYSQL_PASSWORD?:Missing DOCKER_PROD_MYSQL_PASSWORD}
     ports:
-      - ${DOCKER_PROD_MYSQL_PORT:?Missing DOCKER_PROD_MYSQL_PORT}:3306
+      - 127.0.0.1:${DOCKER_PROD_MYSQL_PORT:?Missing DOCKER_PROD_MYSQL_PORT}:3306
     volumes:
       - ./docker/production/data/mysql:/var/lib/mysql
     command: --authentication-policy=mysql_native_password

package.json

@@ -4,9 +4,9 @@
   "description": "",
   "private": true,
   "scripts": {
-    "format": "prettier --write './backend/src/**/*.{css,html,js,json,ts,tsx}' './dashboard/src/**/*.{css,html,js,json,ts,tsx}'",
-    "lint": "eslint './backend/src/**/*.{js,ts,tsx}' './dashboard/src/**/*.{js,ts,tsx}'",
-    "codestyle-check": "prettier --check './backend/src/**/*.{css,html,js,json,ts,tsx}' './dashboard/src/**/*.{css,html,js,json,ts,tsx}'"
+    "format": "prettier --write \"./backend/src/**/*.{css,html,js,json,ts,tsx}\" \"./dashboard/src/**/*.{css,html,js,json,ts,tsx}\"",
+    "lint": "eslint \"./backend/src/**/*.{js,ts,tsx}\" \"./dashboard/src/**/*.{js,ts,tsx}\"",
+    "codestyle-check": "prettier --check \"./backend/src/**/*.{css,html,js,json,ts,tsx}\" \"./dashboard/src/**/*.{css,html,js,json,ts,tsx}\""
   },
   "devDependencies": {
     "@typescript-eslint/eslint-plugin": "^5.59.5",