roleypoly/v1
1
0
Fork 0
mirror of https://github.com/roleypoly/roleypoly-v1.git synced 2025-04-25 04:09:12 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

replace discord.js with roleypoly v3 discord service

Browse source
This commit is contained in:
41666 2020-02-02 13:10:01 -05:00
parent c196779ff2
commit e26f287a3b
No known key found for this signature in database
GPG key ID: BC51D07640DC10AF
18 changed files with 247 additions and 364 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Server/api/auth.js
View file

@ -70,7 +70,5 @@ module.exports = (R, $) => {
ctx.redirect(url) ctx.redirect(url)
}) })
R.get('/api/oauth/bot/callback', ctx => { R.get('/api/oauth/bot/callback', ctx => {})
console.log(ctx.request)
})
} }

97
Server/api/servers.js
View file

@ -1,21 +1,32 @@
module.exports = (R, $) => { module.exports = (R, $) => {
R.get('/api/servers', async ctx => { const getGm = async (id, userId) => {
try { let gm
const { userId } = ctx.session
const srv = $.discord.getRelevantServers(userId)
const presentable = await $.P.presentableServers(srv, userId)
ctx.body = presentable try {
gm = await $.discord.gm(id, userId)
} catch (e) { } catch (e) {
console.error(e.trace || e.stack) if ($.discord.isRoot(userId)) {
gm = $.discord.fakeGm({ id: userId })
}
} }
return gm
}
R.get('/api/servers', async (ctx, next) => {
const { userId } = ctx.session
const presentable = await $.P.presentableServers(userId)
ctx.status = 200
ctx.body = presentable
await next()
}) })
R.get('/api/server/:id', async ctx => { R.get('/api/server/:id', async ctx => {
const { userId } = ctx.session const { userId } = ctx.session
const { id } = ctx.params const { id } = ctx.params
const srv = $.discord.client.guilds.get(id) const srv = await $.discord.getServer(id)
if (srv == null) { if (srv == null) {
ctx.body = { err: 'not found' } ctx.body = { err: 'not found' }
@ -23,16 +34,13 @@ module.exports = (R, $) => {
return return
} }
let gm const gm = await getGm(id, userId)
if (srv.members.has(userId)) { if (!gm) {
gm = $.discord.gm(id, userId)
} else if ($.discord.isRoot(userId)) {
gm = $.discord.fakeGm({ id: userId })
} else {
ctx.body = { err: 'not_a_member' } ctx.body = { err: 'not_a_member' }
ctx.status = 400 ctx.status = 400
return return
} }
const server = await $.P.presentableServer(srv, gm) const server = await $.P.presentableServer(srv, gm)
ctx.body = server ctx.body = server
@ -41,9 +49,7 @@ module.exports = (R, $) => {
R.get('/api/server/:id/slug', async ctx => { R.get('/api/server/:id/slug', async ctx => {
const { id } = ctx.params const { id } = ctx.params
const srv = $.discord.client.guilds.get(id) const srv = await $.discord.getServer(id)
console.log(srv)
if (srv == null) { if (srv == null) {
ctx.body = { err: 'not found' } ctx.body = { err: 'not found' }
@ -51,20 +57,24 @@ module.exports = (R, $) => {
return return
} }
ctx.body = await $.P.serverSlug(srv) ctx.body = srv
}) })
R.patch('/api/server/:id', async ctx => { R.patch('/api/server/:id', async ctx => {
const { userId } = ctx.session const { userId } = ctx.session
const { id } = ctx.params const { id } = ctx.params
let gm = $.discord.gm(id, userId) const gm = await getGm(id, userId)
if (gm == null && $.discord.isRoot(userId)) { if (!gm) {
gm = $.discord.fakeGm({ id: userId }) ctx.body = { err: 'not_a_member' }
ctx.status = 400
return
} }
const guildRoles = await $.discord.getRoles(id)
// check perms // check perms
if (!$.discord.getPermissions(gm).canManageRoles) { if (!$.discord.getPermissions(gm, guildRoles).canManageRoles) {
ctx.status = 403 ctx.status = 403
ctx.body = { err: 'cannot_manage_roles' } ctx.body = { err: 'cannot_manage_roles' }
return return
@ -98,36 +108,29 @@ module.exports = (R, $) => {
R.patch('/api/servers/:server/roles', async ctx => { R.patch('/api/servers/:server/roles', async ctx => {
const { userId } = ctx.session const { userId } = ctx.session
const { server } = ctx.params const { server } = ctx.params
let gm = $.discord.gm(server, userId)
if (gm == null && $.discord.isRoot(userId)) {
gm = $.discord.fakeGm({ id: userId })
}
// check perms
// if (!$.discord.getPermissions(gm).canManageRoles) {
// ctx.status = 403
// ctx.body = { err: 'cannot_manage_roles' }
// return
// }
const { added, removed } = ctx.request.body const { added, removed } = ctx.request.body
const allowedRoles = await $.server.getAllowedRoles(server) let gm = await getGm(server, userId)
if (!gm) {
const pred = r => $.discord.safeRole(server, r) && allowedRoles.indexOf(r) !== -1 ctx.status = 404
return
if (added.length > 0) {
gm = await gm.addRoles(added.filter(pred))
} }
setTimeout(() => { const currentRoles = gm.rolesList
if (removed.length > 0) { const allowedRoles = await $.server.getAllowedRoles(server)
gm.removeRoles(removed.filter(pred))
}
}, 1000)
// console.log('role patch', { added, removed, allowedRoles, addedFiltered: added.filterNot(pred), removedFiltered: removed.filterNot(pred) }) // current roles and allowed roles are an inclusive set.
// first, filter added and removed.
const sanitizedAdded = added.filter(role => allowedRoles.includes(role))
const sanitizedRemoved = removed.filter(role => allowedRoles.includes(role))
// filter currentRoles by what's been removed (down is faster than up)
let newRoles = currentRoles.filter(role => !sanitizedRemoved.includes(role))
// last, add new roles
newRoles = [...newRoles, ...sanitizedAdded]
await $.discord.updateRoles(gm, newRoles)
ctx.body = { ok: true } ctx.body = { ok: true }
}) })

9
Server/index.js
View file

@ -81,7 +81,7 @@ async function start() {
try { try {
ctx.body = fs.readFileSync(path.join(pub, 'index.html'), { encoding: 'utf-8' }) ctx.body = fs.readFileSync(path.join(pub, 'index.html'), { encoding: 'utf-8' })
} catch (e) { } catch (e) {
ctx.body = "A problem occured." ctx.body = 'A problem occured.'
ctx.status = 500 ctx.status = 500
console.error(e) console.error(e)
} }
@ -100,15 +100,14 @@ async function start() {
} catch (e) { } catch (e) {
log.error(e) log.error(e)
ctx.status = ctx.status || 500 ctx.status = ctx.status || 500
if (DEVEL) { if (DEVEL) {
console.error(e) console.error(e)
} }
ctx.body = { ctx.body = {
err: 'something terrible happened.', err: 'something terrible happened.',
} }
} }
let timeElapsed = new Date() - timeStart let timeElapsed = new Date() - timeStart

99
Server/package-lock.json generated
View file

@ -47,19 +47,19 @@
} }
} }
}, },
"@discordjs/uws": {
"version": "10.149.0",
"resolved": "https://registry.npmjs.org/@discordjs/uws/-/uws-10.149.0.tgz",
"integrity": "sha512-N1wjoAD2DOgzevqzyTOWTgyO2divX03JWNQx4JHm/jQ/BRzZNkhwVRO3RC5Guww+srdgs4Tw4gwrzlJrlOhq/Q=="
},
"@improbable-eng/grpc-web": { "@improbable-eng/grpc-web": {
"version": "0.11.0", "version": "0.12.0",
"resolved": "https://registry.npmjs.org/@improbable-eng/grpc-web/-/grpc-web-0.11.0.tgz", "resolved": "https://registry.npmjs.org/@improbable-eng/grpc-web/-/grpc-web-0.12.0.tgz",
"integrity": "sha512-SS2YP6iHyZ7TSSuCShnSo9xJyUkNZHEhEPJpTSUcNoULe1LuLEk52OKHY+VW9XB0qXstejpHgZq2Hx+69PThiw==", "integrity": "sha512-uJjgMPngreRTYPBuo6gswMj1gK39Wbqre/RgE0XnSDXJRg6ST7ZhuS53dFE6Vc2CX4jxgl+cO+0B3op8LA4Q0Q==",
"requires": { "requires": {
"browser-headers": "^0.4.0" "browser-headers": "^0.4.0"
} }
}, },
"@improbable-eng/grpc-web-node-http-transport": {
"version": "0.12.0",
"resolved": "https://registry.npmjs.org/@improbable-eng/grpc-web-node-http-transport/-/grpc-web-node-http-transport-0.12.0.tgz",
"integrity": "sha512-+Kjz+Dktfz5LKTZA9ZW/Vlww6HF9KaKz4x2mVe1O8CJdOP2WfzC+KY8L6EWMqVLrV4MvdBuQdSgDmvSJz+OGuA=="
},
"@opencensus/core": { "@opencensus/core": {
"version": "0.0.9", "version": "0.0.9",
"resolved": "https://registry.npmjs.org/@opencensus/core/-/core-0.0.9.tgz", "resolved": "https://registry.npmjs.org/@opencensus/core/-/core-0.0.9.tgz",
@ -277,12 +277,12 @@
} }
}, },
"@roleypoly/rpc": { "@roleypoly/rpc": {
"version": "3.0.0-alpha.12", "version": "1.5.0",
"resolved": "https://registry.npmjs.org/@roleypoly/rpc/-/rpc-3.0.0-alpha.12.tgz", "resolved": "https://registry.npmjs.org/@roleypoly/rpc/-/rpc-1.5.0.tgz",
"integrity": "sha512-Tl7G/yGF/3FmoF3GoYFZ2JdpSH7Fv5NGGbDB7KbVum+GOmnIoG7D8ETUb5Ge2YHpTYLoJSAmVhDGiuI8o3QC6A==", "integrity": "sha512-sbnEbiDHOAM0kJV5e6OE/1nirtjgDLlgngYLPnB3dvMefDo0o1BcT36aTm5TMn6Y1lX4ecjmfbeI37FOI7IEVQ==",
"requires": { "requires": {
"@improbable-eng/grpc-web": "0.11.0", "@improbable-eng/grpc-web": "0.12.0",
"google-protobuf": "3.10.0" "google-protobuf": "3.11.2"
} }
}, },
"@types/color-name": { "@types/color-name": {
@ -492,14 +492,6 @@
"resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz",
"integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow==" "integrity": "sha512-Phlt0plgpIIBOGTT/ehfFnbNlfsDEiqmzE2KRXoX1bLIlir4X/MR+zSyBEkL05ffWgnRSf/DXv+WrUAVr93/ow=="
}, },
"bindings": {
"version": "1.5.0",
"resolved": "https://registry.npmjs.org/bindings/-/bindings-1.5.0.tgz",
"integrity": "sha512-p2q/t/mhvuOj/UeLlV6566GD/guowlr0hHxClI0W9m7MWYkL1F0hLo+0Aexs9HSPCtR1SXQ0TD3MMKrXZajbiQ==",
"requires": {
"file-uri-to-path": "1.0.0"
}
},
"blessed": { "blessed": {
"version": "0.1.81", "version": "0.1.81",
"resolved": "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz", "resolved": "https://registry.npmjs.org/blessed/-/blessed-0.1.81.tgz",
@ -944,18 +936,6 @@
"resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz", "resolved": "https://registry.npmjs.org/destroy/-/destroy-1.0.4.tgz",
"integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA=" "integrity": "sha1-l4hXRCxEdJ5CBmE+N5RiBYJqvYA="
}, },
"discord.js": {
"version": "11.5.1",
"resolved": "https://registry.npmjs.org/discord.js/-/discord.js-11.5.1.tgz",
"integrity": "sha512-tGhV5xaZXE3Z+4uXJb3hYM6gQ1NmnSxp9PClcsSAYFVRzH6AJH74040mO3afPDMWEAlj8XsoPXXTJHTxesqcGw==",
"requires": {
"long": "^4.0.0",
"prism-media": "^0.0.3",
"snekfetch": "^3.6.4",
"tweetnacl": "^1.0.0",
"ws": "^6.0.0"
}
},
"doctrine": { "doctrine": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz",
@ -1065,14 +1045,6 @@
"has-binary2": "~1.0.2" "has-binary2": "~1.0.2"
} }
}, },
"erlpack": {
"version": "github:discordapp/erlpack#5d0064f9e106841e1eead711a6451f99b0d289fd",
"from": "github:discordapp/erlpack",
"requires": {
"bindings": "^1.5.0",
"nan": "^2.14.0"
}
},
"error-inject": { "error-inject": {
"version": "1.0.0", "version": "1.0.0",
"resolved": "https://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz", "resolved": "https://registry.npmjs.org/error-inject/-/error-inject-1.0.0.tgz",
@ -1550,9 +1522,9 @@
"integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==" "integrity": "sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA=="
}, },
"google-protobuf": { "google-protobuf": {
"version": "3.10.0", "version": "3.11.2",
"resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.10.0.tgz", "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.11.2.tgz",
"integrity": "sha512-d0cMO8TJ6xtB/WrVHCv5U81L2ulX+aCD58IljyAN6mHwdHHJ2jbcauX5glvivi3s3hx7EYEo7eUA9WftzamMnw==" "integrity": "sha512-T4fin7lcYLUPj2ChUZ4DvfuuHtg3xi1621qeRZt2J7SvOQusOzq+sDT4vbotWTCjUXJoR36CA016LlhtPy80uQ=="
}, },
"has": { "has": {
"version": "1.0.3", "version": "1.0.3",
@ -2219,11 +2191,6 @@
"resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz",
"integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg==" "integrity": "sha512-U7KCmLdqsGHBLeWqYlFA0V0Sl6P08EE1ZrmA9cxjUE0WVqT9qnyVDPz1kzpFEP0jdJuFnasWIfSd7fsaNXkpbg=="
}, },
"long": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/long/-/long-4.0.0.tgz",
"integrity": "sha512-XsP+KhQif4bjX1kbuSiySJFNAehNxgLb6hPRGJ9QsUr8ajHkuXGdrHmFUTUUXhDwVX2R5bY4JNZEwbUiMhV+MA=="
},
"lru-cache": { "lru-cache": {
"version": "5.1.1", "version": "5.1.1",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz",
@ -2324,11 +2291,6 @@
"thenify-all": "^1.0.0" "thenify-all": "^1.0.0"
} }
}, },
"nan": {
"version": "2.14.0",
"resolved": "https://registry.npmjs.org/nan/-/nan-2.14.0.tgz",
"integrity": "sha512-INOFj37C7k3AfaNTtX8RhsTw7qRy7eLET14cROi9+5HAVbbHuIWUHEauBv5qT4Av2tWasiTY1Jw6puUNqRJXQg=="
},
"natural-compare": { "natural-compare": {
"version": "1.4.0", "version": "1.4.0",
"resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz", "resolved": "https://registry.npmjs.org/natural-compare/-/natural-compare-1.4.0.tgz",
@ -2369,11 +2331,6 @@
"resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz", "resolved": "https://registry.npmjs.org/nice-try/-/nice-try-1.0.5.tgz",
"integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ==" "integrity": "sha512-1nh45deeb5olNY7eX82BkPO7SSxR5SSYJiPTrTdFUVYwAl8CKMA5N9PjTYkHiRjisVcxcQ1HXdLhx2qxxJzLNQ=="
}, },
"node-addon-api": {
"version": "1.7.1",
"resolved": "https://registry.npmjs.org/node-addon-api/-/node-addon-api-1.7.1.tgz",
"integrity": "sha512-2+DuKodWvwRTrCfKOeR24KIc5unKjOh8mz17NCzVnHWfjAdDqbfbjqh7gUT+BkXBRQM52+xCHciKWonJ3CbJMQ=="
},
"normalize-path": { "normalize-path": {
"version": "3.0.0", "version": "3.0.0",
"resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz",
@ -2827,11 +2784,6 @@
"integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==",
"dev": true "dev": true
}, },
"prism-media": {
"version": "0.0.3",
"resolved": "https://registry.npmjs.org/prism-media/-/prism-media-0.0.3.tgz",
"integrity": "sha512-c9KkNifSMU/iXT8FFTaBwBMr+rdVcN+H/uNv1o+CuFeTThNZNTOrQ+RgXA1yL/DeLk098duAeRPP3QNPNbhxYQ=="
},
"process-nextick-args": { "process-nextick-args": {
"version": "2.0.1", "version": "2.0.1",
"resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
@ -3172,11 +3124,6 @@
"resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz", "resolved": "https://registry.npmjs.org/smart-buffer/-/smart-buffer-4.1.0.tgz",
"integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw==" "integrity": "sha512-iVICrxOzCynf/SNaBQCw34eM9jROU/s5rzIhpOvzhzuYHfJR/DhZfDkXiZSgKXfgv26HT3Yni3AV/DGw0cGnnw=="
}, },
"snekfetch": {
"version": "3.6.4",
"resolved": "https://registry.npmjs.org/snekfetch/-/snekfetch-3.6.4.tgz",
"integrity": "sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw=="
},
"socket.io": { "socket.io": {
"version": "2.3.0", "version": "2.3.0",
"resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz", "resolved": "https://registry.npmjs.org/socket.io/-/socket.io-2.3.0.tgz",
@ -3588,11 +3535,6 @@
"resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz", "resolved": "https://registry.npmjs.org/tv4/-/tv4-1.3.0.tgz",
"integrity": "sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM=" "integrity": "sha1-0CDIRvrdUMhVq7JeuuzGj8EPeWM="
}, },
"tweetnacl": {
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.1.tgz",
"integrity": "sha512-kcoMoKTPYnoeS50tzoqjPY3Uv9axeuuFAZY9M/9zFnhoVvRfxz9K29IMPD7jGmt2c8SW7i3gT9WqDl2+nV7p4A=="
},
"type-check": { "type-check": {
"version": "0.3.2", "version": "0.3.2",
"resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz",
@ -3768,15 +3710,6 @@
"version": "1.2.1", "version": "1.2.1",
"resolved": "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz", "resolved": "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz",
"integrity": "sha512-faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ==" "integrity": "sha512-faQrqNMzcPCHGVC2aaOINk13K+aaBDUPjGWl0teOXywElLjyVAB6Oe2jj62jHYtwsU49jXhScYbvPENK+6zAvQ=="
},
"zucc": {
"version": "0.1.2",
"resolved": "https://registry.npmjs.org/zucc/-/zucc-0.1.2.tgz",
"integrity": "sha512-G2x33eO7X79+7eSnwL9+uWYxxCEXk+P4BkcrVYpV6NTxynqjFhhiWLxbXsq5Lx4B36dYlXpvRoOk0a82TUKgRw==",
"requires": {
"bindings": "^1.5.0",
"node-addon-api": "^1.6.3"
}
} }
} }
} }

