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

Discord Bot #417

Open
wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Discord Bot #417

Show file tree
Hide file tree
Changes from 9 commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
88f88c9
Discord Bot
Argn0 Feb 25, 2022
8581e11
Discord Bot
Argn0 Feb 25, 2022
6e7bcd3
review
Argn0 Feb 26, 2022
f9da636
config
Argn0 Feb 26, 2022
dc06ab2
remove comment
Argn0 Feb 26, 2022
3b03fb8
Merge branch 'master' into 2
Argn0 Feb 26, 2022
f14da5d
Update ProfileModal.tsx
Argn0 Feb 26, 2022
440d77c
handle one discord acc linked with multiple email
Argn0 Feb 26, 2022
ef9cd5d
remove condition
Argn0 Feb 26, 2022
3fbca67
review2
Argn0 Feb 27, 2022
42ddc9b
review 2
Argn0 Feb 27, 2022
768de32
fix delete account
Argn0 Feb 27, 2022
f0f7693
Update Discord.tsx
Argn0 Feb 27, 2022
db88a77
review
Argn0 Feb 27, 2022
e32bc94
schema
Argn0 Feb 27, 2022
4683671
subscriber modal
Argn0 Feb 27, 2022
1b6bb9c
remove if else
Argn0 Feb 27, 2022
0333f46
review
Argn0 Mar 2, 2022
2601976
review
Argn0 Mar 2, 2022
9ce92ed
only show when discord_auth_url is set
Argn0 Mar 2, 2022
4ed2752
Update config.ts
Argn0 Mar 5, 2022
240785d
Merge branch 'master' into 2
Argn0 May 27, 2022
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
237 changes: 237 additions & 0 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,6 +105,7 @@
"@types/socket.io": "^3.0.2",
"@types/socket.io-client": "^3.0.0",
"@types/uuid": "^8.3.4",
"discord.js": "^13.6.0",
"husky": "^4.3.8",
"lint-staged": "^12.3.4",
"prettier": "2.5.1",
Expand Down
3 changes: 3 additions & 0 deletions server/config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ const defaults = {
SHARD: undefined, // Shard ID of the web server (configure in ecosystem.config.js)
SUBSCRIBER_ROOM_LIMIT: 20, // The maximum number of rooms a subscriber can have
VMWORKER_PORT: 3100, // Port to use for the vmWorker HTTP server
DISCORD_BOT_TOKEN: '', // Optional
DISCORD_SERVER_ID: '', // Optional, ID of the discord server
DISCORD_SUB_ROLE_ID: '', // optional, ID of subscriber role
VM_ASSIGNMENT_TIMEOUT: 120, // Number of seconds to wait for a VM before failing
};

Expand Down
Loading