roleypoly/v1
1
0
Fork 0
mirror of https://github.com/roleypoly/roleypoly-v1.git synced 2025-06-15 01:49:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat(api/servers): re-add transactionally based role edits

Browse source
This commit is contained in:
41666 2020-05-07 20:38:35 -04:00
parent b91aaa9c43
commit 690671317f
No known key found for this signature in database
GPG key ID: BC51D07640DC10AF
2 changed files with 56 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Server/services/discord.js
View file

@ -1,6 +1,6 @@
const Service = require('./Service')
const superagent = require('superagent')
const { DiscordClient, Member } = require('@roleypoly/rpc/discord')
const { DiscordClient, Member, RoleTransaction, TxDelta } = 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')
@ -34,7 +34,7 @@ class DiscordService extends Service {
this.bootstrapRetries = 0
this.bootstrapRetriesMax = 10
this.bootstrap().catch(e => {
this.bootstrap().catch((e) => {
console.error(`bootstrap failure`, e)
process.exit(-1)
})
@ -44,7 +44,7 @@ class DiscordService extends Service {
try {
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)
} catch (e) {
@ -112,7 +112,7 @@ class DiscordService extends Service {
q.setGuildid(serverId)
const roles = await this.rpc.getGuildRoles(q, this.sharedHeaders)
return roles.toObject().rolesList.filter(role => role.id !== serverId)
return roles.toObject().rolesList.filter((role) => role.id !== serverId)
})
}
@ -124,11 +124,11 @@ class DiscordService extends Service {
}
}
const matchFor = permissionInt =>
const matchFor = (permissionInt) =>
!!gm.rolesList
.map(id => guildRoles.find(role => role.id === id))
.filter(x => !!x)
.find(role => (role.permissions & permissionInt) === permissionInt)
.map((id) => guildRoles.find((role) => role.id === id))
.filter((x) => !!x)
.find((role) => (role.permissions & permissionInt) === permissionInt)
const isAdmin = guild.ownerid === gm.user.id || matchFor(0x00000008)
const canManageRoles = isAdmin || matchFor(0x10000000)
@ -155,6 +155,34 @@ class DiscordService extends Service {
await this.rpc.updateMember(member, this.sharedHeaders)
}
async updateRolesTx(memberObj, { added, removed }) {
const roleTx = new RoleTransaction()
roleTx.setMember(this.memberToQueryProto(memberObj))
for (let toAdd of added) {
const delta = new TxDelta()
delta.setAction(TxDelta.Action.ADD)
delta.setRole(toAdd)
roleTx.addDelta(delta)
}
for (let toRemove of removed) {
const delta = new TxDelta()
delta.setAction(TxDelta.Action.REMOVE)
delta.setRole(toRemove)
roleTx.addDelta(delta)
}
await this.rpc.updateMemberRoles(roleTx, this.sharedHeaders)
}
memberToQueryProto(member) {
const query = new IDQuery()
query.setGuildid(member.guildid)
query.setMemberid(member.user.id)
return query
}
memberToProto(member) {
const memberProto = new Member()
memberProto.setGuildid(member.guildid)
@ -224,7 +252,7 @@ class DiscordService extends Service {
}
async syncGuilds(guilds) {
guilds.forEach(guild => this.ctx.server.ensure(guild))
guilds.forEach((guild) => this.ctx.server.ensure(guild))
}
async cacheCurry(key, func) {