10
Server/package.json
View file

@ -10,15 +10,14 @@
"pm2": "pm2" "pm2": "pm2"
}, },
"dependencies": { "dependencies": {
"@discordjs/uws": "^10.149.0", "@improbable-eng/grpc-web-node-http-transport": "^0.12.0",
"@roleypoly/rpc": "^3.0.0-alpha.12", "@roleypoly/rpc": "^1.5.0",
"chalk": "^3.0.0", "chalk": "^3.0.0",
"discord.js": "^11.5.1",
"dotenv": "^8.2.0", "dotenv": "^8.2.0",
"erlpack": "github:discordapp/erlpack",
"eslint": "^6.6.0", "eslint": "^6.6.0",
"eslint-config-standard": "^14.1.0", "eslint-config-standard": "^14.1.0",
"glob": "^7.1.6", "glob": "^7.1.6",
"google-protobuf": "^3.11.2",
"immutable": "^4.0.0-rc.12", "immutable": "^4.0.0-rc.12",
"koa": "^2.11.0", "koa": "^2.11.0",
"koa-better-router": "^2.1.1", "koa-better-router": "^2.1.1",
@ -35,8 +34,7 @@
"sequelize": "^5.21.2", "sequelize": "^5.21.2",
"socket.io": "^2.3.0", "socket.io": "^2.3.0",
"superagent": "^5.1.1", "superagent": "^5.1.1",
"uuid": "^3.3.3", "uuid": "^3.3.3"
"zucc": "^0.1.2"
}, },
"devDependencies": { "devDependencies": {
"prettier": "^1.19.1" "prettier": "^1.19.1"

4
Server/services/discord-rpc.js
View file

@ -1,4 +0,0 @@
const Service = require('./Service')
const DiscordRPC = require('@roleypoly/rpc/discord')
class DiscordRPCService extends Service {}

270
Server/services/discord.js
View file

@ -1,6 +1,10 @@
const Service = require('./Service') const Service = require('./Service')
const discord = require('discord.js')
const superagent = require('superagent') const superagent = require('superagent')
const { DiscordClient, Member } = require('@roleypoly/rpc/discord')
const { IDQuery, DiscordUser } = require('@roleypoly/rpc/shared')
const { Empty } = require('google-protobuf/google/protobuf/empty_pb')
const { NodeHttpTransport } = require('@improbable-eng/grpc-web-node-http-transport')
const LRU = require('lru-cache')
class DiscordService extends Service { class DiscordService extends Service {
constructor(ctx) { constructor(ctx) {
@ -12,32 +16,55 @@ class DiscordService extends Service {
this.oauthCallback = process.env.OAUTH_AUTH_CALLBACK this.oauthCallback = process.env.OAUTH_AUTH_CALLBACK
this.botCallback = `${ctx.config.appUrl}/api/oauth/bot/callback` this.botCallback = `${ctx.config.appUrl}/api/oauth/bot/callback`
this.appUrl = process.env.APP_URL this.appUrl = process.env.APP_URL
this.isBot = process.env.IS_BOT === 'true' || false
this.rootUsers = new Set((process.env.ROOT_USERS || '').split(',')) this.rootUsers = new Set((process.env.ROOT_USERS || '').split(','))
this.client = new discord.Client() this.rpcAddr = process.env.DISCORD_SVC_ADDR
this.client.options.disableEveryone = true this.rpcSecret = process.env.SHARED_SECRET
this.rpc = new DiscordClient(this.rpcAddr, { transport: NodeHttpTransport() })
this.cmds = this._cmds() this.cache = new LRU({
max: 500,
maxAge: 2 /* minutes */ * 60 * 1000,
})
this.startBot() this.sharedHeaders = {
Authorization: `Shared ${this.rpcSecret}`,
}
this.bootstrap().catch(e => {
console.error(`bootstrap failure`, e)
process.exit(-1)
})
}
async bootstrap() {
const ownUser = await this.rpc.ownUser(new Empty(), this.sharedHeaders)
this.ownUser = ownUser.toObject()
const listGuilds = await this.rpc.listGuilds(new Empty(), this.sharedHeaders)
this.syncGuilds(listGuilds.toObject().guildsList)
} }
ownGm(server) { ownGm(server) {
return this.gm(server, this.client.user.id) return this.gm(server, this.ownUser.id)
} }
fakeGm({ id = 0, nickname = '[none]', displayHexColor = '#ffffff' }) { /**
* @returns Member.AsObject
*/
fakeGm({ guildID, id = '0', nickname = '[none]', displayHexColor = '#ffffff' }) {
return { return {
id, guildID: guildID,
nickname, roles: [],
displayHexColor, nick: nickname,
__faked: true, user: {
roles: { ID: id,
has() { username: nickname,
return false discriminator: '0000',
}, avatar: '',
bot: false,
}, },
displayHexColor: 0,
} }
} }
@ -45,50 +72,94 @@ class DiscordService extends Service {
return this.rootUsers.has(id) return this.rootUsers.has(id)
} }
async startBot() { async getRelevantServers(userId) {
await this.client.login(this.botToken) return this.cacheCurry(`grs:${userId}`, async () => {
const q = new IDQuery()
q.setMemberid('' + userId)
// not all roleypolys are bots. const guilds = await this.rpc.getGuildsByMember(q, this.sharedHeaders)
if (this.isBot) { this.syncGuilds(guilds.toObject().guildsList)
this.log.info('this roleypoly is a bot') return guilds.toObject().guildsList
this.client.on('message', this.handleMessage.bind(this)) })
this.client.on('guildCreate', this.handleJoin.bind(this))
}
for (let server of this.client.guilds.array()) {
await this.ctx.server.ensure(server)
}
}
getRelevantServers(userId) {
return this.client.guilds.filter(g => g.members.has(userId))
} }
gm(serverId, userId) { gm(serverId, userId) {
return this.client.guilds.get(serverId).members.get(userId) return this.cacheCurry(`gm:${serverId}-${userId}`, async () => {
const q = new IDQuery()
q.setGuildid(serverId)
q.setMemberid(userId)
const member = await this.rpc.getMember(q, this.sharedHeaders)
return member.toObject()
})
} }
getRoles(server) { getRoles(serverId) {
return this.client.guilds.get(server).roles return this.cacheCurry(`roles:${serverId}`, async () => {
const q = new IDQuery()
q.setGuildid(serverId)
const roles = await this.rpc.getGuildRoles(q, this.sharedHeaders)
return roles.toObject().rolesList.filter(role => role.id !== serverId)
})
} }
getPermissions(gm) { getPermissions(gm, guildRoles) {
if (this.isRoot(gm.id)) { if (this.isRoot(gm.user.id)) {
return { return {
isAdmin: true, isAdmin: true,
canManageRoles: true, canManageRoles: true,
} }
} }
const matchFor = permissionInt =>
!!gm.roles
.map(id => guildRoles.find(role => role.id))
.filter(x => !!x)
.find(role => (role.permissions & permissionInt) === permissionInt)
const isAdmin = matchFor(0x00000008)
const canManageRoles = isAdmin || matchFor(0x10000000)
return { return {
isAdmin: gm.permissions.hasPermission('ADMINISTRATOR'), isAdmin,
canManageRoles: gm.permissions.hasPermission('MANAGE_ROLES', false, true), canManageRoles,
} }
} }
safeRole(server, role) { getServer(serverId) {
const r = this.getRoles(server).get(role) return this.cacheCurry(`g:${serverId}`, async () => {
return r.editable && !r.hasPermission('MANAGE_ROLES', false, true) const q = new IDQuery()
q.setGuildid(serverId)
const guild = await this.rpc.getGuild(q, this.sharedHeaders)
return guild.toObject()
})
}
async updateRoles(memberObj, newRoles) {
memberObj.rolesList = newRoles
const member = this.memberToProto(memberObj)
await this.rpc.updateMember(member)
}
memberToProto(member) {
const memberProto = new Member()
memberProto.setGuildid(member.guildid)
memberProto.setRolesList(member.rolesList)
memberProto.setNick(member.nick)
memberProto.setUser(this.userToProto(member.user))
return memberProto
}
userToProto(user) {
const userProto = new DiscordUser()
userProto.setId(user.id)
userProto.setUsername(user.username)
userProto.setDiscriminator(user.discriminator)
userProto.setAvatar(user.avatar)
userProto.setBot(user.bot)
return userProto
} }
// oauth step 2 flow, grab the auth token via code // oauth step 2 flow, grab the auth token via code
@ -128,28 +199,6 @@ class DiscordService extends Service {
} }
} }
// on sign out, we revoke the token we had.
// async revokeAuthToken (code, state) {
// const url = 'https://discordapp.com/api/oauth2/revoke'
// try {
// const rsp =
// await superagent
// .post(url)
// .send({
// client_id: this.clientId,
// client_secret: this.clientSecret,
// grant_type: 'authorization_code',
// code: code,
// redirect_uri: this.oauthCallback
// })
// return rsp.body
// } catch (e) {
// this.log.error('getAuthToken failed', e)
// throw e
// }
// }
// returns oauth authorize url with IDENTIFY permission // returns oauth authorize url with IDENTIFY permission
// we only need IDENTIFY because we only use it for matching IDs from the bot // we only need IDENTIFY because we only use it for matching IDs from the bot
getAuthUrl(state) { getAuthUrl(state) {
@ -162,97 +211,20 @@ class DiscordService extends Service {
return `https://discordapp.com/oauth2/authorize?client_id=${this.clientId}&scope=bot&permissions=268435456` return `https://discordapp.com/oauth2/authorize?client_id=${this.clientId}&scope=bot&permissions=268435456`
} }
mentionResponse(message) { async syncGuilds(guilds) {
message.channel.send( guilds.forEach(guild => this.ctx.server.ensure(guild))
`🔰 Assign your roles here! <${this.appUrl}/s/${message.guild.id}>`,
{ disableEveryone: true }
)
} }
_cmds() { async cacheCurry(key, func) {
const cmds = [ if (this.cache.has(key)) {
{ return this.cache.get(key)
regex: /say (.*)/,
handler(message, matches, r) {
r(matches[0])
},
},
{
regex: /set username (.*)/,
async handler(message, matches) {
const { username } = this.client.user
await this.client.user.setUsername(matches[0])
message.channel.send(`Username changed from ${username} to ${matches[0]}`)
},
},
{
regex: /stats/,
async handler(message, matches) {
const t = [
`**Stats** 📈`,
'',
`👩‍❤️‍👩 **Users Served:** ${this.client.guilds.reduce(
(acc, g) => acc + g.memberCount,
0
)}`,
`🔰 **Servers:** ${this.client.guilds.size}`,
`💮 **Roles Seen:** ${this.client.guilds.reduce(
(acc, g) => acc + g.roles.size,
0
)}`,
]
message.channel.send(t.join('\n'))
},
},
]
// prefix regex with ^ for ease of code
.map(({ regex, ...rest }) => ({
regex: new RegExp(`^${regex.source}`, regex.flags),
...rest,
}))
return cmds
}
async handleCommand(message) {
const cmd = message.content.replace(`<@${this.client.user.id}> `, '')
this.log.debug(`got command from ${message.author.username}`, cmd)
for (let { regex, handler } of this.cmds) {
const match = regex.exec(cmd)
if (match !== null) {
this.log.debug('command accepted', { cmd, match })
try {
await handler.call(this, message, match.slice(1))
return
} catch (e) {
this.log.error('command errored', { e, cmd, message })
message.channel.send(`❌ **An error occured.** ${e}`)
return
}
}
} }
// nothing matched? const returnVal = await func()
this.mentionResponse(message)
}
handleMessage(message) { this.cache.set(key, returnVal)
if (message.author.bot && message.channel.type !== 'text') {
// drop bot messages and dms
return
}
if (message.mentions.users.has(this.client.user.id)) { return returnVal
if (this.rootUsers.has(message.author.id)) {
this.handleCommand(message)
} else {
this.mentionResponse(message)
}
}
}
async handleJoin(guild) {
await this.ctx.server.ensure(guild)
} }
} }

