Skip to content
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions .github/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -99,8 +99,6 @@
"birthdayRoleId": "893179190709477416",
"botDenyRoleId": "1025870480374247485",
"defaultRoleId": "893179190709477407",
"gruendervaeterRoleId": "893179190709477411",
"gruendervaeterBannedRoleId": "893179190571044916",
"roleDenyRoleId": "893179190684307514",
"shameRoleId": "893179190235508822",
"trustedRoleId": "893179190571044915",
Expand Down
2 changes: 0 additions & 2 deletions config.template.json
Original file line number Diff line number Diff line change
Expand Up @@ -106,8 +106,6 @@
"birthdayRoleId": "893179190709477416",
"botDenyRoleId": "1025870480374247485",
"defaultRoleId": "893179190709477407",
"gruendervaeterRoleId": "893179190709477411",
"gruendervaeterBannedRoleId": "893179190571044916",
"roleDenyRoleId": "893179190684307514",
"shameRoleId": "893179190235508822",
"trustedRoleId": "893179190571044915",
Expand Down
8 changes: 0 additions & 8 deletions src/context.ts
Original file line number Diff line number Diff line change
Expand Up @@ -87,8 +87,6 @@ export interface BotContext {
birthday: Role;
botDeny: Role;
default: Role;
gruendervaeter: Role;
gruendervaeterBanned: Role;
roleDeny: Role;
shame: Role;
trusted: Role;
Expand Down Expand Up @@ -138,7 +136,6 @@ export interface BotContext {
isMod: (member: GuildMember) => boolean;
isNerd: (member: GuildMember | APIInteractionGuildMember) => boolean;
isTrusted: (member: GuildMember | APIInteractionGuildMember) => boolean;
isGruendervater: (member: GuildMember | APIInteractionGuildMember) => boolean;
isWoisGang: (member: GuildMember | APIInteractionGuildMember) => boolean;
isEmotifizierer: (member: GuildMember | APIInteractionGuildMember) => boolean;
hasBotDenyRole: (member: GuildMember | APIInteractionGuildMember) => boolean;
Expand Down Expand Up @@ -319,8 +316,6 @@ export async function createBotContext(client: Client<true>): Promise<BotContext
birthday: ensureRole(guild, role.birthdayRoleId),
botDeny: ensureRole(guild, role.botDenyRoleId),
default: ensureRole(guild, role.defaultRoleId),
gruendervaeter: ensureRole(guild, role.gruendervaeterRoleId),
gruendervaeterBanned: ensureRole(guild, role.gruendervaeterBannedRoleId),
roleDeny: ensureRole(guild, role.roleDenyRoleId),
shame: ensureRole(guild, role.shameRoleId),
trusted: ensureRole(guild, role.trustedRoleId),
Expand Down Expand Up @@ -361,9 +356,6 @@ export async function createBotContext(client: Client<true>): Promise<BotContext
isTrusted: member =>
hasRoleById(member, config.role.trustedRoleId) ||
hasRoleById(member, config.role.trustedBannedRoleId),
isGruendervater: member =>
hasRoleById(member, config.role.gruendervaeterRoleId) ||
hasRoleById(member, config.role.gruendervaeterBannedRoleId),
isWoisGang: member => hasRoleById(member, config.role.woisgangRoleId),
isEmotifizierer: member => hasRoleById(member, config.role.emotifiziererRoleId),
hasBotDenyRole: member => hasRoleById(member, config.role.botDenyRoleId),
Expand Down
10 changes: 0 additions & 10 deletions src/service/ban.ts
Original file line number Diff line number Diff line change
Expand Up @@ -155,11 +155,6 @@ async function assignBannedRoles(context: BotContext, user: GuildMember): Promis
const currentRoles = [...user.roles.cache.map(r => r.id)];
let newRoles = [...currentRoles, bannedRole.id].filter(r => r !== context.roles.default.id);

if (user.roles.cache.find(r => r.id === context.roles.gruendervaeter.id)) {
newRoles = newRoles.filter(r => r !== context.roles.gruendervaeter.id);
newRoles.push(context.roles.gruendervaeterBanned.id);
}

if (user.roles.cache.find(r => r.id === context.roles.trusted.id)) {
newRoles = newRoles.filter(r => r !== context.roles.trusted.id);
newRoles.push(context.roles.trustedBanned.id);
Expand All @@ -180,11 +175,6 @@ async function restoreRoles(context: BotContext, user: GuildMember): Promise<boo
const currentRoles = [...user.roles.cache.map(r => r.id)];
let newRoles = [...currentRoles, defaultRole.id].filter(r => r !== context.roles.banned.id);

if (user.roles.cache.find(r => r.id === context.roles.gruendervaeterBanned.id)) {
newRoles = newRoles.filter(r => r !== context.roles.gruendervaeterBanned.id);
newRoles.push(context.roles.gruendervaeter.id);
}

if (user.roles.cache.find(r => r.id === context.roles.trustedBanned.id)) {
newRoles = newRoles.filter(r => r !== context.roles.trustedBanned.id);
newRoles.push(context.roles.trusted.id);
Expand Down
2 changes: 0 additions & 2 deletions src/service/config.ts
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,6 @@ export interface Config {
birthdayRoleId: Snowflake;
botDenyRoleId: Snowflake;
defaultRoleId: Snowflake;
gruendervaeterRoleId: Snowflake;
gruendervaeterBannedRoleId: Snowflake;
roleDenyRoleId: Snowflake;
shameRoleId: Snowflake;
trustedRoleId: Snowflake;
Expand Down