Skip to content

Commit

Permalink
Merge pull request #109 from MozillaReality/channel-queue
Browse files Browse the repository at this point in the history
Split queue per channel
  • Loading branch information
keianhzo authored Nov 27, 2020
2 parents 4f9c8f2 + ad4564d commit 1b38b88
Show file tree
Hide file tree
Showing 7 changed files with 214 additions and 47 deletions.
4 changes: 2 additions & 2 deletions .env.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@ HUBS_HOSTS=localhost,hubs.local
# bridge chat from Hubs through to Discord.
HUBS_HOOK=Hubs

# The shard ID for this client. (0 if you aren't using multiple shards.)
# The shard ID for this client. (1 if you aren't using multiple shards.)
SHARD_ID=0

# The shard count for this client. (0 if you aren't using multiple shards.)
# The shard count for this client. (1 if you aren't using multiple shards.)
SHARD_COUNT=0

# The BCP 47 locale for bot output.
Expand Down
34 changes: 34 additions & 0 deletions .vscode/launch.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
{
// Use IntelliSense to learn about possible attributes.
// Hover to view descriptions of existing attributes.
// For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
"version": "0.2.0",
"configurations": [
{
"name": "Launch Local via NPM",
"request": "launch",
"runtimeArgs": [
"run-script",
"local"
],
"runtimeExecutable": "npm",
"skipFiles": [
"<node_internals>/**"
],
"type": "pwa-node"
},
{
"name": "Launch via NPM",
"request": "launch",
"runtimeArgs": [
"run-script",
"start"
],
"runtimeExecutable": "npm",
"skipFiles": [
"<node_internals>/**"
],
"type": "pwa-node"
}
]
}
10 changes: 10 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{
// Format on save for Prettier
"editor.formatOnSave": true,
// Disable html formatting for now
"html.format.enable": false,
// Disable the default javascript formatter
"javascript.format.enable": false,
// Use 'prettier-eslint' instead of 'prettier'. Other settings will only be fallbacks in case they could not be inferred from eslint rules.
"prettier.eslintIntegration": true
}
2 changes: 1 addition & 1 deletion habitat/plan.sh
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
pkg_name=hubs-discord-bot
pkg_origin=mozillareality
pkg_maintainer="Mozilla Mixed Reality <[email protected]>"
pkg_version="0.0.1"
pkg_version="0.0.2"
pkg_license=('MPL2')
pkg_description="Discord bot for Hubs by Mozilla"

Expand Down
125 changes: 97 additions & 28 deletions package-lock.json

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

6 changes: 3 additions & 3 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "hubs-discord-bot",
"version": "0.0.1",
"version": "0.0.2",
"description": "A Discord bot that does helpful things related to Hubs rooms.",
"repository": "github:MozillaReality/hubs-discord-bot",
"main": "src/index.js",
Expand All @@ -21,7 +21,7 @@
"dependencies": {
"@sentry/node": "^5.23.0",
"bufferutil": "^4.0.1",
"discord.js": "^11.5.1",
"discord.js": "^12.4.1",
"dotenv": "^8.2.0",
"erlpack": "github:hammerandchisel/erlpack",
"escape-string-regexp": "^2.0.0",
Expand All @@ -36,4 +36,4 @@
"eslint-plugin-node": "^10.0.0",
"tape": "^4.11.0"
}
}
}
Loading

0 comments on commit 1b38b88

Please sign in to comment.