Merge pull request #157 from Umimaso/widget
feat: add widget endpoints, routing for unversioned api requests
This commit is contained in:
commit
e525977981
BIN
cache/widget/banner1.png
vendored
Normal file
BIN
cache/widget/banner1.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.8 KiB |
BIN
cache/widget/banner2.png
vendored
Normal file
BIN
cache/widget/banner2.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 3.7 KiB |
BIN
cache/widget/banner3.png
vendored
Normal file
BIN
cache/widget/banner3.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 5.2 KiB |
BIN
cache/widget/banner4.png
vendored
Normal file
BIN
cache/widget/banner4.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 13 KiB |
BIN
cache/widget/shield.png
vendored
Normal file
BIN
cache/widget/shield.png
vendored
Normal file
Binary file not shown.
After Width: | Height: | Size: 726 B |
@ -16,7 +16,7 @@
|
|||||||
CDN_HOST: "//localhost:3003",
|
CDN_HOST: "//localhost:3003",
|
||||||
ASSET_ENDPOINT: "",
|
ASSET_ENDPOINT: "",
|
||||||
MEDIA_PROXY_ENDPOINT: "https://media.discordapp.net",
|
MEDIA_PROXY_ENDPOINT: "https://media.discordapp.net",
|
||||||
WIDGET_ENDPOINT: "//discord.com/widget",
|
WIDGET_ENDPOINT: "//localhost:3001/widget",
|
||||||
INVITE_HOST: "discord.gg",
|
INVITE_HOST: "discord.gg",
|
||||||
GUILD_TEMPLATE_HOST: "discord.new",
|
GUILD_TEMPLATE_HOST: "discord.new",
|
||||||
GIFT_CODE_HOST: "discord.gift",
|
GIFT_CODE_HOST: "discord.gift",
|
||||||
|
133
package-lock.json
generated
133
package-lock.json
generated
@ -18,6 +18,7 @@
|
|||||||
"atomically": "^1.7.0",
|
"atomically": "^1.7.0",
|
||||||
"bcrypt": "^5.0.1",
|
"bcrypt": "^5.0.1",
|
||||||
"body-parser": "^1.19.0",
|
"body-parser": "^1.19.0",
|
||||||
|
"canvas": "^2.8.0",
|
||||||
"cheerio": "^1.0.0-rc.9",
|
"cheerio": "^1.0.0-rc.9",
|
||||||
"dot-prop": "^6.0.1",
|
"dot-prop": "^6.0.1",
|
||||||
"dotenv": "^8.2.0",
|
"dotenv": "^8.2.0",
|
||||||
@ -28,6 +29,7 @@
|
|||||||
"i18next": "^19.8.5",
|
"i18next": "^19.8.5",
|
||||||
"i18next-http-middleware": "^3.1.3",
|
"i18next-http-middleware": "^3.1.3",
|
||||||
"i18next-node-fs-backend": "^2.1.3",
|
"i18next-node-fs-backend": "^2.1.3",
|
||||||
|
"image-size": "^1.0.0",
|
||||||
"jsonwebtoken": "^8.5.1",
|
"jsonwebtoken": "^8.5.1",
|
||||||
"lambert-server": "^1.2.5",
|
"lambert-server": "^1.2.5",
|
||||||
"missing-native-js-functions": "^1.2.6",
|
"missing-native-js-functions": "^1.2.6",
|
||||||
@ -2301,6 +2303,20 @@
|
|||||||
"url": "https://opencollective.com/browserslist"
|
"url": "https://opencollective.com/browserslist"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/canvas": {
|
||||||
|
"version": "2.8.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/canvas/-/canvas-2.8.0.tgz",
|
||||||
|
"integrity": "sha512-gLTi17X8WY9Cf5GZ2Yns8T5lfBOcGgFehDFb+JQwDqdOoBOcECS9ZWMEAqMSVcMYwXD659J8NyzjRY/2aE+C2Q==",
|
||||||
|
"hasInstallScript": true,
|
||||||
|
"dependencies": {
|
||||||
|
"@mapbox/node-pre-gyp": "^1.0.0",
|
||||||
|
"nan": "^2.14.0",
|
||||||
|
"simple-get": "^3.0.3"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=6"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/capture-exit": {
|
"node_modules/capture-exit": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
|
||||||
@ -3155,6 +3171,17 @@
|
|||||||
"node": ">=0.10"
|
"node": ">=0.10"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/decompress-response": {
|
||||||
|
"version": "4.2.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
|
||||||
|
"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
|
||||||
|
"dependencies": {
|
||||||
|
"mimic-response": "^2.0.0"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/deep-is": {
|
"node_modules/deep-is": {
|
||||||
"version": "0.1.3",
|
"version": "0.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
|
||||||
@ -4733,6 +4760,20 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"node_modules/image-size": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/image-size/-/image-size-1.0.0.tgz",
|
||||||
|
"integrity": "sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==",
|
||||||
|
"dependencies": {
|
||||||
|
"queue": "6.0.2"
|
||||||
|
},
|
||||||
|
"bin": {
|
||||||
|
"image-size": "bin/image-size.js"
|
||||||
|
},
|
||||||
|
"engines": {
|
||||||
|
"node": ">=12.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/import-local": {
|
"node_modules/import-local": {
|
||||||
"version": "3.0.2",
|
"version": "3.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
|
||||||
@ -6490,6 +6531,17 @@
|
|||||||
"node": ">=6"
|
"node": ">=6"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/mimic-response": {
|
||||||
|
"version": "2.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
|
||||||
|
"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA==",
|
||||||
|
"engines": {
|
||||||
|
"node": ">=8"
|
||||||
|
},
|
||||||
|
"funding": {
|
||||||
|
"url": "https://github.com/sponsors/sindresorhus"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/minimalistic-assert": {
|
"node_modules/minimalistic-assert": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
|
||||||
@ -6807,6 +6859,11 @@
|
|||||||
"integrity": "sha512-nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g==",
|
"integrity": "sha512-nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"node_modules/nan": {
|
||||||
|
"version": "2.14.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
|
||||||
|
"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
|
||||||
|
},
|
||||||
"node_modules/nanoassert": {
|
"node_modules/nanoassert": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz",
|
||||||
@ -7905,6 +7962,14 @@
|
|||||||
"node": ">=0.4.x"
|
"node": ">=0.4.x"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"node_modules/queue": {
|
||||||
|
"version": "6.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
|
||||||
|
"integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
|
||||||
|
"dependencies": {
|
||||||
|
"inherits": "~2.0.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/randombytes": {
|
"node_modules/randombytes": {
|
||||||
"version": "2.1.0",
|
"version": "2.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
|
||||||
@ -8757,7 +8822,6 @@
|
|||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
|
||||||
"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
|
"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
|
||||||
"dev": true,
|
|
||||||
"funding": [
|
"funding": [
|
||||||
{
|
{
|
||||||
"type": "github",
|
"type": "github",
|
||||||
@ -8773,6 +8837,16 @@
|
|||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
|
"node_modules/simple-get": {
|
||||||
|
"version": "3.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
|
||||||
|
"integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
|
||||||
|
"dependencies": {
|
||||||
|
"decompress-response": "^4.2.0",
|
||||||
|
"once": "^1.3.1",
|
||||||
|
"simple-concat": "^1.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"node_modules/single-line-log": {
|
"node_modules/single-line-log": {
|
||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
"resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
|
"resolved": "https://registry.npmjs.org/single-line-log/-/single-line-log-1.1.2.tgz",
|
||||||
@ -12461,6 +12535,16 @@
|
|||||||
"integrity": "sha512-e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg==",
|
"integrity": "sha512-e4Gyp7P8vqC2qV2iHA+cJNf/yqUKOShXQOJHQt81OHxlIZl/j/j3soEA0adAQi8CPUQgvOdDENyQ5kd6a6mNSg==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"canvas": {
|
||||||
|
"version": "2.8.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/canvas/-/canvas-2.8.0.tgz",
|
||||||
|
"integrity": "sha512-gLTi17X8WY9Cf5GZ2Yns8T5lfBOcGgFehDFb+JQwDqdOoBOcECS9ZWMEAqMSVcMYwXD659J8NyzjRY/2aE+C2Q==",
|
||||||
|
"requires": {
|
||||||
|
"@mapbox/node-pre-gyp": "^1.0.0",
|
||||||
|
"nan": "^2.14.0",
|
||||||
|
"simple-get": "^3.0.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
"capture-exit": {
|
"capture-exit": {
|
||||||
"version": "2.0.0",
|
"version": "2.0.0",
|
||||||
"resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
|
"resolved": "https://registry.npmjs.org/capture-exit/-/capture-exit-2.0.0.tgz",
|
||||||
@ -13195,6 +13279,14 @@
|
|||||||
"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
|
"integrity": "sha1-6zkTMzRYd1y4TNGh+uBiEGu4dUU=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"decompress-response": {
|
||||||
|
"version": "4.2.1",
|
||||||
|
"resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-4.2.1.tgz",
|
||||||
|
"integrity": "sha512-jOSne2qbyE+/r8G1VU+G/82LBs2Fs4LAsTiLSHOCOMZQl2OKZ6i8i4IyHemTe+/yIXOtTcRQMzPcgyhoFlqPkw==",
|
||||||
|
"requires": {
|
||||||
|
"mimic-response": "^2.0.0"
|
||||||
|
}
|
||||||
|
},
|
||||||
"deep-is": {
|
"deep-is": {
|
||||||
"version": "0.1.3",
|
"version": "0.1.3",
|
||||||
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
|
"resolved": "https://registry.npmjs.org/deep-is/-/deep-is-0.1.3.tgz",
|
||||||
@ -14459,6 +14551,14 @@
|
|||||||
"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
|
"integrity": "sha512-dcyqhDvX1C46lXZcVqCpK+FtMRQVdIMN6/Df5js2zouUsqG7I6sFxitIC+7KYK29KdXOLHdu9zL4sFnoVQnqaA==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"image-size": {
|
||||||
|
"version": "1.0.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/image-size/-/image-size-1.0.0.tgz",
|
||||||
|
"integrity": "sha512-JLJ6OwBfO1KcA+TvJT+v8gbE6iWbj24LyDNFgFEN0lzegn6cC6a/p3NIDaepMsJjQjlUWqIC7wJv8lBFxPNjcw==",
|
||||||
|
"requires": {
|
||||||
|
"queue": "6.0.2"
|
||||||
|
}
|
||||||
|
},
|
||||||
"import-local": {
|
"import-local": {
|
||||||
"version": "3.0.2",
|
"version": "3.0.2",
|
||||||
"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
|
"resolved": "https://registry.npmjs.org/import-local/-/import-local-3.0.2.tgz",
|
||||||
@ -15859,6 +15959,11 @@
|
|||||||
"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
|
"integrity": "sha512-OqbOk5oEQeAZ8WXWydlu9HJjz9WVdEIvamMCcXmuqUYjTknH/sqsWvhQ3vgwKFRR1HpjvNBKQ37nbJgYzGqGcg==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"mimic-response": {
|
||||||
|
"version": "2.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-2.1.0.tgz",
|
||||||
|
"integrity": "sha512-wXqjST+SLt7R009ySCglWBCFpjUygmCIfD790/kVbiGmUgfYGuB14PiTd5DwVxSV4NcYHjzMkoj5LjQZwTQLEA=="
|
||||||
|
},
|
||||||
"minimalistic-assert": {
|
"minimalistic-assert": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/minimalistic-assert/-/minimalistic-assert-1.0.1.tgz",
|
||||||
@ -16087,6 +16192,11 @@
|
|||||||
"integrity": "sha512-nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g==",
|
"integrity": "sha512-nU7mOEuaXiQIB/EgTIjYZJ7g8KqMm2D8l4qp+DqA4jxWOb/tnb1KEoqp+tlbdQIDIAiC1i7j7X/3yHDFXLxr9g==",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"nan": {
|
||||||
|
"version": "2.14.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.2.tgz",
|
||||||
|
"integrity": "sha512-M2ufzIiINKCuDfBSAUr1vWQ+vuVcA9kqx8JJUsbQi6yf1uGRyb7HfpdfUr5qLXf3B/t8dPvcjhKMmlfnP47EzQ=="
|
||||||
|
},
|
||||||
"nanoassert": {
|
"nanoassert": {
|
||||||
"version": "1.1.0",
|
"version": "1.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/nanoassert/-/nanoassert-1.1.0.tgz",
|
||||||
@ -16977,6 +17087,14 @@
|
|||||||
"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
|
"integrity": "sha1-nsYfeQSYdXB9aUFFlv2Qek1xHnM=",
|
||||||
"dev": true
|
"dev": true
|
||||||
},
|
},
|
||||||
|
"queue": {
|
||||||
|
"version": "6.0.2",
|
||||||
|
"resolved": "https://registry.npmjs.org/queue/-/queue-6.0.2.tgz",
|
||||||
|
"integrity": "sha512-iHZWu+q3IdFZFX36ro/lKBkSvfkztY5Y7HMiPlOUjhupPcG2JMfst2KKEpu5XndviX/3UhFbRngUPNKtgvtZiA==",
|
||||||
|
"requires": {
|
||||||
|
"inherits": "~2.0.3"
|
||||||
|
}
|
||||||
|
},
|
||||||
"randombytes": {
|
"randombytes": {
|
||||||
"version": "2.1.0",
|
"version": "2.1.0",
|
||||||
"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
|
"resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
|
||||||
@ -17671,8 +17789,17 @@
|
|||||||
"simple-concat": {
|
"simple-concat": {
|
||||||
"version": "1.0.1",
|
"version": "1.0.1",
|
||||||
"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
|
"resolved": "https://registry.npmjs.org/simple-concat/-/simple-concat-1.0.1.tgz",
|
||||||
"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q==",
|
"integrity": "sha512-cSFtAPtRhljv69IK0hTVZQ+OfE9nePi/rtJmw5UjHeVyVroEqJXP1sFztKUy1qU+xvz3u/sfYJLa947b7nAN2Q=="
|
||||||
"dev": true
|
},
|
||||||
|
"simple-get": {
|
||||||
|
"version": "3.1.0",
|
||||||
|
"resolved": "https://registry.npmjs.org/simple-get/-/simple-get-3.1.0.tgz",
|
||||||
|
"integrity": "sha512-bCR6cP+aTdScaQCnQKbPKtJOKDp/hj9EDLJo3Nw4y1QksqaovlW/bnptB6/c1e+qmNIDHRK+oXFDdEqBT8WzUA==",
|
||||||
|
"requires": {
|
||||||
|
"decompress-response": "^4.2.0",
|
||||||
|
"once": "^1.3.1",
|
||||||
|
"simple-concat": "^1.0.0"
|
||||||
|
}
|
||||||
},
|
},
|
||||||
"single-line-log": {
|
"single-line-log": {
|
||||||
"version": "1.1.2",
|
"version": "1.1.2",
|
||||||
|
@ -38,6 +38,7 @@
|
|||||||
"atomically": "^1.7.0",
|
"atomically": "^1.7.0",
|
||||||
"bcrypt": "^5.0.1",
|
"bcrypt": "^5.0.1",
|
||||||
"body-parser": "^1.19.0",
|
"body-parser": "^1.19.0",
|
||||||
|
"canvas": "^2.8.0",
|
||||||
"cheerio": "^1.0.0-rc.9",
|
"cheerio": "^1.0.0-rc.9",
|
||||||
"dot-prop": "^6.0.1",
|
"dot-prop": "^6.0.1",
|
||||||
"dotenv": "^8.2.0",
|
"dotenv": "^8.2.0",
|
||||||
@ -48,6 +49,7 @@
|
|||||||
"i18next": "^19.8.5",
|
"i18next": "^19.8.5",
|
||||||
"i18next-http-middleware": "^3.1.3",
|
"i18next-http-middleware": "^3.1.3",
|
||||||
"i18next-node-fs-backend": "^2.1.3",
|
"i18next-node-fs-backend": "^2.1.3",
|
||||||
|
"image-size": "^1.0.0",
|
||||||
"jsonwebtoken": "^8.5.1",
|
"jsonwebtoken": "^8.5.1",
|
||||||
"lambert-server": "^1.2.5",
|
"lambert-server": "^1.2.5",
|
||||||
"missing-native-js-functions": "^1.2.6",
|
"missing-native-js-functions": "^1.2.6",
|
||||||
|
@ -94,6 +94,7 @@ export class FosscordServer extends Server {
|
|||||||
this.app = prefix;
|
this.app = prefix;
|
||||||
|
|
||||||
this.routes = await this.registerRoutes(path.join(__dirname, "routes", "/"));
|
this.routes = await this.registerRoutes(path.join(__dirname, "routes", "/"));
|
||||||
|
app.use("/api", prefix); // allow unversioned requests
|
||||||
app.use("/api/v8", prefix);
|
app.use("/api/v8", prefix);
|
||||||
this.app = app;
|
this.app = app;
|
||||||
this.app.use(ErrorHandler);
|
this.app.use(ErrorHandler);
|
||||||
|
@ -3,11 +3,12 @@ import { HTTPError } from "lambert-server";
|
|||||||
import { checkToken, Config } from "@fosscord/server-util";
|
import { checkToken, Config } from "@fosscord/server-util";
|
||||||
|
|
||||||
export const NO_AUTHORIZATION_ROUTES = [
|
export const NO_AUTHORIZATION_ROUTES = [
|
||||||
"/api/v8/auth/login",
|
/^\/api(\/v\d+)?\/auth\/login/,
|
||||||
"/api/v8/auth/register",
|
/^\/api(\/v\d+)?\/auth\/register/,
|
||||||
"/api/v8/webhooks/",
|
/^\/api(\/v\d+)?\/webhooks\//,
|
||||||
"/api/v8/gateway",
|
/^\/api(\/v\d+)?\/gateway/,
|
||||||
"/api/v8/experiments"
|
/^\/api(\/v\d+)?\/experiments/,
|
||||||
|
/^\/api(\/v\d+)?\/guilds\/\d+\/widget\.(json|png)/
|
||||||
];
|
];
|
||||||
|
|
||||||
declare global {
|
declare global {
|
||||||
@ -22,7 +23,7 @@ declare global {
|
|||||||
export async function Authentication(req: Request, res: Response, next: NextFunction) {
|
export async function Authentication(req: Request, res: Response, next: NextFunction) {
|
||||||
if (!req.url.startsWith("/api")) return next();
|
if (!req.url.startsWith("/api")) return next();
|
||||||
if (req.url.startsWith("/api/v8/invites") && req.method === "GET") return next();
|
if (req.url.startsWith("/api/v8/invites") && req.method === "GET") return next();
|
||||||
if (NO_AUTHORIZATION_ROUTES.some((x) => req.url.startsWith(x))) return next();
|
if (NO_AUTHORIZATION_ROUTES.some((x) => x.test(req.url))) return next();
|
||||||
if (!req.headers.authorization) return next(new HTTPError("Missing Authorization Header", 401));
|
if (!req.headers.authorization) return next(new HTTPError("Missing Authorization Header", 401));
|
||||||
|
|
||||||
try {
|
try {
|
||||||
|
142
src/routes/guilds/#guild_id/widget.json.ts
Normal file
142
src/routes/guilds/#guild_id/widget.json.ts
Normal file
@ -0,0 +1,142 @@
|
|||||||
|
import { Request, Response, Router } from "express";
|
||||||
|
import { Config, Permissions, GuildModel, InviteModel, ChannelModel, MemberModel } from "@fosscord/server-util";
|
||||||
|
import { HTTPError } from "lambert-server";
|
||||||
|
import { random } from "../../../util/RandomInviteID";
|
||||||
|
|
||||||
|
const router: Router = Router();
|
||||||
|
|
||||||
|
// Undocumented API notes:
|
||||||
|
// An invite is created for the widget_channel_id on request (only if an existing one created by the widget doesn't already exist)
|
||||||
|
// This invite created doesn't include an inviter object like user created ones and has a default expiry of 24 hours
|
||||||
|
// Missing user object information is intentional (https://github.com/discord/discord-api-docs/issues/1287)
|
||||||
|
// channels returns voice channel objects where @everyone has the CONNECT permission
|
||||||
|
// members (max 100 returned) is a sample of all members, and bots par invisible status, there exists some alphabetical distribution pattern between the members returned
|
||||||
|
|
||||||
|
// https://discord.com/developers/docs/resources/guild#get-guild-widget
|
||||||
|
// TODO: Cache the response for a guild for 5 minutes regardless of response
|
||||||
|
router.get("/", async (req: Request, res: Response) => {
|
||||||
|
const { guild_id } = req.params;
|
||||||
|
|
||||||
|
const guild = await GuildModel.findOne({ id: guild_id }).exec();
|
||||||
|
if (!guild) throw new HTTPError("Guild does not exist", 404);
|
||||||
|
if (!guild.widget_enabled) throw new HTTPError("Widget Disabled", 404);
|
||||||
|
|
||||||
|
// Fetch existing widget invite for widget channel
|
||||||
|
var invite = await InviteModel.findOne({ channel_id: guild.widget_channel_id, inviter_id: { $type: 10 } }).exec();
|
||||||
|
if (guild.widget_channel_id && !invite) {
|
||||||
|
// Create invite for channel if none exists
|
||||||
|
// TODO: Refactor invite create code to a shared function
|
||||||
|
const max_age = 86400; // 24 hours
|
||||||
|
const expires_at = new Date(max_age * 1000 + Date.now());
|
||||||
|
const body = {
|
||||||
|
code: random(),
|
||||||
|
temporary: false,
|
||||||
|
uses: 0,
|
||||||
|
max_uses: 0,
|
||||||
|
max_age: max_age,
|
||||||
|
expires_at,
|
||||||
|
created_at: new Date(),
|
||||||
|
guild_id,
|
||||||
|
channel_id: guild.widget_channel_id,
|
||||||
|
inviter_id: null
|
||||||
|
};
|
||||||
|
|
||||||
|
invite = await new InviteModel(body).save();
|
||||||
|
}
|
||||||
|
|
||||||
|
// Fetch voice channels, and the @everyone permissions object
|
||||||
|
let channels: any[] = [];
|
||||||
|
await ChannelModel.find(
|
||||||
|
{ guild_id: guild_id, type: 2 },
|
||||||
|
{ permission_overwrites: { $elemMatch: { id: guild_id } } }
|
||||||
|
).lean()
|
||||||
|
.select("id name position permission_overwrites")
|
||||||
|
.sort({ position: 1 })
|
||||||
|
.cursor()
|
||||||
|
.eachAsync(doc => {
|
||||||
|
// Only return channels where @everyone has the CONNECT permission
|
||||||
|
if (doc.permission_overwrites === undefined || Permissions.channelPermission(doc.permission_overwrites, Permissions.FLAGS.CONNECT) === Permissions.FLAGS.CONNECT) {
|
||||||
|
channels.push(
|
||||||
|
{
|
||||||
|
id: doc.id,
|
||||||
|
name: doc.name,
|
||||||
|
position: doc.position
|
||||||
|
}
|
||||||
|
)
|
||||||
|
}
|
||||||
|
});
|
||||||
|
|
||||||
|
// Fetch members
|
||||||
|
// TODO: Understand how Discord's max 100 random member sample works, and apply to here (see top of this file)
|
||||||
|
let members: any[] = [];
|
||||||
|
await MemberModel.find({ guild_id: guild_id })
|
||||||
|
.lean()
|
||||||
|
.populate({ path: "user", select: { _id: 0, username: 1, avatar: 1, presence: 1 } })
|
||||||
|
.select("id user nick deaf mute")
|
||||||
|
.cursor()
|
||||||
|
.eachAsync(doc => {
|
||||||
|
const status = doc.user?.presence?.status || "offline";
|
||||||
|
if (status == "offline")return
|
||||||
|
|
||||||
|
let item = {}
|
||||||
|
|
||||||
|
item = {
|
||||||
|
...item,
|
||||||
|
id: null, // this is updated during the sort outside of the query
|
||||||
|
username: doc.nick || doc.user?.username,
|
||||||
|
discriminator: "0000", // intended (https://github.com/discord/discord-api-docs/issues/1287)
|
||||||
|
avatar: null, // intended, avatar_url below will return a unique guild + user url to the avatar
|
||||||
|
status: status
|
||||||
|
}
|
||||||
|
|
||||||
|
const activity = doc.user?.presence?.activities?.[0];
|
||||||
|
if (activity) {
|
||||||
|
item = {
|
||||||
|
...item,
|
||||||
|
game: { name: activity.name }
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
// TODO: If the member is in a voice channel, return extra widget details
|
||||||
|
// Extra fields returned include deaf, mute, self_deaf, self_mute, supress, and channel_id (voice channel connected to)
|
||||||
|
// Get this from VoiceState
|
||||||
|
|
||||||
|
|
||||||
|
// TODO: Implement a widget-avatar endpoint on the CDN, and implement logic here to request it
|
||||||
|
// Get unique avatar url for guild user, cdn to serve the actual avatar image on this url
|
||||||
|
/*
|
||||||
|
const avatar = doc.user?.avatar;
|
||||||
|
if (avatar) {
|
||||||
|
const CDN_HOST = Config.get().cdn.endpoint || "http://localhost:3003";
|
||||||
|
const avatar_url = "/widget-avatars/" + ;
|
||||||
|
item = {
|
||||||
|
...item,
|
||||||
|
avatar_url: avatar_url
|
||||||
|
}
|
||||||
|
}
|
||||||
|
*/
|
||||||
|
|
||||||
|
members.push(item);
|
||||||
|
});
|
||||||
|
|
||||||
|
// Sort members, and update ids (Unable to do under the mongoose query due to https://mongoosejs.com/docs/faq.html#populate_sort_order)
|
||||||
|
members = members.sort((first, second) => 0 - (first.username > second.username ? -1 : 1));
|
||||||
|
members.forEach((x, i) => {
|
||||||
|
x.id = i;
|
||||||
|
});
|
||||||
|
|
||||||
|
// Construct object to respond with
|
||||||
|
const data = {
|
||||||
|
id: guild_id,
|
||||||
|
name: guild.name,
|
||||||
|
instant_invite: invite?.code,
|
||||||
|
channels: channels,
|
||||||
|
members: members,
|
||||||
|
presence_count: guild.presence_count
|
||||||
|
}
|
||||||
|
|
||||||
|
res.set("Cache-Control", "public, max-age=300");
|
||||||
|
return res.json(data);
|
||||||
|
});
|
||||||
|
|
||||||
|
export default router;
|
111
src/routes/guilds/#guild_id/widget.png.ts
Normal file
111
src/routes/guilds/#guild_id/widget.png.ts
Normal file
@ -0,0 +1,111 @@
|
|||||||
|
import { Request, Response, Router } from "express";
|
||||||
|
import { GuildModel } from "@fosscord/server-util";
|
||||||
|
import { HTTPError } from "lambert-server";
|
||||||
|
import { Image } from "canvas";
|
||||||
|
import fs from "fs";
|
||||||
|
import path from "path"
|
||||||
|
|
||||||
|
const router: Router = Router();
|
||||||
|
|
||||||
|
// TODO: use svg templates instead of node-canvas for improved performance and to change it easily
|
||||||
|
|
||||||
|
// https://discord.com/developers/docs/resources/guild#get-guild-widget-image
|
||||||
|
// TODO: Cache the response
|
||||||
|
router.get("/", async (req: Request, res: Response) => {
|
||||||
|
const { guild_id } = req.params;
|
||||||
|
|
||||||
|
const guild = await GuildModel.findOne({ id: guild_id }).exec();
|
||||||
|
if (!guild) throw new HTTPError("Guild does not exist", 404);
|
||||||
|
if (!guild.widget_enabled) throw new HTTPError("Unknown Guild", 404);
|
||||||
|
|
||||||
|
// Fetch guild information
|
||||||
|
const icon = guild.icon;
|
||||||
|
const name = guild.name;
|
||||||
|
const presence = guild.presence_count + " ONLINE";
|
||||||
|
|
||||||
|
// Fetch parameter
|
||||||
|
const style = req.query.style?.toString() || "shield";
|
||||||
|
if (!["shield", "banner1", "banner2", "banner3", "banner4"].includes(style)) {
|
||||||
|
throw new HTTPError("Value must be one of ('shield', 'banner1', 'banner2', 'banner3', 'banner4').", 400);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Setup canvas
|
||||||
|
const { createCanvas } = require("canvas");
|
||||||
|
const { loadImage } = require("canvas");
|
||||||
|
const sizeOf = require("image-size");
|
||||||
|
|
||||||
|
// TODO: Widget style templates need Fosscord branding
|
||||||
|
const source = path.join(__dirname, "..", "..", "..", "..", "cache","widget", `${style}.png`)
|
||||||
|
if (!fs.existsSync(source)) {
|
||||||
|
throw new HTTPError("Widget template does not exist.", 400);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Create base template image for parameter
|
||||||
|
const { width, height } = await sizeOf(source);
|
||||||
|
const canvas = createCanvas(width, height);
|
||||||
|
const ctx = canvas.getContext("2d");
|
||||||
|
const template = await loadImage(source);
|
||||||
|
ctx.drawImage(template, 0, 0);
|
||||||
|
|
||||||
|
// Add the guild specific information to the template asset image
|
||||||
|
switch (style) {
|
||||||
|
case "shield":
|
||||||
|
ctx.textAlign = "center";
|
||||||
|
await drawText(ctx, 73, 13, "#FFFFFF", "thin 10px Verdana", presence);
|
||||||
|
break;
|
||||||
|
case "banner1":
|
||||||
|
if (icon) await drawIcon(ctx, 20, 27, 50, icon);
|
||||||
|
await drawText(ctx, 83, 51, "#FFFFFF", "12px Verdana", name, 22);
|
||||||
|
await drawText(ctx, 83, 66, "#C9D2F0FF", "thin 11px Verdana", presence);
|
||||||
|
break;
|
||||||
|
case "banner2":
|
||||||
|
if (icon) await drawIcon(ctx, 13, 19, 36, icon);
|
||||||
|
await drawText(ctx, 62, 34, "#FFFFFF", "12px Verdana", name, 15);
|
||||||
|
await drawText(ctx, 62, 49, "#C9D2F0FF", "thin 11px Verdana", presence);
|
||||||
|
break;
|
||||||
|
case "banner3":
|
||||||
|
if (icon) await drawIcon(ctx, 20, 20, 50, icon);
|
||||||
|
await drawText(ctx, 83, 44, "#FFFFFF", "12px Verdana", name, 27);
|
||||||
|
await drawText(ctx, 83, 58, "#C9D2F0FF", "thin 11px Verdana", presence);
|
||||||
|
break;
|
||||||
|
case "banner4":
|
||||||
|
if (icon) await drawIcon(ctx, 21, 136, 50, icon);
|
||||||
|
await drawText(ctx, 84, 156, "#FFFFFF", "13px Verdana", name, 27);
|
||||||
|
await drawText(ctx, 84, 171, "#C9D2F0FF", "thin 12px Verdana", presence);
|
||||||
|
break;
|
||||||
|
default:
|
||||||
|
throw new HTTPError("Value must be one of ('shield', 'banner1', 'banner2', 'banner3', 'banner4').", 400);
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return final image
|
||||||
|
const buffer = canvas.toBuffer("image/png");
|
||||||
|
res.set("Content-Type", "image/png");
|
||||||
|
res.set("Cache-Control", "public, max-age=3600");
|
||||||
|
return res.send(buffer);
|
||||||
|
});
|
||||||
|
|
||||||
|
async function drawIcon(canvas: any, x: number, y: number, scale: number, icon: string) {
|
||||||
|
const img = new Image();
|
||||||
|
img.src = icon;
|
||||||
|
|
||||||
|
// Do some canvas clipping magic!
|
||||||
|
canvas.save();
|
||||||
|
canvas.beginPath();
|
||||||
|
|
||||||
|
const r = scale / 2; // use scale to determine radius
|
||||||
|
canvas.arc(x + r, y + r, r, 0, 2 * Math.PI, false); // start circle at x, and y coords + radius to find center
|
||||||
|
|
||||||
|
canvas.clip();
|
||||||
|
canvas.drawImage(img, x, y, scale, scale);
|
||||||
|
|
||||||
|
canvas.restore();
|
||||||
|
}
|
||||||
|
|
||||||
|
async function drawText(canvas: any, x: number, y: number, color: string, font: string, text: string, maxcharacters?: number) {
|
||||||
|
canvas.fillStyle = color;
|
||||||
|
canvas.font = font;
|
||||||
|
if (text.length > (maxcharacters || 0) && maxcharacters) text = text.slice(0, maxcharacters) + "...";
|
||||||
|
canvas.fillText(text, x, y);
|
||||||
|
}
|
||||||
|
|
||||||
|
export default router;
|
36
src/routes/guilds/#guild_id/widget.ts
Normal file
36
src/routes/guilds/#guild_id/widget.ts
Normal file
@ -0,0 +1,36 @@
|
|||||||
|
import { Request, Response, Router } from "express";
|
||||||
|
import { getPermission, GuildModel } from "@fosscord/server-util";
|
||||||
|
import { HTTPError } from "lambert-server";
|
||||||
|
import { check } from "../../../util/instanceOf";
|
||||||
|
import { WidgetModifySchema } from "../../../schema/Widget";
|
||||||
|
|
||||||
|
const router: Router = Router();
|
||||||
|
|
||||||
|
// https://discord.com/developers/docs/resources/guild#get-guild-widget-settings
|
||||||
|
router.get("/", async (req: Request, res: Response) => {
|
||||||
|
const { guild_id } = req.params;
|
||||||
|
|
||||||
|
const perms = await getPermission(req.user_id, guild_id);
|
||||||
|
perms.hasThrow("MANAGE_GUILD");
|
||||||
|
|
||||||
|
const guild = await GuildModel.findOne({ id: guild_id }).exec();
|
||||||
|
if (!guild) throw new HTTPError("Guild not found", 404);
|
||||||
|
|
||||||
|
return res.json({ enabled: guild.widget_enabled || false, channel_id: guild.widget_channel_id || null});
|
||||||
|
});
|
||||||
|
|
||||||
|
// https://discord.com/developers/docs/resources/guild#modify-guild-widget
|
||||||
|
router.patch("/", check(WidgetModifySchema), async (req: Request, res: Response) => {
|
||||||
|
const body = req.body as WidgetModifySchema;
|
||||||
|
const { guild_id } = req.params;
|
||||||
|
|
||||||
|
const perms = await getPermission(req.user_id, guild_id);
|
||||||
|
perms.hasThrow("MANAGE_GUILD");
|
||||||
|
|
||||||
|
await GuildModel.updateOne({ id: guild_id }, { widget_enabled: body.enabled, widget_channel_id: body.channel_id }).exec();
|
||||||
|
// Widget invite for the widget_channel_id gets created as part of the /guilds/{guild.id}/widget.json request
|
||||||
|
|
||||||
|
return res.json(body);
|
||||||
|
});
|
||||||
|
|
||||||
|
export default router;
|
10
src/schema/Widget.ts
Normal file
10
src/schema/Widget.ts
Normal file
@ -0,0 +1,10 @@
|
|||||||
|
// https://discord.com/developers/docs/resources/guild#guild-widget-object
|
||||||
|
export const WidgetModifySchema = {
|
||||||
|
enabled: Boolean, // whether the widget is enabled
|
||||||
|
channel_id: String // the widget channel id
|
||||||
|
};
|
||||||
|
|
||||||
|
export interface WidgetModifySchema {
|
||||||
|
enabled: boolean; // whether the widget is enabled
|
||||||
|
channel_id: string; // the widget channel id
|
||||||
|
}
|
Loading…
x
Reference in New Issue
Block a user