Skip to content

Commit eab6e39

Browse files
authored
Merge pull request #491 from tweirtx/master
Fix slash command timeouts with modlog, update documentation, and fix lint
2 parents 33b87a1 + a7dbeaf commit eab6e39

111 files changed

Lines changed: 4725 additions & 1162 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM python:3.10.6
1+
FROM python:3.10.19
22
WORKDIR /app
33
COPY . /app
44
RUN pip install -Ur requirements.txt

docs/Actionlog.rst

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,16 +15,6 @@ Command group to configure Join/Leave logs
1515
`{prefix}memberlogconfig setjoinmessage template`: Sets join template
1616
`{prefix}memberlogconfig setleavemessage template`: Sets leave template
1717
`{prefix}memberlogconfig help`: Returns the template formatting key
18-
setleavemessage
19-
+++++++++++++++
20-
Configure custom leave message template
21-
::
22-
23-
setjoinmessage
24-
++++++++++++++
25-
Configure custom join message template
26-
::
27-
2818
help
2919
++++
3020
Displays message formatting key
@@ -35,6 +25,22 @@ toggleping
3525
Toggles whenever a new member gets pinged on join
3626
::
3727
28+
setleavemessage
29+
+++++++++++++++
30+
Configure custom leave message template
31+
::
32+
33+
viewconfig
34+
++++++++++
35+
Command to view Join/Leave logs configuration.
36+
::
37+
38+
togglesendonverify
39+
++++++++++++++++++
40+
Toggles if a join log is sent on user joining or on completing
41+
verification
42+
::
43+
3844
disable
3945
+++++++
4046
Disables Join/Leave logging
@@ -45,6 +51,11 @@ setchannel
4551
Configure join/leave channel
4652
::
4753
54+
setjoinmessage
55+
++++++++++++++
56+
Configure custom join message template
57+
::
58+
4859
locknickname
4960
++++++++++++
5061
Locks a members nickname to a particular string, in essence revoking

docs/FTCInfo.rst

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,37 @@
1+
=======
2+
FTCInfo
3+
=======
4+
ftc
5+
+++
6+
Get information on an FTC team from FTC-Events. If no subcommand is
7+
specified, the `team` subcommand is inferred, and the argument is taken
8+
as a team number.
9+
::
10+
`{prefix}ftc 5667` - show information on team 5667, Robominers
11+
opr
12+
+++
13+
Get information with OPR on an FTC team by number.
14+
::
15+
16+
searchteam
17+
++++++++++
18+
Search for an FTC team by name.
19+
::
20+
`{prefix}ftc search warbots` - show first 5 teams with "warbots" in their name
21+
matches
22+
+++++++
23+
Get a match schedule, defaulting to the latest listed event on
24+
FTC-Events
25+
::
26+
`{prefix}ftc matches 16377` - show matches for the latest event by team 16377, Spicy Ketchup
27+
`{prefix}ftc matches 8393 USPACMP` - show matches for the Pennsylvania championship by team 8393, BrainSTEM
28+
team
29+
++++
30+
Get information on an FTC team by number.
31+
::
32+
`{prefix}ftc team 7244` - show information on team 7244, Out of the Box Robotics
33+
topr
34+
++++
35+
Get information with OPR on an FTC team by number.
36+
::
37+

docs/Filter.rst

Lines changed: 21 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,22 @@ Edit an already existing filter using a new pattern. A filter's friendly
1717
name cannot be edited.
1818
::
1919
`{prefix}filter edit 4 Swear` - Change filter 4 to filter out "Swear" instead of its previous pattern
20+
add
21+
+++
22+
Add a pattern to the filter using RegEx. Any word can be added and is
23+
tested case-insensitive.
24+
::
25+
`{prefix}filter add Swear` - Makes it so that "Swear" will be filtered
26+
list
27+
++++
28+
Lists word filters.
29+
::
30+
31+
remove
32+
++++++
33+
Remove a pattern from the filter list.
34+
::
35+
`{prefix}filter remove 7` - Disables filter with ID 7
2036
whitelist
2137
+++++++++
2238
List all whitelisted roles for this server
@@ -32,19 +48,13 @@ remove
3248
Remove a role from the whitelist
3349
::
3450
`{prefix}filter whitelist remove Admins` - Makes it so that Admins are caught by the filter again.
35-
remove
36-
++++++
37-
Remove a pattern from the filter list.
51+
viewlist
52+
++++++++
53+
List all whitelisted roles for this server
3854
::
39-
`{prefix}filter remove 7` - Disables filter with ID 7
55+
4056
dm
4157
++
4258
Set whether filter words should be DMed when used in bot messages
4359
::
44-
`{prefix}filter dm_config True` - Makes all messages containining filter lists to be sent through DMs
45-
add
46-
+++
47-
Add a pattern to the filter using RegEx. Any word can be added and is
48-
tested case-insensitive.
49-
::
50-
`{prefix}filter add Swear` - Makes it so that "Swear" will be filtered
60+
`{prefix}filter dm_config True` - Makes all messages containining filter lists to be sent through DMs

