Skip to content

Commit d285aee

Browse files
Kevinking500Kevinking500
authored andcommitted
Disabled allowing reply pings, added the enable moderation and enable advanced configuration in moderation.json and made the choices inside depend on it because I forgot to :/ Added the options to enable/disable pings/modlogs/logs kept after leave and made the choices depend on it + made those choices with numbers select instead of integers for almost 0 user-error issues.
1 parent 1602a16 commit d285aee

File tree

3 files changed

+114
-18
lines changed

3 files changed

+114
-18
lines changed

modules/ping-protection/configs/configuration.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
"de": "Wenn aktiviert, sind Antworten (mit Mention) an geschützte Benutzer erlaubt."
7676
},
7777
"type": "boolean",
78-
"default": { "en": true }
78+
"default": { "en": false }
7979
},
8080
{
8181
"name": "pingWarningMessage",

modules/ping-protection/configs/moderation.json

Lines changed: 53 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,32 @@
1010
},
1111
"configElements": true,
1212
"content": [
13+
{
14+
"name": "enableModeration",
15+
"humanName": {
16+
"en": "Enable Moderation Actions",
17+
"de": "Bestrafungsaktionen aktivieren"
18+
},
19+
"description": {
20+
"en": "If enabled, members who ping protected users/roles repeatedly will be punished.",
21+
"de": "Wenn aktiviert, werden Mitglieder, die geschützte Benutzer/Rollen wiederholt pingen, bestraft."
22+
},
23+
"type": "boolean",
24+
"default": { "en": false }
25+
},
26+
{
27+
"name": "advancedConfiguration",
28+
"humanName": {
29+
"en": "Use Advanced Configuration",
30+
"de": "Erweiterte Konfiguration verwenden"
31+
},
32+
"description": {
33+
"en": "If enabled, the advanced configuration below will be used and the basic configuration will be ignored.",
34+
"de": "Wenn aktiviert, wird die untenstehende erweiterte Konfiguration verwendet und die Basis-Konfiguration ignoriert."
35+
},
36+
"type": "boolean",
37+
"default": { "en": false }
38+
},
1339
{
1440
"name": "pingsCountBasic",
1541
"humanName": {
@@ -21,7 +47,11 @@
2147
"de": "Anzahl Pings für Bestrafung (Nutzt 'Ping-Verlauf Speicherzeit')."
2248
},
2349
"type": "integer",
24-
"default": { "en": 5 }
50+
"default": { "en": 5 },
51+
"dependsOn": {
52+
"name": "enableModeration",
53+
"value": true
54+
}
2555
},
2656
{
2757
"name": "pingsCountAdvanced",
@@ -34,7 +64,11 @@
3464
"de": "Anzahl Pings im unten gewählten Zeitraum."
3565
},
3666
"type": "integer",
37-
"default": { "en": 5 }
67+
"default": { "en": 5 },
68+
"dependsOn": {
69+
"name": "advancedConfiguration",
70+
"value": true
71+
}
3872
},
3973
{
4074
"name": "timeframeWeeks",
@@ -47,7 +81,11 @@
4781
"de": "In wie vielen Wochen müssen diese Pings passieren?"
4882
},
4983
"type": "integer",
50-
"default": { "en": 1 }
84+
"default": { "en": 1 },
85+
"dependsOn": {
86+
"name": "advancedConfiguration",
87+
"value": true
88+
}
5189
},
5290
{
5391
"name": "actionType",
@@ -60,20 +98,28 @@
6098
},
6199
"type": "select",
62100
"content": ["MUTE", "KICK"],
63-
"default": { "en": "MUTE" }
101+
"default": { "en": "MUTE" },
102+
"dependsOn": {
103+
"name": "enableModeration",
104+
"value": true
105+
}
64106
},
65107
{
66108
"name": "muteDuration",
67109
"humanName": {
68-
"en": "Mute Duration (Only if Action is MUTE)",
69-
"de": "Mute-Dauer (Nur bei MUTE Aktion)"
110+
"en": "Mute Duration",
111+
"de": "Mute-Dauer"
70112
},
71113
"description": {
72114
"en": "How long to mute the user? (in minutes)",
73115
"de": "Wie lange soll der User gemutet werden? (in Minuten)"
74116
},
75117
"type": "integer",
76-
"default": { "en": 60 }
118+
"default": { "en": 60 },
119+
"dependsOn": {
120+
"name": "actionType",
121+
"value": "MUTE"
122+
}
77123
}
78124
]
79125
}

modules/ping-protection/configs/storage.json