92
Server/services/presentation.js
View file

@ -1,5 +1,6 @@
const Service = require('./Service') const Service = require('./Service')
const LRU = require('lru-cache') const LRU = require('lru-cache')
const { Role } = require('@roleypoly/rpc/shared')
class PresentationService extends Service { class PresentationService extends Service {
constructor(ctx) { constructor(ctx) {
@ -7,7 +8,10 @@ class PresentationService extends Service {
this.M = ctx.M this.M = ctx.M
this.discord = ctx.discord this.discord = ctx.discord
this.cache = new LRU({ max: 500, maxAge: 100 * 60 * 5 }) this.cache = new LRU({
max: 500,
maxAge: 1000 * 60 * 1,
})
} }
serverSlug(server) { serverSlug(server) {
@ -19,58 +23,56 @@ class PresentationService extends Service {
} }
} }
async oldPresentableServers(collection, userId) { presentableServers(userId) {
let servers = [] return this.cacheCurry(`pss:${userId}`, async () => {
const servers = await this.discord.getRelevantServers(userId)
const transformedServers = []
for (let server of collection.array()) { for (let server of servers) {
const gm = server.members.get(userId) const member = await this.discord.gm(server.id, userId)
const transformedServer = await this.presentableServer(server, member)
transformedServers.push(transformedServer)
}
servers.push(await this.presentableServer(server, gm)) return transformedServers
}
return servers
}
async presentableServers(collection, userId) {
return collection.array().areduce(async (acc, server) => {
const gm = server.members.get(userId)
acc.push(await this.presentableServer(server, gm, { incRoles: false }))
return acc
}) })
} }
async presentableServer(server, gm, { incRoles = true } = {}) { presentableServer(server, member) {
const sd = await this.ctx.server.get(server.id) return this.cacheCurry(`ps:${server.id}-${member.user.id}`, async () => {
const serverData = await this.ctx.server.get(server.id)
const serverRoles = await this.discord.getRoles(server.id)
const memberRoles = member.rolesList
.map(id => serverRoles.find(role => role.id === id))
.sort((a, b) => (a.position < b.position ? -1 : 1))
return { const color = memberRoles.length > 0 ? memberRoles[0].color : 0
id: server.id,
gm: { return {
nickname: gm.nickname, id: server.id,
color: gm.displayHexColor, gm: {
}, ...member,
server: this.serverSlug(server), color,
roles: incRoles },
? (await this.rolesByServer(server, sd)).map(r => ({ server: server,
...r, roles: serverRoles,
selected: gm.roles.has(r.id), message: serverData.message,
})) categories: serverData.categories,
: [], perms: this.discord.getPermissions(member, serverRoles),
message: sd.message, }
categories: sd.categories, })
perms: this.discord.getPermissions(gm),
}
} }
async rolesByServer(server) { async cacheCurry(key, func) {
return server.roles if (this.cache.has(key)) {
.filter(r => r.id !== server.id) // get rid of @everyone return this.cache.get(key)
.map(r => ({ }
id: r.id,
color: r.color, const returnVal = await func()
name: r.name,
position: r.position, this.cache.set(key, returnVal)
safe: this.discord.safeRole(server.id, r.id),
})) return returnVal
} }
} }

