Skip to content

Commit 7afa958

Browse files
Laura Demkowicz-DuffyLaura Demkowicz-DuffyFluxticks
authored
Hotfixes from Testing Session (#183)
* Remove reference to deprecated function * Move music channel management commands to their own group to avoid falling into channel checking problems * Fixed an issue caused by moving default_role_id to its own table from Guild_info * Fixed an issue where a VM child would not be created if the Parent VC was joined from another VM Child * Correct musicchannel command in README * Fixed an issue where youtu.be links would not work * Fixed an issue where songs would not play when supplying the URL directly * Added missing doc strings for EventCategoriesCog functions Co-authored-by: Laura Demkowicz-Duffy <laura@laurademkowiczduffy.co.uk> Co-authored-by: Fluxticks <benjigarment.appdev@gmail.com>
1 parent 3316c40 commit 7afa958

File tree

5 files changed

+215
-225
lines changed

5 files changed

+215
-225
lines changed

README.md

Lines changed: 68 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -67,70 +67,70 @@ $ source secrets.env
6767
```bash
6868
$ cd src
6969
```
70-
5. Install all the requirements for python:
71-
```bash
72-
pip install -r requirements.txt
73-
```
74-
6. Run the bot:
75-
```bash
76-
python3 main.py
77-
```
78-
79-
## Current Functions
80-
The list below describes the different "Cogs" of the bot, their associated commands, and any additional information required to set them up.
81-
82-
<details>
83-
<summary>Voicemaster</summary>
84-
85-
### Voicemaster
86-
#### !setvmmaster <channel_id>
87-
* Make the given ID a Voicemaster master.
88-
89-
#### !getvmmasters * Get all the Voicemaster masters in the server.
90-
91-
#### !removevmmaster <channel_id>
92-
* Remove the given ID as a Voicemaster master.
93-
94-
#### !removeallmasters * Remove all Voicemaster masters from the server.
95-
96-
#### !killallslaves * Kill all the Voicemaster slave channels in the server.
97-
98-
#### !lockvm * Locks the Voicemaster slave you're currently in to the number of current members.
99-
100-
#### !unlockvm * Unlocks the Voicemaster slave you're currently in.
101-
</details>
102-
103-
<details>
104-
<summary>Default Role</summary>
105-
106-
### Default role
107-
#### !setdefaultroles <role_mention | role_id> * Sets the roles that the server gives to members when they join the server.
108-
109-
#### !getdefaultroles * Gets the current default roles set for the server.
110-
111-
#### !removedefaultroles * Removes the current default roles for the server.
112-
</details>
113-
114-
<details>
115-
<summary>Log Channel</summary>
116-
117-
### Log Channel
118-
#### !setlogchannel <channel_mention | channel_id> * Set the log channel to the #'ed channel or given role ID.
119-
120-
#### !getlogchannel * Gets the current log channel value.
121-
122-
#### !removelogchannel * Removes the current log channel value.
123-
</details>
124-
125-
<details>
126-
<summary>Administrator Tools</summary>
127-
128-
### Administrator Tools
129-
Adds a few commands useful for admin operations.
130-
#### !clear_message * Aliases: `cls, purge, delete`
131-
* Clear the specified number of messages from the current text channel.
132-
133-
#### !members
70+
5. Install all the requirements for python:
71+
```bash
72+
pip install -r requirements.txt
73+
```
74+
6. Run the bot:
75+
```bash
76+
python3 main.py
77+
```
78+
79+
## Current Functions
80+
The list below describes the different "Cogs" of the bot, their associated commands, and any additional information required to set them up.
81+
82+
<details>
83+
<summary>Voicemaster</summary>
84+
85+
### Voicemaster
86+
#### !setvmmaster <channel_id>
87+
* Make the given ID a Voicemaster master.
88+
89+
#### !getvmmasters * Get all the Voicemaster masters in the server.
90+
91+
#### !removevmmaster <channel_id>
92+
* Remove the given ID as a Voicemaster master.
93+
94+
#### !removeallmasters * Remove all Voicemaster masters from the server.
95+
96+
#### !killallslaves * Kill all the Voicemaster slave channels in the server.
97+
98+
#### !lockvm * Locks the Voicemaster slave you're currently in to the number of current members.
99+
100+
#### !unlockvm * Unlocks the Voicemaster slave you're currently in.
101+
</details>
102+
103+
<details>
104+
<summary>Default Role</summary>
105+
106+
### Default role
107+
#### !setdefaultroles <role_mention | role_id> * Sets the roles that the server gives to members when they join the server.
108+
109+
#### !getdefaultroles * Gets the current default roles set for the server.
110+
111+
#### !removedefaultroles * Removes the current default roles for the server.
112+
</details>
113+
114+
<details>
115+
<summary>Log Channel</summary>
116+
117+
### Log Channel
118+
#### !setlogchannel <channel_mention | channel_id> * Set the log channel to the #'ed channel or given role ID.
119+
120+
#### !getlogchannel * Gets the current log channel value.
121+
122+
#### !removelogchannel * Removes the current log channel value.
123+
</details>
124+
125+
<details>
126+
<summary>Administrator Tools</summary>
127+
128+
### Administrator Tools
129+
Adds a few commands useful for admin operations.
130+
#### !clear_message * Aliases: `cls, purge, delete`
131+
* Clear the specified number of messages from the current text channel.
132+
133+
#### !members
134134
* List the current number of members in the server.
135135

136136
#### !remove-cog \<cog name>
@@ -439,22 +439,22 @@ For this cog to work, the `GOOGLE_API` env var must also be set, and instruction
439439
1. Click on `Create Credentials` and then `API key`.
440440
1. Copy the key given. For security, it is recommended that you "restrict key" and only enable `YouTube Data API v3`.
441441

442-
#### !music channel set \<channel mention> [optional: [args]]
442+
#### musicchannel set \<channel mention> [optional: [args]]
443443

444444
* This sets the channel mentioned to be used as the music channel. All messages into this channel will be considered music requests, and any music commands must be sent in this channel.
445445
* Optional args:
446446
* Using `-c` will clear the entire channel before setting it up as the music channel.
447447
* *Requires `administrator` permission in Discord*
448448

449-
#### !music channel get
449+
#### musicchannel get
450450
* Sends the currently set music channel for the server.
451451
* *Requires `administrator` permission in Discord*
452452

453-
#### !music channel reset
453+
#### musicchannel reset
454454
* This clears the current music channel and resets the preview and queue messages.
455455
* *Requires `administrator` permission in Discord*
456456

457-
#### !music channel remove
457+
#### musicchannel remove
458458

459459
* Unlinks the currently linked music channel from being the music channel. This will not delete the channel or its contents.
460460
* *Requires `administrator` permission in Discord*

src/esportsbot/cogs/DefaultRoleCog.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
from esportsbot.base_functions import role_id_from_mention
33
from esportsbot.db_gateway import DBGatewayActions
44
from esportsbot.models import Guild_info, Default_roles
5-
from esportsbot.base_functions import role_id_from_mention, send_to_log_channel
5+
from esportsbot.base_functions import role_id_from_mention
66

77

88
class DefaultRoleCog(commands.Cog):

0 commit comments

Comments
 (0)