Lines changed: 60 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -6,37 +6,87 @@
66
"de": "Konfiguriere, wie lange Mod-Logs und Leaver-Daten gespeichert werden."
77
},
88
"content": [
9+
{
10+
"name": "enablePingHistory",
11+
"humanName": {
12+
"en": "Enable Ping History",
13+
"de": "Ping-Verlauf aktivieren"
14+
},
15+
"description": {
16+
"en": "If enabled, the bot will keep a history of pings to enforce moderation actions.",
17+
"de": "Wenn aktiviert, speichert der Bot einen Ping-Verlauf, um Bestrafungsaktionen durchzusetzen."
18+
},
19+
"type": "boolean",
20+
"default": { "en": true }
21+
},
922
{
1023
"name": "pingHistoryRetention",
1124
"humanName": {
1225
"en": "Ping History Retention",
1326
"de": "Ping-Verlauf Speicherzeit"
1427
},
1528
"description": {
16-
"en": "Decides on how long to keep ping logs. Minimum is 12 weeks (3 months) with a maximum of 24 weeks (6 months). This is the length factor of the 'Basic' punishment timeframe.",
17-
"de": "Entscheidet, wie lange Ping-Logs gespeichert werden. Minimum 12 Wochen, Maximum 24 Wochen. Dies ist der Faktor für den 'Basis'-Bestrafungszeitraum."
29+
"en": "Decides on how long to keep ping logs. Minimum is 4 weeks (1 month) with a maximum of 24 weeks (6 months). This is the length factor of the 'Basic' punishment timeframe.",
30+
"de": "Entscheidet, wie lange Ping-Logs gespeichert werden. Minimum 1 Woche, Maximum 24 Wochen. Dies ist der Faktor für den 'Basis'-Bestrafungszeitraum."
1831
},
19-
"type": "integer",
20-
"default": { "en": 12 }
32+
"type": "select",
33+
"content": [4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24],
34+
"default": { "en": 12 },
35+
"dependsOn": {
36+
"name": "enablePingHistory",
37+
"value": true
38+
}
39+
},
40+
{
41+
"name": "enableModLogHistory",
42+
"humanName": {
43+
"en": "Enable Moderation Log History",
44+
"de": "Mod-Log Verlauf aktivieren"
45+
},
46+
"description": {
47+
"en": "If enabled, the bot will keep a history of moderation actions taken by the ping-protection module.",
48+
"de": "Wenn aktiviert, speichert der Bot einen Verlauf der Bestrafungsaktionen des Ping-Schutz Moduls."
49+
},
50+
"type": "boolean",
51+
"default": { "en": false }
2152
},
2253
{
2354
"name": "modLogRetention",
2455
"humanName": { "en": "Moderation Log Retention (Months)", "de": "Mod-Log Speicherzeit (Monate)" },
2556
"description": {
26-
"en": "How long to keep records of punishments (6-12 Months).",
27-
"de": "Wie lange Bestrafungsprotokolle gespeichert werden (6-12 Monate)."
57+
"en": "How long to keep records of punishments (3-12 Months).",
58+
"de": "Wie lange Bestrafungsprotokolle gespeichert werden (3-12 Monate)."
2859
},
29-
"type": "integer",
30-
"default": { "en": 6 }
60+
"type": "select",
61+
"content": [3, 4, 5, 6, 7, 8, 9, 10, 11, 12],
62+
"default": { "en": 6 },
63+
"dependsOn": {
64+
"name": "enableModLogHistory",
65+
"value": true
66+
}
67+
},
68+
{
69+
"name": "enableLeaverDataRetention",
70+
"humanName": {
71+
"en": "Keep user logs after they leave",
72+
"de": "Benutzerprotokolle nach Verlassen speichern"
73+
},
74+
"description": {
75+
"en": "If enabled, the bot will keep a history of the user after they leave.",
76+
"de": "Wenn aktiviert, speichert der Bot einen Verlauf des Benutzers, nachdem er den Server verlassen hat."
77+
},
78+
"type": "boolean",
79+
"default": { "en": true }
3180
},
3281
{
3382
"name": "leaverRetention",
3483
"humanName": { "en": "Leaver Data Retention (Days)", "de": "Leaver-Daten Speicherzeit (Tage)" },
3584
"description": {
36-
"en": "How long to keep data after a user leaves (1-3 Days).",
85+
"en": "How long to keep data after a user leaves (1-7 Days).",
3786
"de": "Wie lange Daten gespeichert bleiben, nachdem ein User den Server verlässt."
3887
},
39-
"type": "integer",
88+
"type": "select",
89+
"content": [1, 2, 3, 4, 5, 6, 7],
4090
"default": { "en": 1 }
4191
}
4292
]

0 commit comments

Comments
 (0)