MS/ds-bot
1
0
Fork 0
mirror of https://gitlab.edgegamers.io/discord/ds-bot.git synced 2025-12-05 22:00:26 -08:00
Code Issues Packages Projects Releases Wiki Activity

Fix VC permissions

Browse Source
This commit is contained in:
MSWS
2023-04-13 17:43:51 -07:00
parent d5aec4e6bb
commit 64384c3499
6 changed files with 160 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -1,4 +1,6 @@
node_modules/
dist/
*.js
config.json
config.json
data/
.env

51
package-lock.json generated
View File

@@ -13,6 +13,7 @@
"devDependencies": {
"@types/node": "^18.15.11",
"@typescript-eslint/eslint-plugin": "^5.57.1",
"dotenv": "^16.0.3",
"eslint": "^8.37.0",
"eslint-plugin-jsdoc": "^40.1.2",
"typescript": "^5.0.3"
@@ -529,6 +530,7 @@
"version": "4.3.0",
"resolved": "https://registry.npmjs.org/ansi-styles/-/ansi-styles-4.3.0.tgz",
"integrity": "sha512-zbB9rCJAT1rbjiVDb2hqKFHNYLxgtk8NURxZ3IZwD3F6NtxbXZQCnnSi1Lkx+IDohdPlFp222wVALIheZJQSEg==",
"dev": true,
"dependencies": {
"color-convert": "^2.0.1"
},
@@ -557,7 +559,8 @@
"node_modules/balanced-match": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/balanced-match/-/balanced-match-1.0.2.tgz",
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw=="
"integrity": "sha512-3oSeUO0TMV67hN1AmbXsK4yaqU7tjiHlbxRDZOpH0KW9+CeX4bRAaX0Anxt0tx2MrpRpWwQaPwIlISEJhYU5Pw==",
"dev": true
},
"node_modules/base64url": {
"version": "3.0.1",
@@ -571,6 +574,7 @@
"version": "1.1.11",
"resolved": "https://registry.npmjs.org/brace-expansion/-/brace-expansion-1.1.11.tgz",
"integrity": "sha512-iCuPHDFgrHX7H2vEI/5xpz07zSHB00TpugqhmYtVmMO6518mCuRMoOYFldEBl0g187ufozdaHgWKcYFb61qGiA==",
"dev": true,
"dependencies": {
"balanced-match": "^1.0.0",
"concat-map": "0.0.1"
@@ -612,6 +616,7 @@
"version": "4.1.2",
"resolved": "https://registry.npmjs.org/chalk/-/chalk-4.1.2.tgz",
"integrity": "sha512-oKnbhFyRIXpUuez8iBMmyEa4nbj4IOQyuhc/wy9kY7/WVPcwIO9VA668Pu8RkO7+0G76SLROeyw9CpQ061i4mA==",
"dev": true,
"dependencies": {
"ansi-styles": "^4.1.0",
"supports-color": "^7.1.0"
@@ -627,6 +632,7 @@
"version": "2.0.1",
"resolved": "https://registry.npmjs.org/color-convert/-/color-convert-2.0.1.tgz",
"integrity": "sha512-RRECPsj7iu/xb5oKYcsFHSppFNnsj/52OVTRKb4zP5onXwVF3zVmmToNcOfGC+CRDpfK/U584fMg38ZHCaElKQ==",
"dev": true,
"dependencies": {
"color-name": "~1.1.4"
},
@@ -637,7 +643,8 @@
"node_modules/color-name": {
"version": "1.1.4",
"resolved": "https://registry.npmjs.org/color-name/-/color-name-1.1.4.tgz",
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA=="
"integrity": "sha512-dOy+3AuW3a2wNbZHIuMZpTcgjGuLU/uBL/ubcZF9OXbDo8ff4O8yVp5Bf0efS8uEoYo5q4Fx7dY9OgQGXgAsQA==",
"dev": true
},
"node_modules/comment-parser": {
"version": "1.3.1",
@@ -651,7 +658,8 @@
"node_modules/concat-map": {
"version": "0.0.1",
"resolved": "https://registry.npmjs.org/concat-map/-/concat-map-0.0.1.tgz",
"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg=="
"integrity": "sha512-/Srv4dswyQNBfohGpz9o6Yb3Gz3SrUDqBH5rTuhGR7ahtlbYKnVxw2bCFMRljaA7EXHaXZ8wsHdodFvbkhKmqg==",
"dev": true
},
"node_modules/cross-spawn": {
"version": "7.0.3",
@@ -750,6 +758,15 @@
"node": ">=6.0.0"
}
},
"node_modules/dotenv": {
"version": "16.0.3",
"resolved": "https://registry.npmjs.org/dotenv/-/dotenv-16.0.3.tgz",
"integrity": "sha512-7GO6HghkA5fYG9TYnNxi14/7K9f5occMlp3zXAuSxn7CKCxt9xbNWG7yF8hTCSUchlfWSe3uLmlPfigevRItzQ==",
"dev": true,
"engines": {
"node": ">=12"
}
},
"node_modules/escape-string-regexp": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/escape-string-regexp/-/escape-string-regexp-4.0.0.tgz",
@@ -1129,12 +1146,14 @@
"node_modules/fs.realpath": {
"version": "1.0.0",
"resolved": "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz",
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw=="
"integrity": "sha512-OO0pH2lK6a0hZnAdau5ItzHPI6pUlvI7jMVnxUQRtw4owF2wk8lOSabtGDCTP4Ggrg2MbGnWO9X8K1t4+fGMDw==",
"dev": true
},
"node_modules/glob": {
"version": "7.2.3",
"resolved": "https://registry.npmjs.org/glob/-/glob-7.2.3.tgz",
"integrity": "sha512-nFR0zLpU2YCaRxwoCJvL6UvCH2JFyFVIvwTLsIf21AuHlMskA1hhTdk+LlYJtOlYt9v6dvszD2BGRqBL+iQK9Q==",
"dev": true,
"dependencies": {
"fs.realpath": "^1.0.0",
"inflight": "^1.0.4",
@@ -1207,6 +1226,7 @@
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/has-flag/-/has-flag-4.0.0.tgz",
"integrity": "sha512-EykJT/Q1KjTWctppgIAgfSO0tKVuZUjhgMr17kqTumMl6Afv3EISleU7qZUzoXDFTAHTDC4NOoG/ZxU3EvlMPQ==",
"dev": true,
"engines": {
"node": ">=8"
}
@@ -1273,6 +1293,7 @@
"version": "1.0.6",
"resolved": "https://registry.npmjs.org/inflight/-/inflight-1.0.6.tgz",
"integrity": "sha512-k92I/b08q4wvFscXCLvqfsHCrjrF7yiXsQuIVvVE7N82W3+aqpzuUdBbfhWcy/FZR3/4IgflMgKLOsvPDrGCJA==",
"dev": true,
"dependencies": {
"once": "^1.3.0",
"wrappy": "1"
@@ -1333,7 +1354,8 @@
"node_modules/isexe": {
"version": "2.0.0",
"resolved": "https://registry.npmjs.org/isexe/-/isexe-2.0.0.tgz",
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw=="
"integrity": "sha512-RHxMLp9lnKHGHRng9QFhRCMbYAcVpn69smSGcq3f36xjgVVWThj4qqLbTLlq7Ssj8B+fIQ1EuCEGI2lKsyQeIw==",
"dev": true
},
"node_modules/js-sdsl": {
"version": "4.4.0",
@@ -1426,6 +1448,7 @@
"version": "6.0.0",
"resolved": "https://registry.npmjs.org/lru-cache/-/lru-cache-6.0.0.tgz",
"integrity": "sha512-Jo6dJ04CmSjuznwJSS3pUeWmd/H0ffTlkXXgwZi+eq1UCmqQwCh+eLsYOYCwY991i2Fah4h1BEMCx4qThGbsiA==",
"dev": true,
"dependencies": {
"yallist": "^4.0.0"
},
@@ -1459,6 +1482,7 @@
"version": "3.1.2",
"resolved": "https://registry.npmjs.org/minimatch/-/minimatch-3.1.2.tgz",
"integrity": "sha512-J7p63hRiAjw1NDEww1W7i37+ByIrOWO5XQQAzZ3VOcL0PNybwpfmV/N05zFAzwQ9USyEcX6t3UO+K5aqBQOIHw==",
"dev": true,
"dependencies": {
"brace-expansion": "^1.1.7"
},
@@ -1469,7 +1493,8 @@
"node_modules/ms": {
"version": "2.1.2",
"resolved": "https://registry.npmjs.org/ms/-/ms-2.1.2.tgz",
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w=="
"integrity": "sha512-sGkPx+VjMtmA6MX27oA4FBFELFCZZ4S4XqeGOXCv68tT+jb3vk/RyaKWP0PTKyWtmLSM0b+adUTEvbs1PEaH2w==",
"dev": true
},
"node_modules/natural-compare": {
"version": "1.4.0",
@@ -4248,6 +4273,7 @@
"version": "1.4.0",
"resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
"integrity": "sha512-lNaJgI+2Q5URQBkccEKHTQOPaXdUxnZZElQTZY0MFUAuaEqe1E+Nyvgdz/aIyNi6Z9MzO5dv1H8n58/GELp3+w==",
"dev": true,
"dependencies": {
"wrappy": "1"
}
@@ -4324,6 +4350,7 @@
"version": "1.0.1",
"resolved": "https://registry.npmjs.org/path-is-absolute/-/path-is-absolute-1.0.1.tgz",
"integrity": "sha512-AVbw3UJ2e9bq64vSaS9Am0fje1Pa8pbGqTTsmXfaIiMpnr5DlDhfJOuLj9Sf95ZPVDAUerDfEk88MPmPe7UCQg==",
"dev": true,
"engines": {
"node": ">=0.10.0"
}
@@ -4516,6 +4543,7 @@
"version": "7.4.0",
"resolved": "https://registry.npmjs.org/semver/-/semver-7.4.0.tgz",
"integrity": "sha512-RgOxM8Mw+7Zus0+zcLEUn8+JfoLpj/huFTItQy2hsM4khuC1HYRDp0cU482Ewn/Fcy6bCjufD8vAj7voC66KQw==",
"dev": true,
"dependencies": {
"lru-cache": "^6.0.0"
},
@@ -4638,6 +4666,7 @@
"version": "7.2.0",
"resolved": "https://registry.npmjs.org/supports-color/-/supports-color-7.2.0.tgz",
"integrity": "sha512-qpCAvRl9stuOHveKsn7HncJRvv501qIacKzQlO/+Lwxc9+0q2wLyv4Dfvt80/DPn2pqOBsJdDiogXGR9+OvwRw==",
"dev": true,
"dependencies": {
"has-flag": "^4.0.0"
},
@@ -4648,7 +4677,8 @@
"node_modules/text-table": {
"version": "0.2.0",
"resolved": "https://registry.npmjs.org/text-table/-/text-table-0.2.0.tgz",
"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw=="
"integrity": "sha512-N+8UisAXDGk8PFXP4HAzVR9nbfmVJ3zYLAWiTIoqC5v5isinhr+r5uaO8+7r3BMfuNIufIsA7RdpVgacC2cSpw==",
"dev": true
},
"node_modules/to-regex-range": {
"version": "5.0.1",
@@ -4782,6 +4812,7 @@
"version": "2.0.2",
"resolved": "https://registry.npmjs.org/which/-/which-2.0.2.tgz",
"integrity": "sha512-BLI3Tl1TW3Pvl70l3yq3Y64i+awpwXqsGBYWkkqMtnbXgrMD+yj7rhW0kuEDxzJaYXGjEW5ogapKNMEKNMjibA==",
"dev": true,
"dependencies": {
"isexe": "^2.0.0"
},
@@ -4804,7 +4835,8 @@
"node_modules/wrappy": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ=="
"integrity": "sha512-l4Sp/DRseor9wL6EvV2+TuQn63dMkPjZ/sp9XkghTEbV9KlPS1xUsZ3u7/IQO4wxtcFB4bgpQPRcR3QCvezPcQ==",
"dev": true
},
"node_modules/ws": {
"version": "8.13.0",
@@ -4829,7 +4861,8 @@
"node_modules/yallist": {
"version": "4.0.0",
"resolved": "https://registry.npmjs.org/yallist/-/yallist-4.0.0.tgz",
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A=="
"integrity": "sha512-3wdGidZyq5PB084XLES5TpOSRA3wjXAlIWMhum2kRcv/41Sn2emQ0dycQW4uZXLejwKvg6EsvbdlVL+FYEct7A==",
"dev": true
},
"node_modules/yocto-queue": {
"version": "0.1.0",

1
package.json
View File

@@ -7,6 +7,7 @@
"devDependencies": {
"@types/node": "^18.15.11",
"@typescript-eslint/eslint-plugin": "^5.57.1",
"dotenv": "^16.0.3",
"eslint": "^8.37.0",
"eslint-plugin-jsdoc": "^40.1.2",
"typescript": "^5.0.3"

2
src/index.ts
View File

@@ -1,3 +1,5 @@
import { Bot } from "./Bot";
import * as dotenv from "dotenv";
dotenv.config();
new Bot();

27
src/modules/DSVoice.ts
View File

@@ -202,30 +202,33 @@ export class DSVoice extends Module {
const flags: PermissionResolvable[] = ["ViewChannel", "Connect", "Speak", "UseVAD"];
const muted: PermissionResolvable[] = ["Speak"];
const gagged: PermissionResolvable[] = ["SendMessages", "SendMessagesInThreads", "SendTTSMessages"];
const all = PermissionsBitField.All;
const all = new PermissionsBitField(PermissionsBitField.All);
all.remove("ViewChannel");
switch (channel.mode) {
case VoiceChannelMode.PUBLIC:
perms.grantAccess(flags, "@everyone");
await perms.grantAccess(flags, "@everyone");
break;
case VoiceChannelMode.WHITELIST:
perms.blockAccess(all, "@everyone");
perms.grantAccess(flags, channel.user, ...channel.whitelist, ...leRoles);
await perms.blockAccess(all, "@everyone");
await perms.grantAccess(flags, channel.user, ...channel.whitelist, ...leRoles);
break;
case VoiceChannelMode.BLACKLIST:
perms.grantAccess(flags, "@everyone");
perms.blockAccess(all, ...channel.blacklist);
await perms.grantAccess(flags, "@everyone");
await perms.blockAccess(all, ...channel.blacklist);
break;
case VoiceChannelMode.LOCKED:
perms.blockAccess(all, "@everyone");
await perms.blockAccess("Connect", "@everyone");
break;
default:
throw new Error("Invalid mode: " + channel.mode);
}
perms.blockAccess(muted, ...channel.muted);
perms.blockAccess(gagged, ...channel.gagged);
if (!channel.hidden)
perms.grantAccess(["ViewChannel"], "@everyone");
perms.grantAccess(flags, channel.user, ...leRoles);
if (channel.hidden)
await perms.blockAccess("ViewChannel", "@everyone");
else
await perms.grantAccess("ViewChannel", "@everyone");
await perms.blockAccess(muted, ...channel.muted);
await perms.blockAccess(gagged, ...channel.gagged);
await perms.grantAccess(flags, channel.user, ...leRoles);
permManager.applyPermissions(perms.permissions, guildChannel);
}
}

126
src/modules/PermissionsManager.ts
View File

@@ -1,4 +1,4 @@
import { Guild, GuildChannel, OverwriteResolvable, OverwriteType, PermissionResolvable } from "discord.js";
import { Guild, GuildChannel, OverwriteResolvable, OverwriteType, PermissionResolvable, PermissionsBitField } from "discord.js";
import { DSBot } from "../api/DSBot";
import { Module } from "../api/Module";
import { GuildedConfigEntry } from "../api/data/Config";
@@ -26,6 +26,8 @@ export class PermissionsManager extends Module {
}
async applyPermissions(perms: OverwriteResolvable[], channel: GuildChannel) {
console.log(`Applying permissions to ${channel.name} in ${channel.guild.name}`);
console.log(perms);
channel.permissionOverwrites.set(perms);
}
}
@@ -57,50 +59,116 @@ export interface PermissionsEntry {
export class PermissionBuilder {
permissions: OverwriteResolvable[] = [];
guild: Guild;
knownRoles: string[] = [];
constructor(guild: Guild) {
this.guild = guild;
}
grantAccess(flags: PermissionResolvable[], ...members: string[]): PermissionBuilder {
async grantAccess(flags: PermissionResolvable, ...members: string[]): Promise<PermissionBuilder> {
processRoleList(this.guild, members);
const promises = [];
const newPermissions: OverwriteResolvable[] = [];
for (const member of members) {
if (this.guild.roles.cache.has(member)) {
this.permissions.push({
id: member,
allow: flags,
type: OverwriteType.Role
});
} else {
this.permissions.push({
id: member,
allow: flags,
type: OverwriteType.Member
});
}
promises.push(async () => {
if (await this.isUser(member)) {
newPermissions.push({
id: member,
allow: flags,
type: OverwriteType.Member
});
} else {
newPermissions.push({
id: member,
allow: flags,
type: OverwriteType.Role
});
}
});
}
await Promise.all(promises.map((f) => f()));
this.permissions = this.mergeDiscordPermissions(this.permissions, newPermissions);
return this;
}
blockAccess(flags: PermissionResolvable, ...members: string[]): PermissionBuilder {
async blockAccess(flags: PermissionResolvable, ...members: string[]): Promise<PermissionBuilder> {
processRoleList(this.guild, members);
const promises = [];
const newPermissions: OverwriteResolvable[] = [];
for (const member of members) {
if (this.guild.roles.cache.has(member)) {
this.permissions.push({
id: member,
deny: flags,
type: OverwriteType.Role
});
} else {
this.permissions.push({
id: member,
deny: flags,
type: OverwriteType.Member
});
}
promises.push(async () => {
if (await this.isUser(member)) {
newPermissions.push({
id: member,
deny: flags,
type: OverwriteType.Member
});
} else {
newPermissions.push({
id: member,
deny: flags,
type: OverwriteType.Role
});
}
});
}
await Promise.all(promises.map((f) => f()));
this.permissions = this.mergeDiscordPermissions(this.permissions, newPermissions);
return this;
}
async isUser(member: string): Promise<boolean> {
if (this.knownRoles.includes(member))
return false;
if (this.guild.roles.cache.has(member)) {
this.knownRoles.push(member);
return false;
}
if (this.guild.members.cache.has(member))
return true;
const user = await this.guild.members.fetch(member);
return !user;
}
mergeDiscordPermissions(
oldPerms: OverwriteResolvable[],
newPerms: OverwriteResolvable[]
): OverwriteResolvable[] {
const result: Record<string, OverwriteResolvable> = {};
// Loop through permissions1 and add them to the result object
for (let i = 0; i < oldPerms.length; i++) {
const oldPerm = oldPerms[i];
const { allow, deny, type } = oldPerm;
const id = oldPerm.id.toString();
if (!result[id])
result[id] = { id, allow: [], deny: [], type };
if (allow)
result[id].allow = new PermissionsBitField(result[id].allow).add(allow);
if (deny)
result[id].deny = new PermissionsBitField(result[id].allow).add(deny);
}
for (let i = 0; i < newPerms.length; i++) {
const newPerm = newPerms[i];
const { allow, deny, type } = newPerm;
const id = newPerm.id.toString();
if (!result[id])
result[id] = { id, allow: [], deny: [], type };
if (allow)
result[id].allow = new PermissionsBitField(result[id].allow).add(allow);
if (deny)
result[id].deny = new PermissionsBitField(result[id].allow).add(deny);
}
// Convert the result object back to an array
return Object.values(result);
}
}
/**