docs/Info.rst

Lines changed: 10 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,9 @@ Retrieve information about a member of the guild. If no arguments are
77
passed, information about the author is used. **This command works
88
without mentions.** Remove the '@' before your mention so you don't ping
99
the person unnecessarily. You can pick a member by: - Username
10-
(`cooldude`) - Username and discriminator (`cooldude#1234`) - ID
11-
(`326749693969301506`) - Nickname - must be exact and is case-sensitive
12-
(`"Mr. Cool Dude III | Team 1234"`) - Mention (not recommended) (`@Mr
13-
Cool Dude III | Team 1234`)
10+
(`cooldude`) - ID (`326749693969301506`) - Nickname - must be exact and
11+
is case-sensitive (`"Mr. Cool Dude III | Team 1234"`) - Mention (not
12+
recommended) (`@Mr Cool Dude III | Team 1234`)
1413
::
1514
`{prefix}member`: show your member info
1615
`{prefix}member {ctx.me}`: show my member info
@@ -24,8 +23,13 @@ rolemembers
2423
Retrieve members who have this role
2524
::
2625
27-
guild
28-
+++++
26+
server
27+
++++++
2928
Retrieve information about this guild.
3029
::
3130
`{prefix}guild` - get information about this guild
31+
stats
32+
+++++
33+
Get current running internal/host stats for the bot
34+
::
35+
`{prefix}stats` - get current bot/host stats

docs/Levels.rst

Lines changed: 33 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ Levels
33
======
44
meesyncs
55
++++++++
6-
Function to scrape ranking data from the mee6 api and save it to the
6+
Function to scrap ranking data from the mee6 api and save it to the
77
database
88
::
99
`{prefix}meesyncs`: Sync ranking data from the mee6 API to dozer's database
@@ -25,6 +25,11 @@ Swaps Snowplow's xp with Dozer's xp
2525
`{prefix}adjustlevels transferxp <@Snowplow or "Snowplow"> <@Dozer or "Dozer">`:
2626
Adds Snowplow's xp to dozer's xp
2727

28+
setlevel
29+
++++++++
30+
Changes a members level to requested level
31+
::
32+
2833
transferxp
2934
++++++++++
3035
Adds xp from one member to another member
@@ -35,11 +40,6 @@ swapxp
3540
Swap xp stats between two members in a guild
3641
::
3742
38-
setlevel
39-
++++++++
40-
Changes a members level to requested level
41-
::
42-
4343
adjustxp
4444
++++++++
4545
Adjusts a members xp by a certain amount
@@ -58,44 +58,49 @@ Configures dozer ranks:tm:
5858
`{prefix}configureranks notificationsoff`: Turns off notification channel
5959
`{prefix}configureranks setrolelevel role level`: Adds a level role
6060
`{prefix}configureranks delrolelevel role`: Deletes a level role
61+
notificationchannel
62+
+++++++++++++++++++
63+
Set up the channel where level up messages are sent
64+
::
65+
66+
xprange
67+
+++++++
68+
Set the range of a servers levels random xp
69+
::
70+
71+
setrolelevel
72+
++++++++++++
73+
Sets a role to be given to a user when they reach a certain level
74+
::
75+
`{prefix}setrolelevel "level 2" 2`: Will configure the role "level 2" to be given to users who reach level 2`
6176
notificationsoff
6277
++++++++++++++++
6378
Turns off level up messages
6479
::
6580
66-
setcooldown
67-
+++++++++++
68-
Set the time in seconds between messages before xp is calculated again
81+
toggle
82+
++++++
83+
Toggle dozer ranks
6984
::
7085
71-
keeproles
72-
+++++++++
73-
Toggles whenever old level role roles will be kept on level up
86+
view_config
87+
+++++++++++
88+
Shows dozer ranks:tm: config.
7489
::
7590
7691
removerolelevel
7792
+++++++++++++++
7893
Removes a levelrole
7994
::
8095
`{prefix}removerolelevel level 2 `: Will remove role "level 2" from level roles
81-
toggle
82-
++++++
83-
Toggle dozer ranks
84-
::
85-
86-
setrolelevel
87-
++++++++++++
88-
Sets a role to be given to a user when they reach a certain level
89-
::
90-
`{prefix}setrolelevel "level 2" 2`: Will configure the role "level 2" to be given to users who reach level 2`
91-
notificationchannel
92-
+++++++++++++++++++
93-
Set up the channel where level up messages are sent
96+
keeproles
97+
+++++++++
98+
Toggles whenever old level role roles will be kept on level up
9499
::
95100
96-
xprange
97-
+++++++
98-
Set the range of a servers levels random xp
101+
setcooldown
102+
+++++++++++
103+
Set the time in seconds between messages before xp is calculated again
99104
::
100105
101106
rank

