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

fix: add autocompletes to /hub blacklist #29

Merged
merged 1 commit into from
Sep 16, 2023
Merged

fix: add autocompletes to /hub blacklist #29

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
83 changes: 70 additions & 13 deletions src/Commands/Network/blacklist.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ export default {
hubOption
.setName('hub')
.setDescription('The name of the hub to blacklist the user from.')
.setAutocomplete(true)
.setRequired(true),
)
.addStringOption(user =>
Expand Down Expand Up @@ -50,6 +51,7 @@ export default {
hubOption
.setName('hub')
.setDescription('The name of the hub to blacklist the user from.')
.setAutocomplete(true)
.setRequired(true),
)
.addStringOption(server =>
Expand Down Expand Up @@ -89,6 +91,7 @@ export default {
hubOption
.setName('hub')
.setDescription('The name of the hub to blacklist the user from.')
.setAutocomplete(true)
.setRequired(true),
)
.addStringOption(user =>
Expand All @@ -112,12 +115,14 @@ export default {
hubOption
.setName('hub')
.setDescription('The name of the hub to blacklist the user from.')
.setAutocomplete(true)
.setRequired(true),
)
.addStringOption(server =>
server
.setName('server')
.setDescription('The server to remove from the blacklist.')
.setAutocomplete(true)
.setRequired(true),
)
.addStringOption(string =>
Expand All @@ -135,6 +140,7 @@ export default {
hubOption
.setName('hub')
.setDescription('The name of the hub to blacklist the user from.')
.setAutocomplete(true)
.setRequired(true),
)
.addStringOption(string =>
Expand Down Expand Up @@ -171,29 +177,80 @@ export default {
},

async autocomplete(interaction: AutocompleteInteraction) {
const db = getDb();
const action = interaction.options.getSubcommand() as 'user' | 'server';
const hubName = interaction.options.getString('hub', true);
const focusedHub = interaction.options.get('hub');

if (typeof focusedHub?.value !== 'string') return;

const focusedValue = interaction.options.getFocused().toLowerCase();
let choices;
if (focusedHub.focused) {
const hub = await db.hubs.findMany({
where: {
name: { mode: 'insensitive', contains: focusedHub.value },
OR: [
{ ownerId: interaction.user.id },
{ moderators: { some: { userId: interaction.user.id } } },
],
},
take: 25,
});

const filtered = hub.map(({ name: hubName }) => ({ name: hubName, value: hubName }));
return interaction.respond(filtered);
}

switch (action) {
case 'user': {
const allUsers = await getDb().blacklistedUsers.findMany({ where: { hub: { name: hubName } } });
choices = allUsers.map((user) => { return { name: user.username, value: user.userId }; });
const userOpt = interaction.options.get('user');

if (!userOpt?.focused || typeof userOpt.value !== 'string') return;

const filteredUsers = await db.blacklistedUsers.findMany({
where: {
hub: {
name: focusedHub.value,
OR: [
{ ownerId: interaction.user.id },
{ moderators: { some: { userId: interaction.user.id } } },
],
},
OR: [
{ username: { mode: 'insensitive', contains: userOpt.value } },
{ userId: { mode: 'insensitive', contains: userOpt.value } },
],
},
take: 25,
});

const choices = filteredUsers.map((user) => { return { name: user.username, value: user.userId }; });
interaction.respond(choices);
break;
}
case 'server': {
const allServers = await getDb().blacklistedServers.findMany({ where: { hub: { name: hubName } } });
choices = allServers.map((server) => { return { name: server.serverName, value: server.serverId }; });
const serverOpt = interaction.options.get('server', true);

if (!serverOpt.focused || typeof serverOpt.value !== 'string') return;

const allServers = await db.blacklistedServers.findMany({
where: {
hub: {
name: focusedHub.value,
OR: [
{ ownerId: interaction.user.id },
{ moderators: { some: { userId: interaction.user.id } } },
],
},
OR: [
{ serverName: { mode: 'insensitive', contains: serverOpt.value } },
{ serverId: { mode: 'insensitive', contains: serverOpt.value } },
],
},
take: 25,
});
const choices = allServers.map(({ serverName, serverId }) => { return { name: serverName, value: serverId }; });
await interaction.respond(choices);
break;
}
}

const filtered = choices
.filter((choice) => choice.name.toLowerCase().includes(focusedValue) || choice.value.toLowerCase().includes(focusedValue))
.slice(0, 25);

interaction.respond(filtered);
},
};
2 changes: 1 addition & 1 deletion src/Scripts/blacklist/server.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ export = {
}
else if (subCommandGroup == 'remove') {
const reason = interaction.options.getString('reason');
if (!serverInBlacklist) return await interaction.reply('The server is not blacklisted.');
if (!serverInBlacklist) return await interaction.reply({ content: 'The server is not blacklisted.', ephemeral: true });
await blacklistedServers.deleteMany({ where: { serverId: serverOpt, hubId: hub.id } });

// Using name from DB since the bot can't access server through API.
Expand Down
Loading