Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Slash commands and updates to codebase #229

Open
wants to merge 407 commits into
base: develop
Choose a base branch
from
Open

Slash commands and updates to codebase #229

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
407 commits
Select commit Hold shift + click to select a range
fe955ab
Implemented handling of different interaction IDs
Feb 10, 2023
c686596
Added enum for the kind of song request
Feb 11, 2023
bf0d8cc
Added check for if the requesting user is allowed to perform request
Feb 11, 2023
1daf689
Implemented outline for handling different request types
Feb 11, 2023
e5ac2a1
Added missing user string for invalid users
Feb 11, 2023
6517524
Updated README to include YAPF workaround
Feb 11, 2023
22cf41b
Changed type of author when successfully obtained
Feb 13, 2023
dc13325
Created viewcount converter function
Feb 13, 2023
1141eea
Added return types of static methods
Feb 13, 2023
a090bf7
Implemented rudimentary string query for videos
Feb 13, 2023
d24c56c
Fixed incorrect early return type
Feb 13, 2023
8a2414e
Added preferred keywords for better results
Feb 13, 2023
d857df3
Chaged URL requested to correctly fail
Feb 13, 2023
f5ed3a5
Removed usage of richThumbnails
Feb 13, 2023
4d12b03
Fixed check_valid_user not awaited
Feb 13, 2023
ca21680
Fixed issue caused when user not in voice
Feb 13, 2023
a3063e4
Fixed incorrect str.trim() to str.strip()
Feb 13, 2023
1dbfe29
Moved user validation check
Feb 13, 2023
dbc62ab
Changed response message to music request
Feb 13, 2023
8ec6614
Updated regex to properly categorise requests
Feb 16, 2023
86b7ad2
Implemented updating of embed upon song request
Feb 16, 2023
729da98
Updated response for adding songs to queue
Feb 21, 2023
d169874
Added music channel DB model
Mar 16, 2023
038f461
Added yt-dlp dependancy
Mar 16, 2023
08ec6d1
Implemented interaction enums
Mar 16, 2023
47b1f77
Implemented SongRequest dataclass
Mar 16, 2023
56a5b2e
Implemented request type parsing
Mar 16, 2023
bb2c468
Implemented basic video info gathering
Mar 16, 2023
a065eb5
Added funciton to get song stream data
Mar 16, 2023
7559b18
Added skeleton VCMusic groupcog
Mar 16, 2023
18173fd
Added MusicChannels to __all__
Mar 16, 2023
53d852c
Reimplimented set-channel command
Mar 16, 2023
1a97fc8
Added log line for when cog is loaded
Mar 16, 2023
7abb51a
Added interaction listener
Mar 16, 2023
5389d38
Implemented ADD_SONG UserAction handler
Mar 16, 2023
fa4055d
Added loading of author
Mar 16, 2023
54ad935
Implemented song queue and playing
Mar 16, 2023
d5e2e81
Fixed incorrect event being handled
Mar 17, 2023
45b1b91
Added function to handle if an interaction needs a response or followup
Mar 17, 2023
00a9a12
Changed ephemeral to use bot settings
Mar 17, 2023
ab47396
Implemented simple pause handler
Mar 17, 2023
2aa37ef
Added support for skip button
Mar 17, 2023
dae257e
SKIP action can now be handled
Mar 17, 2023
2be0759
Implemented correct toggle of play/pause button
Mar 17, 2023
7abd0de
Implemented play/pause button event handling
Mar 18, 2023
8fbce9c
Changed active_players to use dataclass instead of dictionary
Mar 18, 2023
6e62649
Fixed issue where voice_client was not assigned
Mar 18, 2023
6b18a66
Fixed issue where queue was being played in reverse
Mar 18, 2023
82142f8
Implemented SKIP interaction and handling
Mar 18, 2023
bc10c96
Impkemented handling of VIEW_QUEUE user interaction
Mar 18, 2023
6f2b806
fixed parsing of YOUTUBE_VIDEO song requests
Mar 18, 2023
7688a9e
Updated string query algorithm
Mar 18, 2023
b4f1a2d
Removed redudant code
Mar 18, 2023
6d5f16c
Implemented STOP UserAction handling
Mar 19, 2023
0f056d7
Fixed playback not being correctly stopped
Mar 19, 2023
117fc44
Implemented auto deletion of messages after delay
Mar 19, 2023
ed8487e
No longer deletes followup messages when delay is None
Mar 19, 2023
17a4943
Removed EDIT button until implemented
Mar 19, 2023
3a35f4d
Made set music channel command admin only
Mar 19, 2023
d60a51e
Fixed flake8 violations
Mar 20, 2023
6805e21
Made all messages temporary
Mar 20, 2023
001b344
Implemented warning for when music bot is not setup
Mar 20, 2023
9929145
Added /play command
Mar 20, 2023
d74eef1
Added check for tasks if they are already running
Mar 20, 2023
62d5cbf
Consolodated music playback ending to function
Mar 20, 2023
01fff29
Updated request parsing
Mar 20, 2023
d578a30
Added support for youtube music links
Mar 20, 2023
6b7cbb9
Fixed issues with inactive players
Mar 20, 2023
65d4e33
Fixed issues when STOP has no active guild
Mar 20, 2023
32c846f
Fixed issues when STOP has no active guild
Mar 20, 2023
87c7692
Added remaining interactions as commands
Mar 20, 2023
c4c0c35
Fixed non-ephemeral messages
Mar 20, 2023
7b2a128
Updated README with VCMusic info
Mar 20, 2023
0e296f2
Merge pull request #1 from Fluxticks/MusicRefactor
Fluxticks Mar 20, 2023
8344a70
Bot now joins self-deafened for user privacy
Mar 20, 2023
2575129
Added set-volume command
Mar 20, 2023
88f5527
Added read-only flag to set-channel command
Mar 20, 2023
e258940
Refactored UserActionType id generation
Mar 20, 2023
97a450a
Added VOLUME user action
Mar 20, 2023
f9365b9
Added volume button
Mar 20, 2023
d126778
Fixed issue when using read-only flag
Mar 20, 2023
768dcf0
Updated fetching of author
Mar 20, 2023
e23365a
No longer auto delete view_queue messages
Mar 20, 2023
bc60042
Added function to escape special discord characters in titles
Mar 20, 2023
e9ce615
Fixed flak8 escape character violation
Mar 20, 2023
1ea843a
Added first request priority to increase feedback speed
Mar 20, 2023
3858ba3
Added google-api-python-client to requirements
Mar 20, 2023
e48a509
Added checking for channel moving and abandonment
Mar 20, 2023
67485f9
Fixed get_song not being awaited
Mar 20, 2023
0e221e3
Sorted imports
Mar 20, 2023
94ca8f5
Implemented handling of youtube playlists
Mar 20, 2023
7eafa89
Added queue truncating for long queues
Mar 20, 2023
ed2e795
Added shuffle-queue command
Mar 20, 2023
7039cba
Added requesting user to SongRequest and embed info
Mar 20, 2023
5db1b46
Added queue length indicator to embed
Mar 20, 2023
1fd749a
Moved EMBED_IMAGE_URL to environment variable
Mar 20, 2023
8c60ac2
Added docstrings to static functions
Mar 20, 2023
0d606fb
Finished adding docstrings for all functions
Mar 21, 2023
e34de0c
Merge branch 'MusicExtension' into develop
Mar 21, 2023
3ab347a
Converted AutoRoles to a GroupCog
Mar 21, 2023
f89de78
Updated commands to no longer use 'roles' prefix
Mar 21, 2023
71606c2
Converted EventTools to a GroupCog
Mar 21, 2023
787062a
Updated commands to no longer use 'events' prefix
Mar 21, 2023
a95a200
Converted VoiceAdmin to a GroupCog
Mar 21, 2023
96382cf
Updated commands to no longer use 'vc' prefix
Mar 21, 2023
9d77a2a
Converted AdminTools to a GroupCog
Mar 21, 2023
dc247f7
Updated commands to no longer use 'admin' prefix
Mar 21, 2023
b47b619
Updated README to reflect cog grouped command names
Mar 21, 2023
5490c9a
Updated TODO list
Mar 21, 2023
bf0f946
Implemented skeleton for handling invalid voice channel names
Mar 21, 2023
9c86e88
Implemented IO function to load banned_words.txt
Mar 21, 2023
d9e31b1
Re-added old banned_words.txt
Mar 21, 2023
c865801
Added helper functions for banned word detection
Mar 21, 2023
39f6f7e
Implemented basic voice channel name checking
Mar 21, 2023
b0b7f92
Added RoleReact skeleton
Mar 21, 2023
1cf04c0
Updated TODO list
Mar 21, 2023
71e6805
Fixed missing end of line
Mar 21, 2023
32b6960
Fixed incorrect path loading
Mar 21, 2023
d26db7e
Moved permission checks to be Cog wide
Mar 21, 2023
2cef09d
Added skeleton command structure
Mar 21, 2023
dbfecd4
Updated command group names for clarity
Mar 21, 2023
0cc4e6e
Split VoiceAdmin into admin and user Cogs
Mar 21, 2023
5c83137
Fixed an issue when parent voice channel not in category
Mar 21, 2023
45c291f
Fixed locking/unlocking issues when child voice channel not in category
Mar 21, 2023
f16d611
Split VCMusic into admin and user Cogs
Mar 21, 2023
9cd795d
Fixed flake8 violations
Mar 21, 2023
a5c85cc
Implemented basic creating empty role menus
Mar 23, 2023
7593c62
Implemented basic role adding to menu
Mar 23, 2023
abe81e6
Added menu ID auto completion
Mar 24, 2023
090a6e4
Menu ID filtering based on current input
Mar 24, 2023
c52fdf9
Added checks for valid react menu IDs
Mar 24, 2023
be29f64
Added checks for valid react menu IDs
Mar 24, 2023
db61adf
Basic implementation of menu deletion
Mar 24, 2023
936e85b
Updated role select option text
Mar 24, 2023
cdf6932
Added RoleReactRoleTransformer to get roles from menu
Mar 26, 2023
e5014e6
Partially implemented removal of roles from menu
Mar 26, 2023
6b35b14
Added check for empty role list
Mar 28, 2023
2285e5e
Fixed no_roles_embed usage
Mar 28, 2023
1c65401
Sorted imports
Mar 28, 2023
d694d10
Moved user strings to RoleReact.toml
Mar 28, 2023
115e2db
Added TODO
Mar 28, 2023
88d47ae
Fixed missing assignment
Mar 28, 2023
86db6fe
Fixed no_roles_embed not using RoleReact.toml
Mar 28, 2023
bcf5fc5
Interaction handler now applies and removes roles
Mar 29, 2023
400f1cb
Implemented helper functions
Mar 29, 2023
66da320
Added interaction handler to add/remove chosen roles
Mar 29, 2023
8c1edef
Re-added create-menu command
Mar 29, 2023
b9729ed
Reimplemented add-role command
Mar 29, 2023
b63fd99
Added check for None view
Mar 29, 2023
b6822b5
Ensured that final items are appened to lists
Mar 29, 2023
daadca6
Reimplemented remove-role command
Mar 29, 2023
94998fd
Reimplemented delete-menu command
Mar 29, 2023
915fb28
Sorted imports
Mar 29, 2023
9f0f9df
Updated RoleReactRoleTransformer
Mar 29, 2023
b50259b
Manually get role list rather than relying on guild.get_role
Mar 29, 2023
05bea33
Added setup hook
Mar 29, 2023
a78740a
Fixed incorrect parameter name `embed_color`
Mar 29, 2023
7c5c5cf
Fixed incorrect parameter name `message_id`
Mar 29, 2023
2b8102b
Added new line at end of document
Mar 29, 2023
d1362ab
Added missing `interaction` argument
Mar 29, 2023
31406cf
Fixed incorrect modulo arithmetic
Mar 29, 2023
219fcdd
Fixed non-unique custom IDs for multiple select items
Mar 29, 2023
52804c7
Added missing command decorators to remove-item command
Mar 29, 2023
0ed1230
Fixed modulo brackets
Mar 29, 2023
83c01f8
Updated `get_roles_from_select` function name
Mar 29, 2023
93800cd
Fixed roles not applying with multiple Select views
Mar 29, 2023
48b8e48
Updated README for RoleReact status
Mar 29, 2023
5276910
Added docstrings to Transformers and helpers
Mar 29, 2023
5d1048e
Added docstrings
Mar 29, 2023
672510d
Fixed spelling error in VoiceAdmin
Mar 29, 2023
9dd0c7b
Started implementation of new PingableRolesCog
Mar 29, 2023
da3ef04
Updated clarity of TODO list
Mar 29, 2023
ba24cdd
Started implementation of TwitterCog
Mar 30, 2023
30de08c
Basic webhook creation command
Mar 30, 2023
0181d14
Added TwitterWebhookIDTransformer
Mar 30, 2023
1616708
Basic webhook deleting command
Mar 30, 2023
8a6d73b
Added loading of webhooks on_ready
Mar 31, 2023
c6ae8ea
Added check for valid webhook ID that arent for Twitter
Mar 31, 2023
b33218f
Load tracked accounts from DB on_ready
Mar 31, 2023
4ec94ef
Added account tracking command
Mar 31, 2023
3872f47
Added command to untrack an account
Mar 31, 2023
6833a2b
Added .venv to gitignore
Mar 31, 2023
cff1beb
Removed old requirements
Mar 31, 2023
bcbfe29
Added TwitterTracker requirements
Mar 31, 2023
d214adb
Fixed incorrect kwarg for SongRequest
Mar 31, 2023
b4dc1ef
Changed all self.author to CURRENT_AUTHOR
Apr 2, 2023
f0e4d2c
Twitter API setup
Apr 2, 2023
b04f0a0
Added stream data handlers
Apr 2, 2023
35b66ec
Added DS_STORE to gitignore
Apr 15, 2023
36c1e3f
Added .DS_STORE to gitignore
Apr 22, 2023
9489cf1
Fixed VCMusic section
May 12, 2023
375026d
Added Google API credentials instructions
May 12, 2023
f22c463
Updated TwitterCog development status
May 12, 2023
5651d8e
Added support for sqlite autoincrement
May 15, 2023
1ac75d2
Changed explicit primary keys to autoincrement
May 15, 2023
b2e61bf
Updated TODO list
May 15, 2023
7ffe236
Removed TwitterTracker left-over files
May 30, 2023
814e8c0
Added base for LogChannel implementation
May 30, 2023
6843fc7
Updated README
May 30, 2023
cbe35f8
Updated LogChannelChannels model
May 30, 2023
47ce89f
Added LOG_CHANNEL environment variable
May 30, 2023
2d68ca5
Implemented basic log forwarding to channel
May 30, 2023
0103108
Added simple log level indicator
May 30, 2023
826ec85
Updated log level indicators
May 30, 2023
a1a49b0
Fixed multiple log messages being generated
May 30, 2023
551e1cb
Changed logs to use an embed field per log item
May 31, 2023
d3a5b3b
Added LogChannel compatible log messages to VoiceAdmin
May 31, 2023
292f0bf
Added LogChannel compatible log messages to AdminTools
May 31, 2023
f0880d0
Added new utility file
May 31, 2023
34927e4
Implemented VoiceAdmin channel status indicators
May 31, 2023
305561c
Updated Voice admin status indicators
May 31, 2023
3279950
Updated log messages to support LogChannel
May 31, 2023
9778057
Decreased author update timer
May 31, 2023
756be6d
Added logging events
May 31, 2023
9f42c4d
Added logging events
May 31, 2023
110b10f
Added get-channel to LogChannel
May 31, 2023
00a770c
Updated README for LogChannel
May 31, 2023
4baf4ae
Updated status of UserRoles
May 31, 2023
36569d9
Updated client to publish commands when live
May 31, 2023
d412a5b
Removed ONLY_EPHEMERAL flag
Aug 6, 2023
e114379
Updated MUSIC_AUTHOR
Aug 6, 2023
e32ffa5
Implemented role-mention timeout
Aug 6, 2023
687c308
Sorted imports
Aug 6, 2023
0d3ec51
Added UserRoles DB models
Aug 6, 2023
839c323
UserRoles config load on start
Aug 6, 2023
5bb13d1
Added extra DB fields to UserRolesConfig
Aug 8, 2023
2d45764
Create default configs for guilds not in DB
Aug 8, 2023
cdb3f0b
Pass the instance of admin cog to regular cog
Aug 8, 2023
39d0ee0
Simple vote embed creation
Aug 8, 2023
59875c7
Refactored checking of interaction prefix to function
Aug 8, 2023
f83d207
Added PollData dataclass
Aug 8, 2023
fd7a1b1
Added role name to PollData class
Aug 8, 2023
ff7839d
Updated embed creation
Aug 8, 2023
c279f02
Actually load guild configs onready
Aug 8, 2023
423ac38
Added InteractionType enum to track interactions
Aug 8, 2023
972e04e
Added simple role menu creation
Aug 8, 2023
30d161c
Added new UserRoles env vars
Aug 8, 2023
b883348
Implemeted basic PingableRoles system
Aug 8, 2023
9768c47
Updated UserRoels README
Aug 8, 2023
638004b
Moved interaction timeout to voting only
Aug 8, 2023
c0bf1b8
Auto pin role-react message
Aug 8, 2023
2689043
Added admin command to get current pingable roles config
Aug 10, 2023
87e3e77
Fixed music-admin command name in README
Aug 10, 2023
2556e72
Added get-config to README
Aug 10, 2023
4bce2c4
Removed typing of variable
Aug 10, 2023
6b09353
Added pingable roles set-config command
Aug 10, 2023
9760b53
Added set-config to README
Aug 10, 2023
996f155
Updated vote embed to use COG_STRINGS
Aug 10, 2023
0fdaa8b
Updated README TODO
Aug 10, 2023
620e3d9
Update README.md
Fluxticks Aug 14, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 2 additions & 3 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
**/__pycache__
test-file.py
/src/cogs/TestCog.py
/src/esportsbot/version.txt
.DS_STORE
.venv
.vscode
.idea
secrets.env
Expand Down
2 changes: 1 addition & 1 deletion Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ RUN apt-get update && \
apt-get install -y ffmpeg

# Install requirements first to take advantage of docker build layer caching
COPY ./src/requirements.txt /tmp/requirements.txt
COPY ./requirements.txt /tmp/requirements.txt
RUN pip install -r /tmp/requirements.txt && rm /tmp/requirements.txt

COPY ./src /code
Expand Down
Loading