docs/Management.rst

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@ list
1212
Displays currently scheduled messages
1313
::
1414
`{prefix}schedulesend list`: Lists all scheduled messages for the current guild
15+
delete
16+
++++++
17+
Delete a scheduled message
18+
::
19+
`{prefix}schedulesend delete 5`: Deletes the scheduled message with the ID of 5
1520
add
1621
+++
1722
Allows a message to be sent at a particular time Headers are
1823
distinguished by the characters `-/-`
1924
::
2025
`{prefix}schedulesend add #announcments "1/0/1970 0:00:00 GMT" Epoch -/- 00000`: Dozer will send a message on the unix epoch in #announcments
21-
delete
22-
++++++
23-
Delete a scheduled message
24-
::
25-
`{prefix}schedulesend delete 5`: Deletes the scheduled message with the ID of 5

docs/Moderation.rst

Lines changed: 18 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ reading messages.
6363
selfdeafen
6464
++++++++++
6565
Deafen yourself for a given time period to prevent you from reading or
66-
sending messages; useful as a study tool.
66+
sending messages.
6767
::
6868
`{prefix}selfdeafen time (1h5m, both optional) reason`: deafens you if you need to get work done
6969
undeafen
@@ -87,6 +87,12 @@ modlogconfig
8787
Set the modlog channel for a server by passing the channel id
8888
::
8989
`{prefix}modlogconfig #join-leave-logs` - set a channel named #join-leave-logs to log joins/leaves
90+
verifymember
91+
++++++++++++
92+
Command to verify a member who may not have a team number set, or who
93+
hasn't sent the required verification message.
94+
::
95+
9096
nmconfig
9197
++++++++
9298
Sets the config for the new members channel
@@ -121,6 +127,12 @@ safe default role conventions that the memberconfig command does.
121127
`{prefix}linkscrubconfig @ everyone` - set the default role as the link role (ping-safe)
122128
`{prefix}linkscrubconfig @.everyone` - set the default role as the link role (ping-safe)
123129
`{prefix}linkscrubconfig @/everyone` - set the default role as the link role (ping-safe)
130+
say_the_line
131+
++++++++++++
132+
Says the line. "Welcome to the server! Please set your team affiliation
133+
in your nickname."
134+
::
135+
`{prefix}say_the_line @tweirtx` - Says the line mentioning @tweirtx
124136
crossbans
125137
+++++++++
126138
Cross ban
@@ -136,3 +148,8 @@ unsubscribe
136148
Remove cross ban subscription
137149
::
138150
151+
view_subs
152+
+++++++++
153+
View crossban subscriptions for the current server
154+
::
155+

docs/Modmail.rst

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
=======
2+
Modmail
3+
=======
4+
reply
5+
+++++
6+
Command to reply to a modmail thread.
7+
::
8+
9+
configure_modmail
10+
+++++++++++++++++
11+
Modmail configuration command. target_channel may be in another guild.
12+
::
13+
14+
start_modmail_with_user
15+
+++++++++++++++++++++++
16+
Start modmail with a user, should be used in channel with modmail button
17+
::
18+
19+
create_modmail_button
20+
+++++++++++++++++++++
21+
Creates modmail button
22+
::
23+
24+
modmail_close
25+
+++++++++++++
26+
Closes modmail threads
27+
::
28+

0 commit comments

Comments
 (0)