Skip to content

Commit 2262dc3

Browse files
authored
Merge pull request #54 from botlabs-gg/allow-and-denylist
docs: replace black-/whitelist -> deny-/allowlist
2 parents ab81214 + ce5e94b commit 2262dc3

File tree

4 files changed

+25
-25
lines changed

4 files changed

+25
-25
lines changed

content/docs/custom-commands/commands.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,13 @@ Selecting a group allows you to edit it. Changes must be saved (**11**) to take
7878

7979
Using role/channel restrictions, it is possible to set conditions on which users can trigger a custom command.
8080

81-
Specifically, whitelisted roles or channels are required to run the command, whereas blacklisted roles or channels
81+
Specifically, allowlisted roles or channels are required to run the command, whereas denylisted roles or channels
8282
cannot use the command at all. These role restrictions are unrelated to member permissions. Having `Administrator`
8383
permissions will not override these restrictions.
8484

8585
{{< callout context="note" title="Note: Priority of Ignored vs. Required Roles" icon="outline/info-circle" >}}
8686

87-
YAGPDB was raised well and honors a "no" when told "no". In other words, blacklists take precedence over whitelists.
87+
YAGPDB was raised well and honors a "no" when told "no". In other words, denylists take precedence over allowlists.
8888

8989
{{< /callout >}}
9090

