diff --git a/Server/api/auth.js b/Server/api/auth.js index 516d26e..f963b43 100644 --- a/Server/api/auth.js +++ b/Server/api/auth.js @@ -70,7 +70,5 @@ module.exports = (R, $) => { ctx.redirect(url) }) - R.get('/api/oauth/bot/callback', ctx => { - console.log(ctx.request) - }) + R.get('/api/oauth/bot/callback', ctx => {}) } diff --git a/Server/api/servers.js b/Server/api/servers.js index 9778d2c..1128e63 100644 --- a/Server/api/servers.js +++ b/Server/api/servers.js @@ -1,21 +1,32 @@ module.exports = (R, $) => { - R.get('/api/servers', async ctx => { - try { - const { userId } = ctx.session - const srv = $.discord.getRelevantServers(userId) - const presentable = await $.P.presentableServers(srv, userId) + const getGm = async (id, userId) => { + let gm - ctx.body = presentable + try { + gm = await $.discord.gm(id, userId) } 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 => { const { userId } = ctx.session const { id } = ctx.params - const srv = $.discord.client.guilds.get(id) + const srv = await $.discord.getServer(id) if (srv == null) { ctx.body = { err: 'not found' } @@ -23,16 +34,13 @@ module.exports = (R, $) => { return } - let gm - if (srv.members.has(userId)) { - gm = $.discord.gm(id, userId) - } else if ($.discord.isRoot(userId)) { - gm = $.discord.fakeGm({ id: userId }) - } else { + const gm = await getGm(id, userId) + if (!gm) { ctx.body = { err: 'not_a_member' } ctx.status = 400 return } + const server = await $.P.presentableServer(srv, gm) ctx.body = server @@ -41,9 +49,7 @@ module.exports = (R, $) => { R.get('/api/server/:id/slug', async ctx => { const { id } = ctx.params - const srv = $.discord.client.guilds.get(id) - - console.log(srv) + const srv = await $.discord.getServer(id) if (srv == null) { ctx.body = { err: 'not found' } @@ -51,20 +57,24 @@ module.exports = (R, $) => { return } - ctx.body = await $.P.serverSlug(srv) + ctx.body = srv }) R.patch('/api/server/:id', async ctx => { const { userId } = ctx.session const { id } = ctx.params - let gm = $.discord.gm(id, userId) - if (gm == null && $.discord.isRoot(userId)) { - gm = $.discord.fakeGm({ id: userId }) + const gm = await getGm(id, userId) + if (!gm) { + ctx.body = { err: 'not_a_member' } + ctx.status = 400 + return } + const guildRoles = await $.discord.getRoles(id) + // check perms - if (!$.discord.getPermissions(gm).canManageRoles) { + if (!$.discord.getPermissions(gm, guildRoles).canManageRoles) { ctx.status = 403 ctx.body = { err: 'cannot_manage_roles' } return @@ -98,36 +108,29 @@ module.exports = (R, $) => { R.patch('/api/servers/:server/roles', async ctx => { const { userId } = ctx.session 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 allowedRoles = await $.server.getAllowedRoles(server) - - const pred = r => $.discord.safeRole(server, r) && allowedRoles.indexOf(r) !== -1 - - if (added.length > 0) { - gm = await gm.addRoles(added.filter(pred)) + let gm = await getGm(server, userId) + if (!gm) { + ctx.status = 404 + return } - setTimeout(() => { - if (removed.length > 0) { - gm.removeRoles(removed.filter(pred)) - } - }, 1000) + const currentRoles = gm.rolesList + const allowedRoles = await $.server.getAllowedRoles(server) - // 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 } }) diff --git a/Server/index.js b/Server/index.js index f00b35e..760e296 100644 --- a/Server/index.js +++ b/Server/index.js @@ -81,7 +81,7 @@ async function start() { try { ctx.body = fs.readFileSync(path.join(pub, 'index.html'), { encoding: 'utf-8' }) } catch (e) { - ctx.body = "A problem occured." + ctx.body = 'A problem occured.' ctx.status = 500 console.error(e) } @@ -100,15 +100,14 @@ async function start() { } catch (e) { log.error(e) ctx.status = ctx.status || 500 - + if (DEVEL) { console.error(e) - } - + } + ctx.body = { err: 'something terrible happened.', } - } let timeElapsed = new Date() - timeStart diff --git a/Server/package-lock.json b/Server/package-lock.json index 3f3f5de..768032b 100644 --- a/Server/package-lock.json +++ b/Server/package-lock.json @@ -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": { - "version": "0.11.0", - "resolved": "https://registry.npmjs.org/@improbable-eng/grpc-web/-/grpc-web-0.11.0.tgz", - "integrity": "sha512-SS2YP6iHyZ7TSSuCShnSo9xJyUkNZHEhEPJpTSUcNoULe1LuLEk52OKHY+VW9XB0qXstejpHgZq2Hx+69PThiw==", + "version": "0.12.0", + "resolved": "https://registry.npmjs.org/@improbable-eng/grpc-web/-/grpc-web-0.12.0.tgz", + "integrity": "sha512-uJjgMPngreRTYPBuo6gswMj1gK39Wbqre/RgE0XnSDXJRg6ST7ZhuS53dFE6Vc2CX4jxgl+cO+0B3op8LA4Q0Q==", "requires": { "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": { "version": "0.0.9", "resolved": "https://registry.npmjs.org/@opencensus/core/-/core-0.0.9.tgz", @@ -277,12 +277,12 @@ } }, "@roleypoly/rpc": { - "version": "3.0.0-alpha.12", - "resolved": "https://registry.npmjs.org/@roleypoly/rpc/-/rpc-3.0.0-alpha.12.tgz", - "integrity": "sha512-Tl7G/yGF/3FmoF3GoYFZ2JdpSH7Fv5NGGbDB7KbVum+GOmnIoG7D8ETUb5Ge2YHpTYLoJSAmVhDGiuI8o3QC6A==", + "version": "1.5.0", + "resolved": "https://registry.npmjs.org/@roleypoly/rpc/-/rpc-1.5.0.tgz", + "integrity": "sha512-sbnEbiDHOAM0kJV5e6OE/1nirtjgDLlgngYLPnB3dvMefDo0o1BcT36aTm5TMn6Y1lX4ecjmfbeI37FOI7IEVQ==", "requires": { - "@improbable-eng/grpc-web": "0.11.0", - "google-protobuf": "3.10.0" + "@improbable-eng/grpc-web": "0.12.0", + "google-protobuf": "3.11.2" } }, "@types/color-name": { @@ -492,14 +492,6 @@ "resolved": "https://registry.npmjs.org/binary-extensions/-/binary-extensions-2.0.0.tgz", "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": { "version": "0.1.81", "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", "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": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/doctrine/-/doctrine-3.0.0.tgz", @@ -1065,14 +1045,6 @@ "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": { "version": "1.0.0", "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==" }, "google-protobuf": { - "version": "3.10.0", - "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.10.0.tgz", - "integrity": "sha512-d0cMO8TJ6xtB/WrVHCv5U81L2ulX+aCD58IljyAN6mHwdHHJ2jbcauX5glvivi3s3hx7EYEo7eUA9WftzamMnw==" + "version": "3.11.2", + "resolved": "https://registry.npmjs.org/google-protobuf/-/google-protobuf-3.11.2.tgz", + "integrity": "sha512-T4fin7lcYLUPj2ChUZ4DvfuuHtg3xi1621qeRZt2J7SvOQusOzq+sDT4vbotWTCjUXJoR36CA016LlhtPy80uQ==" }, "has": { "version": "1.0.3", @@ -2219,11 +2191,6 @@ "resolved": "https://registry.npmjs.org/log-driver/-/log-driver-1.2.7.tgz", "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": { "version": "5.1.1", "resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-5.1.1.tgz", @@ -2324,11 +2291,6 @@ "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": { "version": "1.4.0", "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", "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": { "version": "3.0.0", "resolved": "https://registry.npmjs.org/normalize-path/-/normalize-path-3.0.0.tgz", @@ -2827,11 +2784,6 @@ "integrity": "sha512-s7PoyDv/II1ObgQunCbB9PdLmUcBZcnWOcxDh7O0N/UwDEsHyqkW+Qh28jW+mVuCdx7gLB0BotYI1Y6uI9iyew==", "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": { "version": "2.0.1", "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", "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": { "version": "2.3.0", "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", "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": { "version": "0.3.2", "resolved": "https://registry.npmjs.org/type-check/-/type-check-0.3.2.tgz", @@ -3768,15 +3710,6 @@ "version": "1.2.1", "resolved": "https://registry.npmjs.org/ylru/-/ylru-1.2.1.tgz", "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" - } } } } diff --git a/Server/package.json b/Server/package.json index 5e60f90..6b00679 100644 --- a/Server/package.json +++ b/Server/package.json @@ -10,15 +10,14 @@ "pm2": "pm2" }, "dependencies": { - "@discordjs/uws": "^10.149.0", - "@roleypoly/rpc": "^3.0.0-alpha.12", + "@improbable-eng/grpc-web-node-http-transport": "^0.12.0", + "@roleypoly/rpc": "^1.5.0", "chalk": "^3.0.0", - "discord.js": "^11.5.1", "dotenv": "^8.2.0", - "erlpack": "github:discordapp/erlpack", "eslint": "^6.6.0", "eslint-config-standard": "^14.1.0", "glob": "^7.1.6", + "google-protobuf": "^3.11.2", "immutable": "^4.0.0-rc.12", "koa": "^2.11.0", "koa-better-router": "^2.1.1", @@ -35,8 +34,7 @@ "sequelize": "^5.21.2", "socket.io": "^2.3.0", "superagent": "^5.1.1", - "uuid": "^3.3.3", - "zucc": "^0.1.2" + "uuid": "^3.3.3" }, "devDependencies": { "prettier": "^1.19.1" diff --git a/Server/services/discord-rpc.js b/Server/services/discord-rpc.js deleted file mode 100644 index fb142d4..0000000 --- a/Server/services/discord-rpc.js +++ /dev/null @@ -1,4 +0,0 @@ -const Service = require('./Service') -const DiscordRPC = require('@roleypoly/rpc/discord') - -class DiscordRPCService extends Service {} diff --git a/Server/services/discord.js b/Server/services/discord.js index d6ca528..b6edcf4 100644 --- a/Server/services/discord.js +++ b/Server/services/discord.js @@ -1,6 +1,10 @@ const Service = require('./Service') -const discord = require('discord.js') 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 { constructor(ctx) { @@ -12,32 +16,55 @@ class DiscordService extends Service { this.oauthCallback = process.env.OAUTH_AUTH_CALLBACK this.botCallback = `${ctx.config.appUrl}/api/oauth/bot/callback` this.appUrl = process.env.APP_URL - this.isBot = process.env.IS_BOT === 'true' || false this.rootUsers = new Set((process.env.ROOT_USERS || '').split(',')) - this.client = new discord.Client() - this.client.options.disableEveryone = true + this.rpcAddr = process.env.DISCORD_SVC_ADDR + 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) { - 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 { - id, - nickname, - displayHexColor, - __faked: true, - roles: { - has() { - return false - }, + guildID: guildID, + roles: [], + nick: nickname, + user: { + ID: id, + username: nickname, + discriminator: '0000', + avatar: '', + bot: false, }, + displayHexColor: 0, } } @@ -45,50 +72,94 @@ class DiscordService extends Service { return this.rootUsers.has(id) } - async startBot() { - await this.client.login(this.botToken) + async getRelevantServers(userId) { + return this.cacheCurry(`grs:${userId}`, async () => { + const q = new IDQuery() + q.setMemberid('' + userId) - // not all roleypolys are bots. - if (this.isBot) { - this.log.info('this roleypoly is a bot') - 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)) + const guilds = await this.rpc.getGuildsByMember(q, this.sharedHeaders) + this.syncGuilds(guilds.toObject().guildsList) + return guilds.toObject().guildsList + }) } 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) { - return this.client.guilds.get(server).roles + getRoles(serverId) { + 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) { - if (this.isRoot(gm.id)) { + getPermissions(gm, guildRoles) { + if (this.isRoot(gm.user.id)) { return { isAdmin: 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 { - isAdmin: gm.permissions.hasPermission('ADMINISTRATOR'), - canManageRoles: gm.permissions.hasPermission('MANAGE_ROLES', false, true), + isAdmin, + canManageRoles, } } - safeRole(server, role) { - const r = this.getRoles(server).get(role) - return r.editable && !r.hasPermission('MANAGE_ROLES', false, true) + getServer(serverId) { + return this.cacheCurry(`g:${serverId}`, async () => { + 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 @@ -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 // we only need IDENTIFY because we only use it for matching IDs from the bot getAuthUrl(state) { @@ -162,97 +211,20 @@ class DiscordService extends Service { return `https://discordapp.com/oauth2/authorize?client_id=${this.clientId}&scope=bot&permissions=268435456` } - mentionResponse(message) { - message.channel.send( - `🔰 Assign your roles here! <${this.appUrl}/s/${message.guild.id}>`, - { disableEveryone: true } - ) + async syncGuilds(guilds) { + guilds.forEach(guild => this.ctx.server.ensure(guild)) } - _cmds() { - const cmds = [ - { - 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 - } - } + async cacheCurry(key, func) { + if (this.cache.has(key)) { + return this.cache.get(key) } - // nothing matched? - this.mentionResponse(message) - } + const returnVal = await func() - handleMessage(message) { - if (message.author.bot && message.channel.type !== 'text') { - // drop bot messages and dms - return - } + this.cache.set(key, returnVal) - if (message.mentions.users.has(this.client.user.id)) { - if (this.rootUsers.has(message.author.id)) { - this.handleCommand(message) - } else { - this.mentionResponse(message) - } - } - } - - async handleJoin(guild) { - await this.ctx.server.ensure(guild) + return returnVal } } diff --git a/Server/services/presentation.js b/Server/services/presentation.js index 28d3390..9e8b51c 100644 --- a/Server/services/presentation.js +++ b/Server/services/presentation.js @@ -1,5 +1,6 @@ const Service = require('./Service') const LRU = require('lru-cache') +const { Role } = require('@roleypoly/rpc/shared') class PresentationService extends Service { constructor(ctx) { @@ -7,7 +8,10 @@ class PresentationService extends Service { this.M = ctx.M 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) { @@ -19,58 +23,56 @@ class PresentationService extends Service { } } - async oldPresentableServers(collection, userId) { - let servers = [] + presentableServers(userId) { + return this.cacheCurry(`pss:${userId}`, async () => { + const servers = await this.discord.getRelevantServers(userId) + const transformedServers = [] - for (let server of collection.array()) { - const gm = server.members.get(userId) + for (let server of servers) { + 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 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 + return transformedServers }) } - async presentableServer(server, gm, { incRoles = true } = {}) { - const sd = await this.ctx.server.get(server.id) + presentableServer(server, member) { + 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 { - id: server.id, - gm: { - nickname: gm.nickname, - color: gm.displayHexColor, - }, - server: this.serverSlug(server), - roles: incRoles - ? (await this.rolesByServer(server, sd)).map(r => ({ - ...r, - selected: gm.roles.has(r.id), - })) - : [], - message: sd.message, - categories: sd.categories, - perms: this.discord.getPermissions(gm), - } + const color = memberRoles.length > 0 ? memberRoles[0].color : 0 + + return { + id: server.id, + gm: { + ...member, + color, + }, + server: server, + roles: serverRoles, + message: serverData.message, + categories: serverData.categories, + perms: this.discord.getPermissions(member, serverRoles), + } + }) } - async rolesByServer(server) { - return server.roles - .filter(r => r.id !== server.id) // get rid of @everyone - .map(r => ({ - id: r.id, - color: r.color, - name: r.name, - position: r.position, - safe: this.discord.safeRole(server.id, r.id), - })) + async cacheCurry(key, func) { + if (this.cache.has(key)) { + return this.cache.get(key) + } + + const returnVal = await func() + + this.cache.set(key, returnVal) + + return returnVal } } diff --git a/UI/src/components/role-editor/index.js b/UI/src/components/role-editor/index.js index dc9075d..44ac1da 100644 --- a/UI/src/components/role-editor/index.js +++ b/UI/src/components/role-editor/index.js @@ -58,7 +58,6 @@ class RoleEditor extends Component { dropRole = (category, name) => ({ role, category }) => { const { dispatch } = this.props - console.log(role) dispatch(Actions.addRoleToCategory(name, category, role)) } diff --git a/UI/src/components/role-picker/Category.js b/UI/src/components/role-picker/Category.js index 62d9ce6..2ae47cc 100644 --- a/UI/src/components/role-picker/Category.js +++ b/UI/src/components/role-picker/Category.js @@ -26,7 +26,6 @@ class Category extends Component { case 'multi': return this.toggleRoleMulti(id, next) default: - console.warn('DEFAULTING TO MULTI', id, next, old) return this.toggleRoleMulti(id, next) } } @@ -54,7 +53,7 @@ class Category extends Component { diff --git a/UI/src/components/role-picker/actions.js b/UI/src/components/role-picker/actions.js index 13d6c91..81aef75 100644 --- a/UI/src/components/role-picker/actions.js +++ b/UI/src/components/role-picker/actions.js @@ -17,13 +17,14 @@ export const setup = id => async dispatch => { } export const getViewMap = server => { + const gmRoles = server.get('gm').get('rolesList') const roles = server.get('roles') const categories = server.get('categories') const categoriesIds = server.get('categories').keySeq() const allRoles = server .get('roles') - .filter(v => v.get('safe')) + .filter(v => v.get('safety') === 0) .map(r => r.get('id')) .toSet() const accountedRoles = categories @@ -32,8 +33,6 @@ export const getViewMap = server => { .flatten() const unaccountedRoles = allRoles.subtract(accountedRoles) - // console.log('roles', allRoles.toJS(), accountedRoles.toJS(), unaccountedRoles.toJS()) - const viewMap = categories .set( 'Uncategorized', @@ -67,7 +66,7 @@ export const getViewMap = server => { }) 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() ) diff --git a/UI/src/components/role-picker/index.js b/UI/src/components/role-picker/index.js index fc04a06..c70479a 100644 --- a/UI/src/components/role-picker/index.js +++ b/UI/src/components/role-picker/index.js @@ -73,8 +73,6 @@ class RolePicker extends Component { const msg = server.get('message') const msgBuffer = this.props.data.get('messageBuffer') - console.log(msg, roleManager, isEditing, this.props.data.toJS()) - if (!roleManager && msg !== '') { return (
diff --git a/UI/src/components/role/index.js b/UI/src/components/role/index.js index f0a231b..11e3ea7 100644 --- a/UI/src/components/role/index.js +++ b/UI/src/components/role/index.js @@ -18,8 +18,6 @@ class Role extends Component { let { role, selected, disabled, type, isDragging } = this.props type = type || 'button' - // console.log(this.props) - let color = Color(role.get('color')) if (color.rgbNumber() === 0) { diff --git a/UI/src/components/servers/Navigation.js b/UI/src/components/servers/Navigation.js index 15278e0..cca2db3 100644 --- a/UI/src/components/servers/Navigation.js +++ b/UI/src/components/servers/Navigation.js @@ -14,7 +14,6 @@ class ServersNavigation extends Component { } render() { - // console.log(this.props.servers) return ( diff --git a/UI/src/components/servers/ServerCard.js b/UI/src/components/servers/ServerCard.js index a5702bc..0a66582 100644 --- a/UI/src/components/servers/ServerCard.js +++ b/UI/src/components/servers/ServerCard.js @@ -14,8 +14,6 @@ class ServerCard extends Component { let icon = '' - console.log(__filename, server) - const s = server.get('server') const gm = server.get('gm') const perms = server.get('perms') diff --git a/UI/src/components/servers/ServerLanding.js b/UI/src/components/servers/ServerLanding.js index 65f6eda..392ad8c 100644 --- a/UI/src/components/servers/ServerLanding.js +++ b/UI/src/components/servers/ServerLanding.js @@ -10,8 +10,6 @@ export default class ServerLanding extends Component { } async componentDidMount() { - console.log(this.props) - try { const rsp = await superagent.get( `/api/server/${this.props.match.params.server}/slug` diff --git a/UI/src/components/servers/UserCard.js b/UI/src/components/servers/UserCard.js index 05a53ee..b4dcad8 100644 --- a/UI/src/components/servers/UserCard.js +++ b/UI/src/components/servers/UserCard.js @@ -25,8 +25,6 @@ class UserCard extends Component { render() { const { user } = this.props - // console.log(this.props) - return (
diff --git a/UI/src/components/servers/index.js b/UI/src/components/servers/index.js index 22ba26b..5c05edd 100644 --- a/UI/src/components/servers/index.js +++ b/UI/src/components/servers/index.js @@ -10,8 +10,6 @@ import RolePicker from '../role-picker' import './index.sass' import Navigation from './Navigation' -// import mockData from './mockData' - const mapState = ({ servers, user, appState }) => { return { servers, @@ -22,8 +20,6 @@ const mapState = ({ servers, user, appState }) => { class Servers extends Component { get defaultPath() { - console.log(this.props.servers.toJS()) - const first = this.props.servers.first() if (first != null) { return first.get('id')