1
UI/src/components/role-editor/index.js
View file

@ -58,7 +58,6 @@ class RoleEditor extends Component {
dropRole = (category, name) => ({ role, category }) => { dropRole = (category, name) => ({ role, category }) => {
const { dispatch } = this.props const { dispatch } = this.props
console.log(role)
dispatch(Actions.addRoleToCategory(name, category, role)) dispatch(Actions.addRoleToCategory(name, category, role))
} }

3
UI/src/components/role-picker/Category.js
View file

@ -26,7 +26,6 @@ class Category extends Component {
case 'multi': case 'multi':
return this.toggleRoleMulti(id, next) return this.toggleRoleMulti(id, next)
default: default:
console.warn('DEFAULTING TO MULTI', id, next, old)
return this.toggleRoleMulti(id, next) return this.toggleRoleMulti(id, next)
} }
} }
@ -54,7 +53,7 @@ class Category extends Component {
<Role <Role
key={k} key={k}
role={r} role={r}
disabled={!r.get('safe')} disabled={r.get('safety') !== 0}
selected={isSelected(id)} selected={isSelected(id)}
onToggle={this.onRoleToggle(id)} onToggle={this.onRoleToggle(id)}
/> />

7
UI/src/components/role-picker/actions.js
View file

@ -17,13 +17,14 @@ export const setup = id => async dispatch => {
} }
export const getViewMap = server => { export const getViewMap = server => {
const gmRoles = server.get('gm').get('rolesList')
const roles = server.get('roles') const roles = server.get('roles')
const categories = server.get('categories') const categories = server.get('categories')
const categoriesIds = server.get('categories').keySeq() const categoriesIds = server.get('categories').keySeq()
const allRoles = server const allRoles = server
.get('roles') .get('roles')
.filter(v => v.get('safe')) .filter(v => v.get('safety') === 0)
.map(r => r.get('id')) .map(r => r.get('id'))
.toSet() .toSet()
const accountedRoles = categories const accountedRoles = categories
@ -32,8 +33,6 @@ export const getViewMap = server => {
.flatten() .flatten()
const unaccountedRoles = allRoles.subtract(accountedRoles) const unaccountedRoles = allRoles.subtract(accountedRoles)
// console.log('roles', allRoles.toJS(), accountedRoles.toJS(), unaccountedRoles.toJS())
const viewMap = categories const viewMap = categories
.set( .set(
'Uncategorized', 'Uncategorized',
@ -67,7 +66,7 @@ export const getViewMap = server => {
}) })
const selected = roles.reduce( const selected = roles.reduce(
(acc, r) => acc.set(r.get('id'), r.get('selected')), (acc, r) => acc.set(r.get('id'), gmRoles.includes(r.get('id'))),
Map() Map()
) )

2
UI/src/components/role-picker/index.js
View file

@ -73,8 +73,6 @@ class RolePicker extends Component {
const msg = server.get('message') const msg = server.get('message')
const msgBuffer = this.props.data.get('messageBuffer') const msgBuffer = this.props.data.get('messageBuffer')
console.log(msg, roleManager, isEditing, this.props.data.toJS())
if (!roleManager && msg !== '') { if (!roleManager && msg !== '') {
return ( return (
<section> <section>

2
UI/src/components/role/index.js
View file

@ -18,8 +18,6 @@ class Role extends Component {
let { role, selected, disabled, type, isDragging } = this.props let { role, selected, disabled, type, isDragging } = this.props
type = type || 'button' type = type || 'button'
// console.log(this.props)
let color = Color(role.get('color')) let color = Color(role.get('color'))
if (color.rgbNumber() === 0) { if (color.rgbNumber() === 0) {

1
UI/src/components/servers/Navigation.js
View file

@ -14,7 +14,6 @@ class ServersNavigation extends Component {
} }
render() { render() {
// console.log(this.props.servers)
return ( return (
<Fragment> <Fragment>
<UserCard user={this.props.user} /> <UserCard user={this.props.user} />

2
UI/src/components/servers/ServerCard.js
View file

@ -14,8 +14,6 @@ class ServerCard extends Component {
let icon = '' let icon = ''
console.log(__filename, server)
const s = server.get('server') const s = server.get('server')
const gm = server.get('gm') const gm = server.get('gm')
const perms = server.get('perms') const perms = server.get('perms')

2
UI/src/components/servers/ServerLanding.js
View file

@ -10,8 +10,6 @@ export default class ServerLanding extends Component {
} }
async componentDidMount() { async componentDidMount() {
console.log(this.props)
try { try {
const rsp = await superagent.get( const rsp = await superagent.get(
`/api/server/${this.props.match.params.server}/slug` `/api/server/${this.props.match.params.server}/slug`

2
UI/src/components/servers/UserCard.js
View file

@ -25,8 +25,6 @@ class UserCard extends Component {
render() { render() {
const { user } = this.props const { user } = this.props
// console.log(this.props)
return ( return (
<div className="user-card"> <div className="user-card">
<div className="user-card__icon"> <div className="user-card__icon">

4
UI/src/components/servers/index.js
View file

@ -10,8 +10,6 @@ import RolePicker from '../role-picker'
import './index.sass' import './index.sass'
import Navigation from './Navigation' import Navigation from './Navigation'
// import mockData from './mockData'
const mapState = ({ servers, user, appState }) => { const mapState = ({ servers, user, appState }) => {
return { return {
servers, servers,
@ -22,8 +20,6 @@ const mapState = ({ servers, user, appState }) => {
class Servers extends Component { class Servers extends Component {
get defaultPath() { get defaultPath() {
console.log(this.props.servers.toJS())
const first = this.props.servers.first() const first = this.props.servers.first()
if (first != null) { if (first != null) {
return first.get('id') return first.get('id')