Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Small fixes to temp roles not behaving properly #923

Merged
merged 5 commits into from
Jan 7, 2025
Merged

Small fixes to temp roles not behaving properly #923

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
a7bdc40
Added 5 more temp roles to give extra room
Hipperooni Nov 30, 2024
d93e39c
Merge branch 'main' into temp-mindset-role-additions
Hipperooni Jan 7, 2025
b0000fc
Fix for additional temp roles not being added in other bits of code
Hipperooni Jan 7, 2025
caec745
oop
Hipperooni Jan 7, 2025
981229b
Merge branch 'main' into temp-mindset-role-additions
Hipperooni Jan 7, 2025
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
6 changes: 6 additions & 0 deletions src/discord/commands/archive/tripsat.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,6 +85,12 @@ const mindsetRoles = [
env.ROLE_EVENT_3,
env.ROLE_EVENT_4,
env.ROLE_EVENT_5,
env.ROLE_EVENT_6,
env.ROLE_EVENT_7,
env.ROLE_EVENT_8,
env.ROLE_EVENT_9,
env.ROLE_EVENT_10,
env.ROLE_EVENT_11,
];

const ignoredRoles = `${teamRoles},${colorRoles},${mindsetRoles}`;
Expand Down
18 changes: 16 additions & 2 deletions src/discord/events/guildMemberUpdate.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,13 @@ type MindsetNames =
| 'ROLE_EVENT_2'
| 'ROLE_EVENT_3'
| 'ROLE_EVENT_4'
| 'ROLE_EVENT_5';
| 'ROLE_EVENT_5'
| 'ROLE_EVENT_6'
| 'ROLE_EVENT_7'
| 'ROLE_EVENT_8'
| 'ROLE_EVENT_9'
| 'ROLE_EVENT_10'
| 'ROLE_EVENT_11';

const mindsetRoles = {
ROLE_DRUNK: env.ROLE_DRUNK,
Expand All @@ -44,6 +50,7 @@ const mindsetRoles = {
ROLE_EVENT_8: env.ROLE_EVENT_8,
ROLE_EVENT_9: env.ROLE_EVENT_9,
ROLE_EVENT_10: env.ROLE_EVENT_10,
ROLE_EVENT_11: env.ROLE_EVENT_11,
} as {
[key in MindsetNames]: string;
};
Expand All @@ -63,7 +70,13 @@ type TeamMindsetNames =
| 'ROLE_TTS_EVENT_2'
| 'ROLE_TTS_EVENT_3'
| 'ROLE_TTS_EVENT_4'
| 'ROLE_TTS_EVENT_5';
| 'ROLE_TTS_EVENT_5'
| 'ROLE_TTS_EVENT_6'
| 'ROLE_TTS_EVENT_7'
| 'ROLE_TTS_EVENT_8'
| 'ROLE_TTS_EVENT_9'
| 'ROLE_TTS_EVENT_10'
| 'ROLE_TTS_EVENT_11';

const TTSMindsetRoles = {
ROLE_TTS_DRUNK: env.ROLE_TTS_DRUNK,
Expand All @@ -86,6 +99,7 @@ const TTSMindsetRoles = {
ROLE_TTS_EVENT_8: env.ROLE_TTS_EVENT_8,
ROLE_TTS_EVENT_9: env.ROLE_TTS_EVENT_9,
ROLE_TTS_EVENT_10: env.ROLE_TTS_EVENT_10,
ROLE_TTS_EVENT_11: env.ROLE_TTS_EVENT_11,
} as {
[key in TeamMindsetNames]: string;
};
Expand Down
11 changes: 11 additions & 0 deletions src/discord/utils/tripsitme.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,17 @@ const mindsetRoles = [
env.ROLE_STIMMING,
env.ROLE_SEDATED,
env.ROLE_SOBER,
env.ROLE_EVENT_1,
env.ROLE_EVENT_2,
env.ROLE_EVENT_3,
env.ROLE_EVENT_4,
env.ROLE_EVENT_5,
env.ROLE_EVENT_6,
env.ROLE_EVENT_7,
env.ROLE_EVENT_8,
env.ROLE_EVENT_9,
env.ROLE_EVENT_10,
env.ROLE_EVENT_11,
];

const otherRoles = [
Expand Down
2 changes: 2 additions & 0 deletions src/global/utils/env.config.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -319,6 +319,7 @@ export const env = {
ROLE_EVENT_8: isProd ? '1312403429590569040' : '',
ROLE_EVENT_9: isProd ? '1312403488214618132' : '',
ROLE_EVENT_10: isProd ? '1312403580069609505' : '',
ROLE_EVENT_11: isProd ? '1326123572648742922' : '',

ROLE_TTS_EVENT_1: isProd ? '1178152592916893757' : '',
ROLE_TTS_EVENT_2: isProd ? '1178153869885321307' : '',
Expand All @@ -330,6 +331,7 @@ export const env = {
ROLE_TTS_EVENT_8: isProd ? '1312403390503977051' : '',
ROLE_TTS_EVENT_9: isProd ? '1312403539238195271' : '',
ROLE_TTS_EVENT_10: isProd ? '1312403613326512149' : '',
ROLE_TTS_EVENT_11: isProd ? '1326123665225678888' : '',

ROLE_TTS_DRUNK: isProd ? '1104648635691577414' : '1110471812053213245',
ROLE_TTS_HIGH: isProd ? '1104648442732613733' : '1110478575695568947',
Expand Down
Loading