@@ -281,7 +281,7 @@ Group restrictions operate identically to [command-specific restrictions](#rolec
281281
#### CC Groups
282282

283283
A user executing a command must obey both the overarching group's restrictions and the command restrictions.
284-
Command-specific whitelists will _not_ override the group restrictions.
284+
Command-specific allowlists will _not_ override the group restrictions.
285285

286286
### Execution Statistics
287287

content/docs/moderation/advanced-automoderator/overview.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ to set it up.
1616
Advanced automoderator operates on the basis of user-configurable rules, which trigger on specific actions and
1717
conditions to produce certain effects. Collections of rules are referred to as rulesets.
1818

19-
Finally, there are lists you can create, which can be used to black- or whitelist words or domains.
19+
Finally, there are lists you can create, which can be used to black- or allowlist words or domains.
2020

2121
## Overview
2222

@@ -28,7 +28,7 @@ This tab is your first stop when starting with Advanced Automoderator, as it is
2828
telling name and click the **Create** button. This will create a new tab with that name.
2929

3030
Furthermore, this is also the place to create and manage your lists. Lists are used to store words or domains that you
31-
want to use as black- or whitelist triggers in your rules. More on that under [Lists](#lists).
31+
want to use as black- or allowlist triggers in your rules. More on that under [Lists](#lists).
3232

3333
### Logs
3434

@@ -42,11 +42,11 @@ With that out of the way, we'll go through how to _actually_ make Advanced Autom
4242

4343
### Lists
4444

45-
As mentioned above, lists are used to store words or domains that you want to use as black- or whitelist triggers in your
45+
As mentioned above, lists are used to store words or domains that you want to use as black- or allowlist triggers in your
4646
rules.
4747

4848
Multiple entries in word lists are separated by either a newline or a space. Entries in word lists must be single words
49-
containing no spaces; to blacklist complete phrases, use a regex trigger instead.
49+
containing no spaces; to denylist complete phrases, use a regex trigger instead.
5050

5151
For website / link lists, specify _just_ the site's domain, without any protocol or path. Subdomains will be
5252
automatically included. Logically, if you want to _only_ check against some specific subdomain (and its sub-subdomains),

content/docs/moderation/advanced-automoderator/triggers.md

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -50,8 +50,8 @@ This trigger will fire when a message exceeds the configured threshold for *uniq
5050

5151
This trigger will fire when a message contains *any* valid link.[^1]
5252

53-
For more fine-grained control, consider using the [Website blacklist](#website-blacklist) or
54-
[Website whitelist](#website-whitelist) trigger.
53+
For more fine-grained control, consider using the [Website denylist](#website-denylist) or
54+
[Website allowlist](#website-allowlist) trigger.
5555

5656
#### X Violations in y minutes
5757

@@ -69,7 +69,7 @@ This will trigger when the offending user has amassed x violations in y minutes,
6969
- **Ignore if a higher violation trigger of this name was activated**<br>
7070
Whether to ignore this if a trigger with a higher threshold for the same violation was activated. (Default: on)
7171

72-
#### Word blacklist
72+
#### Word denylist
7373

7474
This trigger will fire when a message contains any word from the specified list.
7575

@@ -79,23 +79,23 @@ This trigger will fire when a message contains any word from the specified list.
7979
- **Also match visually similar characters**<br>
8080
Whether to also match visually similar characters, like `Ĥéĺĺó`. (Default: off)
8181

82-
#### Word whitelist
82+
#### Word allowlist
8383

84-
Triggers when a message contains words **not** in the specified list. See [Word blacklist](#word-blacklist) for
84+
Triggers when a message contains words **not** in the specified list. See [Word denylist](#word-denylist) for
8585
configuration.
8686

87-
#### Website blacklist
87+
#### Website denylist
8888

8989
This trigger will fire when a message contains any link to a domain from the specified list, subdomains included.
9090

9191
- **List**<br>
9292
The list to check against. (Default: first found list)
9393

94-
#### Website whitelist
94+
#### Website allowlist
9595

96-
Triggers when a message contains links **not** in the specified list. See [Website blacklist](#website-blacklist).
96+
Triggers when a message contains links **not** in the specified list. See [Website denylist](#website-denylist).
9797

98-
Depending on your use-case, it may be more time-efficient to use a whitelist instead of a blacklist.
98+
Depending on your use-case, it may be more time-efficient to use a allowlist instead of a denylist.
9999

100100
#### Server invites
101101

@@ -186,7 +186,7 @@ This trigger will fire when the nickname of the user matches the specified regul
186186

187187
The inverse of [Nickname matches regex](#nickname-matches-regex). See there for configuration.
188188

189-
#### Nickname word whitelist
189+
#### Nickname word allowlist
190190

191191
This trigger will fire when the nickname of the user contains words **not** in the specified list.
192192

@@ -195,10 +195,10 @@ This trigger will fire when the nickname of the user contains words **not** in t
195195
- **Also match visually similar characters**<br>
196196
Whether to also match visually similar characters, like `Ĥéĺĺó`. (Default: off)
197197

198-
#### Nickname word blacklist
198+
#### Nickname word denylist
199199

200200
This trigger will fire when the nickname of the user contains any word from the specified list.
201-
See [Nickname word whitelist](#nickname-word-whitelist) for configuration.
201+
See [Nickname word allowlist](#nickname-word-allowlist) for configuration.
202202

203203
- **List**<br>
204204
The list to check against. (Default: first found list)
@@ -221,7 +221,7 @@ This trigger will fire when the offending user has sent x attachments in y secon
221221
See [X user attachments in Y seconds](#x-user-attachments-in-y-seconds), but now applied to the channel as a whole,
222222
instead of a single user.
223223

224-
#### Join username word whitelist
224+
#### Join username word allowlist
225225

226226
This trigger will fire when the username of a user joining the server contains words **not** in the specified list.
227227

@@ -230,10 +230,10 @@ This trigger will fire when the username of a user joining the server contains w
230230
- **Also match visually similar characters**<br>
231231
Whether to also match visually similar characters, like `Ĥéĺĺó`. (Default: off)
232232

233-
#### Join username word blacklist
233+
#### Join username word denylist
234234

235235
This trigger will fire when the username of a user joining the server contains any word from the specified list. See
236-
[Join username word whitelist](#join-username-word-whitelist) for configuration.
236+
[Join username word allowlist](#join-username-word-allowlist) for configuration.
237237

238238
#### Join username matches regex
239239

content/docs/moderation/logging.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -105,9 +105,9 @@ messages, they will not be able to see deleted messages, or that a message was d
105105

106106
## Blacklisting Channels
107107

108-
Under the Logging page on the control panel you may blacklist channels for log creation. Using the logs command in a
109-
blacklisted channel will return an error message. Moderation actions will also not generate or attach logs in
110-
blacklisted channels.
108+
Under the Logging page on the control panel you may denylist channels for log creation. Using the logs command in a
109+
denylisted channel will return an error message. Moderation actions will also not generate or attach logs in
110+
denylisted channels.
111111

112112
## Deleting Logs
113113

0 commit comments

Comments
 (0)