StyAndCo/zeppelin
3
0
Fork 0
mirror of https://github.com/ZeppelinBot/Zeppelin.git synced 2025-05-25 02:25:01 +00:00
Code Releases Activity

Merge branch 'ZeppelinBot:master' into master

Browse source
This commit is contained in:
Ibotmealot 2022-04-15 02:07:06 -04:00 • committed by GitHub
commit e5ea860345
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 1662 additions and 4113 deletions
Download patch file Download diff file Expand all files Collapse all files

17
.clabot Normal file
View file

@ -0,0 +1,17 @@
{
"contributors": [
"CleverSource",
"DarkView",
"Jernik",
"WeebHiroyuki",
"almeidx",
"axisiscool",
"dexbiobot",
"greenbigfrog",
"metal0",
"roflmaoqwerty",
"usoka",
"vcokltfre"
],
"message": "Thank you for contributing to Zeppelin! We require contributors to sign our Contributor License Agreement (CLA). To let us review and merge your code, please visit https://github.com/ZeppelinBot/CLA to sign the CLA!"
}

5738
backend/package-lock.json generated
View file

File diff suppressed because it is too large Load diff

14
backend/package.json
View file

@ -28,11 +28,11 @@
"cors": "^2.8.5", "cors": "^2.8.5",
"cross-env": "^5.2.0", "cross-env": "^5.2.0",
"deep-diff": "^1.0.2", "deep-diff": "^1.0.2",
"discord-api-types": "^0.22.0", "discord-api-types": "^0.31.0",
"discord.js": "^13.3.1", "discord.js": "^13.6.0",
"dotenv": "^4.0.0", "dotenv": "^4.0.0",
"emoji-regex": "^8.0.0", "emoji-regex": "^8.0.0",
"erlpack": "github:almeidx/erlpack#f0c535f73817fd914806d6ca26a7730c14e0fb7c", "erlpack": "github:discord/erlpack",
"escape-string-regexp": "^1.0.5", "escape-string-regexp": "^1.0.5",
"express": "^4.17.0", "express": "^4.17.0",
"fp-ts": "^2.0.1", "fp-ts": "^2.0.1",
@ -51,11 +51,11 @@
"moment-timezone": "^0.5.21", "moment-timezone": "^0.5.21",
"multer": "^1.4.3", "multer": "^1.4.3",
"mysql": "^2.16.0", "mysql": "^2.16.0",
"node-fetch": "^2.6.5", "node-fetch": "^2.6.7",
"parse-color": "^1.0.0", "parse-color": "^1.0.0",
"passport": "^0.4.0", "passport": "^0.4.0",
"passport-custom": "^1.0.5", "passport-custom": "^1.0.5",
"passport-oauth2": "^1.5.0", "passport-oauth2": "^1.6.1",
"pkg-up": "^3.1.0", "pkg-up": "^3.1.0",
"reflect-metadata": "^0.1.12", "reflect-metadata": "^0.1.12",
"regexp-worker": "^1.1.0", "regexp-worker": "^1.1.0",
@ -90,10 +90,10 @@
"@types/safe-regex": "^1.1.2", "@types/safe-regex": "^1.1.2",
"@types/tmp": "0.0.33", "@types/tmp": "0.0.33",
"@types/twemoji": "^12.1.0", "@types/twemoji": "^12.1.0",
"ava": "^3.10.0", "ava": "^3.15.0",
"rimraf": "^2.6.2", "rimraf": "^2.6.2",
"source-map-support": "^0.5.16", "source-map-support": "^0.5.16",
"tsc-watch": "^4.0.0" "tsc-watch": "^5.0.2"
}, },
"ava": { "ava": {
"files": [ "files": [

6
backend/src/index.ts
View file

@ -390,8 +390,10 @@ connect().then(async () => {
}, 100); }, 100);
setInterval(() => { setInterval(() => {
// FIXME: Debug // FIXME: Debug
// tslint:disable-next-line:no-console if (lowestGlobalRemaining < 30) {
console.log("Lowest global remaining in the past 15 seconds:", lowestGlobalRemaining); // tslint:disable-next-line:no-console
console.log("[DEBUG] Lowest global remaining in the past 15 seconds:", lowestGlobalRemaining);
}
lowestGlobalRemaining = Infinity; lowestGlobalRemaining = Infinity;
}, 15000); }, 15000);