Max/zkldi_Tachi
1
0
Fork 0
mirror of https://github.com/zkldi/Tachi.git synced 2026-10-07 14:28:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

More stuff

Browse Source
This commit is contained in:
zkldi
2022-03-20 20:59:33 +00:00
parent 1dc0bc8482
commit 23708d152f
10 changed files with 97 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files
bot/src/commands/chartSearch/buildChartEmbed.ts
+1 -1
View File
@@ -8,7 +8,7 @@ import {
import { Game, IDStrings, Playtypes, PublicUserDocument, UGSRatingsLookup } from "tachi-common";
import { PBScoreDocument } from "tachi-common/js/types";
import { LoggerLayers } from "../../data/data";
import { validSelectCustomIdPrefaces } from "../../interactionHandlers/selectMenu/handleIsSelectMenu";
import { validSelectCustomIdPrefaces } from "../../interactionHandlers/handleIsSelectMenu";
import { TachiServerV1Get } from "../../utils/fetch-tachi";
import { createLayeredLogger } from "../../utils/logger";
import { formatGameScoreRating, getGameImage } from "../../utils/utils";
bot/src/commands/help/help.ts
+10
View File
@@ -1,5 +1,15 @@
import { SlashCommandBuilder } from "@discordjs/builders";
import { CommandInteraction } from "discord.js";
import { SlashCommand } from "../../slashCommands/types";
export const help = async (interaction: CommandInteraction): Promise<void> => {
await interaction.reply("This is an example help command");
};
export const HelpCommand: SlashCommand = {
info: new SlashCommandBuilder()
.setName("help")
.setDescription("Shows information about this bot.")
.toJSON(),
exec: help,
};
bot/src/database/mongo.ts
+3 -3
View File
@@ -2,14 +2,14 @@ import { Snowflake } from "discord.js/typings/index.js";
import monk from "monk";
import { integer } from "tachi-common";
import { LoggerLayers } from "../data/data";
import { ProcessEnv } from "../setup";
import { BotConfig } from "../setup";
import { createLayeredLogger } from "../utils/logger";
const logger = createLayeredLogger(LoggerLayers.database);
logger.info(`Connecting to ${ProcessEnv.MONGO_URL}...`);
logger.info(`Connecting to ${BotConfig.MONGO_URL}...`);
const monkDB = monk(ProcessEnv.MONGO_URL);
const monkDB = monk(BotConfig.MONGO_URL);
monkDB
.then(() => {
bot/src/database/queries.ts
+1 -1
View File
@@ -5,7 +5,7 @@ import db, { DiscordUserMapDocument } from "./mongo";
const logger = createLayeredLogger(LoggerLayers.databaseQuery);
export function GetUserForDiscordID(discordID: string): Promise<DiscordUserMapDocument | null> {
logger.verbose(`Fetching linked user for DiscordID: ${discordID}`);
logger.verbose(`Fetching linked user with DiscordID: ${discordID}.`);
return db.discordUserMap.findOne({ discordID: discordID });
}
bot/src/interactionHandlers/command/handleIsCommand.ts → bot/src/interactionHandlers/handleIsCommand.ts
+6 -15
View File
@@ -1,20 +1,11 @@
import { CommandInteraction, Interaction } from "discord.js";
import { LoggerLayers } from "../../data/data";
import { DiscordUserMapDocument } from "../../database/mongo";
import { GetUserForDiscordID } from "../../database/queries";
import { slashCommands } from "../../slashCommands/register";
import { createLayeredLogger } from "../../utils/logger";
import { CommandInteraction } from "discord.js";
import { LoggerLayers } from "../data/data";
import { DiscordUserMapDocument } from "../database/mongo";
import { SLASH_COMMANDS } from "../slashCommands/register";
import { createLayeredLogger } from "../utils/logger";
const logger = createLayeredLogger(LoggerLayers.slashCommands);
// For performance's sake, create a lookup table here and use that to refer
// to commands.
const COMMAND_LOOKUP_TABLE = new Map();
for (const command of slashCommands) {
COMMAND_LOOKUP_TABLE.set(command.info.name, command);
}
/**
* Handles incoming command requests by resolving the interaction to the command
* it refers to, and calling it.
@@ -28,7 +19,7 @@ export function handleIsCommand(
requestingUser: DiscordUserMapDocument
) {
try {
const command = COMMAND_LOOKUP_TABLE.get(interaction.commandName);
const command = SLASH_COMMANDS.get(interaction.commandName);
if (!command) {
throw new Error(`A command was requested that does not exist.`);
bot/src/interactionHandlers/selectMenu/handleIsSelectMenu.ts → bot/src/interactionHandlers/handleIsSelectMenu.ts
+5 -5
View File
@@ -1,10 +1,10 @@
import { Interaction, SelectMenuInteraction } from "discord.js";
import { Game, Playtypes } from "tachi-common";
import { buildChartEmbed } from "../../commands/chartSearch/buildChartEmbed";
import { LoggerLayers } from "../../data/data";
import { buildProfileIntractable } from "../../profile/buildProfileEmbed";
import { createLayeredLogger } from "../../utils/logger";
import { stringToSimpleGameType } from "../../utils/utils";
import { buildChartEmbed } from "../commands/chartSearch/buildChartEmbed";
import { LoggerLayers } from "../data/data";
import { buildProfileIntractable } from "../profile/buildProfileEmbed";
import { createLayeredLogger } from "../utils/logger";
import { stringToSimpleGameType } from "../utils/utils";
const logger = createLayeredLogger(LoggerLayers.selectInteractionHandler);
bot/src/main.ts
+4 -4
View File
@@ -1,11 +1,11 @@
import { Client, CommandInteraction, Intents, SelectMenuInteraction } from "discord.js";
import { LoggerLayers, METALLIC_MIND_SPLASHES } from "./data/data";
import { GetUserForDiscordID } from "./database/queries";
import { handleIsCommand } from "./interactionHandlers/command/handleIsCommand";
import { handleIsSelectMenu } from "./interactionHandlers/selectMenu/handleIsSelectMenu";
import { handleIsCommand } from "./interactionHandlers/handleIsCommand";
import { handleIsSelectMenu } from "./interactionHandlers/handleIsSelectMenu";
import { app } from "./server/server";
import { BotConfig, ProcessEnv } from "./setup";
import { registerSlashCommands } from "./slashCommands/register";
import { RegisterSlashCommands } from "./slashCommands/register";
import { createLayeredLogger } from "./utils/logger";
import { RFA, TruncateString } from "./utils/misc";
import { initWatchHandler } from "./utils/utils";
@@ -84,7 +84,7 @@ We've sent you a DM with instructions on how to link your account.`
}&permissions=8&scope=applications.commands%20bot`
);
await registerSlashCommands(client);
await RegisterSlashCommands(client);
} catch (e) {
logger.crit("Log in Failed:", e);
process.exit(1); // screwed.
bot/src/profile/buildProfileEmbed.ts
+1 -1
View File
@@ -8,7 +8,7 @@ import {
import { Game, UserGameStats, IDStrings, PublicUserDocument, UGSRatingsLookup } from "tachi-common";
import { find } from "lodash";
import { LoggerLayers } from "../data/data";
import { validSelectCustomIdPrefaces } from "../interactionHandlers/selectMenu/handleIsSelectMenu";
import { validSelectCustomIdPrefaces } from "../interactionHandlers/handleIsSelectMenu";
import { TachiServerV1Get } from "../utils/fetch-tachi";
import { createLayeredLogger } from "../utils/logger";
import {
bot/src/slashCommands/register.ts
+56 -45
View File
@@ -1,36 +1,25 @@
import { SlashCommandBuilder } from "@discordjs/builders";
import { REST } from "@discordjs/rest";
import { APIApplicationCommandOption } from "discord-api-types";
import { Routes } from "discord-api-types/v9";
import { Client, CommandInteraction } from "discord.js";
import { searchForSong } from "../commands/chartSearch/chartSearch";
import { getProfileByName } from "../profile/fetch";
import { ProcessEnv } from "../setup";
import { HelpCommand } from "../commands/help/help";
import { LoggerLayers } from "../data/data";
import { help } from "../commands/help/help";
import { getProfileByName } from "../profile/fetch";
import { BotConfig, ProcessEnv } from "../setup";
import { createLayeredLogger } from "../utils/logger";
import { gamesToChoicesObject } from "../utils/utils";
import { Command } from "./types";
import { SlashCommand } from "./types";
const logger = createLayeredLogger(LoggerLayers.slashCommands);
export interface SlashCommand {
info: {
name: string;
description: string;
options: APIApplicationCommandOption[];
};
exec: Command;
}
export const SLASH_COMMANDS: Map<string, SlashCommand> = new Map(
Object.entries({
help: HelpCommand,
})
);
export const slashCommands: SlashCommand[] = [
{
info: new SlashCommandBuilder()
.setName("help")
.setDescription("Shows information about this bot")
.toJSON(),
exec: ,
},
const unused = [
{
info: new SlashCommandBuilder()
.setName("profile")
@@ -70,20 +59,27 @@ export const slashCommands: SlashCommand[] = [
const rest = new REST({
version: "9",
}).setToken(ProcessEnv.DISCORD_TOKEN);
}).setToken(BotConfig.DISCORD_TOKEN);
export const registerSlashCommands = async (client: Client): Promise<void> => {
/**
* Register our slash commands. If in prod, these
* @param client
*/
export async function RegisterSlashCommands(client: Client): Promise<void> {
try {
if (ProcessEnv.NODE_ENV === "production") {
logger.info("Registering global slash commands");
const commandsArray = Object.values(SLASH_COMMANDS);
if (ProcessEnv.nodeEnv === "production") {
logger.info("Registering global slash commands.");
await rest.put(Routes.applicationCommands(client.application!.id), {
body: slashCommands.map((command) => command.info),
body: commandsArray.map((command) => command.info),
});
} else {
logger.info("Registering guild slash commands");
logger.info("Registering guild slash commands.");
UnregisterAllCommands(client);
await tidyOldGuildCommands(client);
if (process.env.DEV_SERVER_ID) {
await rest.put(
Routes.applicationGuildCommands(
@@ -91,32 +87,47 @@ export const registerSlashCommands = async (client: Client): Promise<void> => {
process.env.DEV_SERVER_ID
),
{
body: slashCommands.map((command) => command.info),
body: commandsArray.map((command) => command.info),
}
);
}
}
logger.info("Successfully registered slash commands");
} catch (e) {
logger.error("Failed to register slash commands", e);
logger.info("Successfully registered slash commands.");
} catch (err) {
logger.error("Failed to register slash commands.", err);
throw err;
}
};
}
export const tidyOldGuildCommands = async (client: Client): Promise<void> => {
/**
* Unregister all the commmands we have.
*/
export async function UnregisterAllCommands(client: Client): Promise<void> {
try {
logger.info("Tidying old guild slash commands");
logger.info("Tidying old guild slash commands.");
const guilds = client.guilds.cache;
guilds.forEach((guild) => {
const commands = guild.commands.cache;
commands.forEach((command) => {
command.delete();
});
});
// discord.js doesn't use arrays because those aren't cool anymore
// so we have to discard the left side of this.
// They use collections, which inherit from ES6's Map. Ah well.
logger.info("Successfully tidied old guild slash commands");
} catch (e) {
logger.error("Failed to tidy old guild slash commands");
const promises = [];
for (const [, guild] of guilds) {
const commands = guild.commands.cache;
for (const [, command] of commands) {
promises.push(command.delete());
}
}
// parallelise waiting for these to be deleted.
await Promise.all(promises);
logger.info("Successfully tidied old guild slash commands.");
} catch (err) {
logger.error("Failed to tidy old guild slash commands.", err);
throw err;
}
};
}
bot/src/slashCommands/types.ts
+10
View File
@@ -1,3 +1,4 @@
import { APIApplicationCommandOption } from "discord-api-types";
import { CommandInteraction } from "discord.js";
import { DiscordUserMapDocument } from "../database/mongo";
@@ -5,3 +6,12 @@ export type Command = (
interaction: CommandInteraction,
requestingUser: DiscordUserMapDocument
) => Promise<void>;
export interface SlashCommand {
info: {
name: string;
description: string;
options: APIApplicationCommandOption[];
};
exec: Command;
}