Added support for actually correct parameters and those parameters added into the message editor for the warning message

Author: Kevinking500

modules/ping-protection/configs/configuration.json

@@ -11,65 +11,39 @@
   "content": [
     {
       "name": "protectedRoles",
-      "humanName": { 
-        "en": "Protected Roles", 
-        "de": "Geschützte Rollen"
-      },
-      "description": { 
-        "en": "Members with these roles will trigger protection when pinged.", 
-        "de": "Mitglieder mit diesen Rollen lösen den Schutz aus." 
-    },
+      "humanName": { "en": "Protected Roles", "de": "Geschützte Rollen" },
+      "description": { "en": "Members with these roles will trigger protection when pinged.", "de": "Mitglieder mit diesen Rollen lösen den Schutz aus." },
       "type": "array",
       "content": "roleID",
       "default": { "en": [] }
     },
     {
       "name": "protectedUsers",
-      "humanName": { 
-        "en": "Protected Users", 
-        "de": "Geschützte Benutzer" 
-    },
-      "description": { 
-        "en": "Specific users who are protected from pings.", 
-        "de": "Spezifische Benutzer, die geschützt sind." 
-    },
+      "humanName": { "en": "Protected Users", "de": "Geschützte Benutzer" },
+      "description": { "en": "Specific users who are protected from pings.", "de": "Spezifische Benutzer, die geschützt sind." },
       "type": "array",
       "content": "userID",
       "default": { "en": [] }
     },
     {
       "name": "ignoredRoles",
-      "humanName": { 
-        "en": "Whitelisted Roles", 
-        "de": "Erlaubte Rollen" 
-    },
-      "description": { 
-        "en": "Roles allowed to ping protected members or roles.", 
-        "de": "Rollen, die pingen dürfen." 
-    },
+      "humanName": { "en": "Whitelisted Roles", "de": "Erlaubte Rollen" },
+      "description": { "en": "Roles allowed to ping protected members or roles.", "de": "Rollen, die pingen dürfen." },
       "type": "array",
       "content": "roleID",
       "default": { "en": [] }
     },
     {
       "name": "ignoredChannels",
-      "humanName": { 
-        "en": "Ignored Channels", 
-        "de": "Ignorierte Kanäle" 
-    },
-      "description": { 
-        "en": "Pings in these channels are ignored.", 
-        "de": "Pings hier werden ignoriert." },
+      "humanName": { "en": "Ignored Channels", "de": "Ignorierte Kanäle" },
+      "description": { "en": "Pings in these channels are ignored.", "de": "Pings hier werden ignoriert." },
       "type": "array",
       "content": "channelID",
       "default": { "en": [] }
     },
     {
       "name": "allowReplyPings",
-      "humanName": { 
-        "en": "Allow Reply Pings", 
-        "de": "Antwort-Pings erlauben" 
-    },
+      "humanName": { "en": "Allow Reply Pings", "de": "Antwort-Pings erlauben" },
       "description": { 
         "en": "If enabled, replying to a protected user (with mention ON) is allowed.", 
         "de": "Wenn aktiviert, sind Antworten (mit Mention) an geschützte Benutzer erlaubt." 
@@ -79,25 +53,36 @@
     },
     {
       "name": "pingWarningMessage",
-      "humanName": { 
-        "en": "Warning Message", 
-        "de": "Warnnachricht" 
-    },
+      "humanName": { "en": "Warning Message", "de": "Warnnachricht" },
       "description": {
         "en": "The message that gets sent to the user when they ping someone.",
         "de": "Die Nachricht, die an den Benutzer gesendet wird."
       },
       "type": "string",
       "allowEmbed": true,
+      "params": [
+        {
+          "name": "target-name",
+          "description": { "en": "Name of the pinged user/role", "de": "Name des gepingten Benutzers/der Rolle" }
+        },
+        {
+          "name": "target-mention",
+          "description": { "en": "Mention of the pinged user/role", "de": "Erwähnung des gepingten Benutzers/der Rolle" }
+        },
+        {
+          "name": "target-id",
+          "description": { "en": "ID of the pinged user/role", "de": "ID des gepingten Benutzers/der Rolle" }
+        }
+      ],
       "default": {
         "en": {
-          "title": "You are not allowed to ping %target_name%!",
-          "description": "You are not allowed to ping %target_mention% due to your role. You can view which roles/members you are not allowed to ping by using the `/ping protection list roles` or `/ping protection list members`.\n\nIf you were replying, make sure to turn off the mention in the reply.",
+          "title": "You are not allowed to ping %target-name%!",
+          "description": "You are not allowed to ping %target-mention% due to your role. You can view which roles/members you are not allowed to ping by using the `/ping protection list roles` or `/ping protection list members`.\n\nIf you were replying, make sure to turn off the mention in the reply.",
           "color": "RED"
         },
         "de": {
-          "title": "Du darfst %target_name% nicht pingen!",
-          "description": "Du darfst %target_mention% aufgrund deiner Rolle nicht pingen. Du kannst sehen, welche Rollen/Mitglieder du nicht pingen darfst, indem du `/ping protection list roles` oder `/ping protection list members` benutzt.\n\nFalls du geantwortet hast, stelle sicher, dass die Erwähnung in der Antwort deaktiviert ist.",
+          "title": "Du darfst %target-name% nicht pingen!",
+          "description": "Du darfst %target-mention% aufgrund deiner Rolle nicht pingen. Du kannst sehen, welche Rollen/Mitglieder du nicht pingen darfst, indem du `/ping protection list roles` oder `/ping protection list members` benutzt.\n\nFalls du geantwortet hast, stelle sicher, dass die Erwähnung in der Antwort deaktiviert ist.",
           "color": "RED"
         }
       }

modules/ping-protection/ping-protection.js

@@ -1,5 +1,5 @@
 /**
- * Logic and functions for the Ping Protection module
+ * Logic for the Ping Protection module
  * @module ping-protection
  * @author itskevinnn
  */
@@ -51,12 +51,12 @@ async function sendPingWarning(client, message, target, moduleConfig) {
     if (!warningMsg) return;
 
     const targetName = target.name || target.tag || target.username || 'Unknown';
-
     const targetMention = target.toString();
 
     const placeholders = {
-        '%target_name%': targetName,
-        '%target_mention%': targetMention
+        '%target-name%': targetName,
+        '%target-mention%': targetMention,
+        '%target-id%': target.id
     };
 
     const replyOptions = embedType(warningMsg, placeholders);
@@ -97,13 +97,14 @@ async function fetchModHistory(client, userId, limit = 10) {
 }
 
 /**
- * Executes a punishment and logs it.
+ * Executes a punishment and optionally logs it.
  * @param {Client} client 
  * @param {GuildMember} member 
  * @param {Object} actionConfig 
  * @param {string} reason 
+ * @param {Object} storageConfig 
  */
-async function executeAction(client, member, actionConfig, reason) {
+async function executeAction(client, member, actionConfig, reason, storageConfig) {
     const ModLog = client.models['ping-protection']['ModerationLog'];
 
     try {
@@ -112,23 +113,27 @@ async function executeAction(client, member, actionConfig, reason) {
 
             await member.timeout(durationMs, reason);
 
-            await ModLog.create({
-                userId: member.id,
-                actionType: 'MUTE',
-                actionDuration: durationMs,
-                reason: reason
-            });
+            if (storageConfig && storageConfig.enableModLogHistory) {
+                await ModLog.create({
+                    userId: member.id,
+                    actionType: 'MUTE',
+                    actionDuration: durationMs,
+                    reason: reason
+                });
+            }
             client.logger.info(`[ping-protection] Muted ${member.user.tag} for ${actionConfig.muteDuration} mins. Reason: ${reason}`);
 
         } else if (actionConfig.type === 'KICK') {
             await member.kick(reason);
 
-            await ModLog.create({
-                userId: member.id,
-                actionType: 'KICK',
-                actionDuration: null,
-                reason: reason
-            });
+            if (storageConfig && storageConfig.enableModLogHistory) {
+                await ModLog.create({
+                    userId: member.id,
+                    actionType: 'KICK',
+                    actionDuration: null,
+                    reason: reason
+                });
+            }
             client.logger.info(`[ping-protection] Kicked ${member.user.tag}. Reason: ${reason}`);
         }
     } catch (error) {
@@ -189,4 +194,4 @@ module.exports = {
     getLeaverStatus,
     markUserAsLeft,
     markUserAsRejoined
-};
+};