Skip to content

Commit 1c52fd9

Browse files
committed
Revert "Change voice permissions (#167)"
This reverts commit 02039e3.
1 parent 02039e3 commit 1c52fd9

1 file changed

Lines changed: 23 additions & 21 deletions

File tree

src/modules/tccpp/components/permissions-manager.ts

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -70,14 +70,7 @@ export default class PermissionManager extends BotComponent {
7070
deny: [Discord.PermissionsBitField.Flags.EmbedLinks, Discord.PermissionsBitField.Flags.AttachFiles],
7171
},
7272
[this.wheatley.roles.moderators.id]: {
73-
allow: [
74-
Discord.PermissionsBitField.Flags.ViewChannel,
75-
Discord.PermissionsBitField.Flags.ManageThreads,
76-
Discord.PermissionsBitField.Flags.Connect,
77-
Discord.PermissionsBitField.Flags.Speak,
78-
Discord.PermissionsBitField.Flags.Stream,
79-
SET_VOICE_STATUS_PERMISSION_BIT,
80-
],
73+
allow: [Discord.PermissionsBitField.Flags.ManageThreads, Discord.PermissionsBitField.Flags.ViewChannel],
8174
},
8275
};
8376
const off_topic_permissions: permission_overwrites = {
@@ -118,26 +111,32 @@ export default class PermissionManager extends BotComponent {
118111
],
119112
},
120113
};
121-
const acive_voice_permissions = [
122-
Discord.PermissionsBitField.Flags.Speak,
123-
Discord.PermissionsBitField.Flags.Stream,
124-
];
125114
const voice_permissions: permission_overwrites = {
126115
...default_permissions,
127116
[this.wheatley.guild.roles.everyone.id]: {
128-
deny: [...acive_voice_permissions, SET_VOICE_STATUS_PERMISSION_BIT],
117+
deny: [SET_VOICE_STATUS_PERMISSION_BIT],
129118
},
130-
[this.wheatley.roles.voice.id]: { allow: acive_voice_permissions },
131-
[this.wheatley.skill_roles.intermediate.id]: { allow: acive_voice_permissions },
132-
[this.wheatley.skill_roles.proficient.id]: { allow: acive_voice_permissions },
133-
[this.wheatley.skill_roles.advanced.id]: { allow: acive_voice_permissions },
134-
[this.wheatley.skill_roles.expert.id]: { allow: acive_voice_permissions },
135-
[this.wheatley.roles.server_booster.id]: { allow: acive_voice_permissions },
136119
[this.wheatley.roles.no_voice.id]: no_interaction_at_all,
137120
[this.wheatley.roles.no_off_topic.id]: no_interaction_at_all,
138-
[this.wheatley.roles.voice_deputy.id]: {
139-
allow: [...acive_voice_permissions, SET_VOICE_STATUS_PERMISSION_BIT],
121+
[this.wheatley.roles.moderators.id]: {
122+
allow: [
123+
Discord.PermissionsBitField.Flags.ViewChannel,
124+
Discord.PermissionsBitField.Flags.Connect,
125+
SET_VOICE_STATUS_PERMISSION_BIT,
126+
],
127+
},
128+
};
129+
const member_voice_channel: permission_overwrites = {
130+
...voice_permissions,
131+
[this.wheatley.guild.roles.everyone.id]: {
132+
deny: [Discord.PermissionsBitField.Flags.ViewChannel, SET_VOICE_STATUS_PERMISSION_BIT],
140133
},
134+
[this.wheatley.roles.voice_deputy.id]: { allow: [Discord.PermissionsBitField.Flags.ViewChannel] },
135+
[this.wheatley.skill_roles.intermediate.id]: { allow: [Discord.PermissionsBitField.Flags.ViewChannel] },
136+
[this.wheatley.skill_roles.proficient.id]: { allow: [Discord.PermissionsBitField.Flags.ViewChannel] },
137+
[this.wheatley.skill_roles.advanced.id]: { allow: [Discord.PermissionsBitField.Flags.ViewChannel] },
138+
[this.wheatley.skill_roles.expert.id]: { allow: [Discord.PermissionsBitField.Flags.ViewChannel] },
139+
[this.wheatley.roles.server_booster.id]: { allow: [Discord.PermissionsBitField.Flags.ViewChannel] },
141140
};
142141
const mod_only_channel: permission_overwrites = {
143142
[this.wheatley.guild.roles.everyone.id]: {
@@ -309,6 +308,9 @@ export default class PermissionManager extends BotComponent {
309308
// bot dev overrides
310309
this.add_channel_overwrite(this.wheatley.channels.bot_dev_internal, mod_only_channel);
311310
// voice overrides
311+
this.add_channel_overwrite(this.wheatley.channels.chill, member_voice_channel);
312+
this.add_channel_overwrite(this.wheatley.channels.work_3, member_voice_channel);
313+
this.add_channel_overwrite(this.wheatley.channels.work_4, member_voice_channel);
312314
this.add_channel_overwrite(this.wheatley.channels.afk, {
313315
[this.wheatley.guild.roles.everyone.id]: {
314316
deny: [

0 commit comments

Comments
 (0)