meta/xyter
1
0
Fork 0
Code Issues 2 Pull requests Projects Releases 2 Wiki Activity

⚰️ remvoed unused code

Browse source
This commit is contained in:
Axel Olausson Holtenäs 2022-04-11 22:05:16 +02:00
parent 8ab6fe1559
commit 510c759e6b
No known key found for this signature in database
GPG key ID: 9347A5E873995701
23 changed files with 486 additions and 537 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/commands/shop/roles/modules/buy.ts
View file

@ -56,8 +56,10 @@ export default async (interaction: CommandInteraction) => {
const userDB = await fetchUser(user, guild);
if (userDB === null) return;
if (guildDB === null) return;
if (guildDB.shop === null) return;
const { pricePerHour } = guildDB?.shop?.roles;
const { pricePerHour } = guildDB.shop.roles;
userDB.credits -= pricePerHour;

3
src/events/guildMemberAdd/index.ts
View file

@ -1,6 +1,3 @@
import users from "../../helpers/database/models/userSchema";
import logger from "../../handlers/logger";
import { GuildMember } from "discord.js";
import updatePresence from "../../helpers/updatePresence";
import fetchUser from "../../helpers/fetchUser";

3
src/events/guildMemberRemove/index.ts
View file

@ -1,6 +1,3 @@
import users from "../../helpers/database/models/userSchema";
import logger from "../../handlers/logger";
import { GuildMember } from "discord.js";
import updatePresence from "../../helpers/updatePresence";
import dropUser from "../../helpers/dropUser";

4
src/events/messageCreate/index.ts
View file

@ -1,10 +1,6 @@
// Dependencies
import { Message } from "discord.js";
// Models
import userSchema from "../../helpers/database/models/userSchema";
import guildSchema from "../../helpers/database/models/guildSchema";
// Modules
import points from "./modules/points";
import credits from "./modules/credits";

1
src/events/messageCreate/modules/counters.ts
View file

@ -1,4 +1,3 @@
import logger from "../../../handlers/logger";
import counters from "../../../helpers/database/models/counterSchema";
import { Message } from "discord.js";

12
src/events/messageCreate/modules/credits.ts
View file

@ -1,6 +1,6 @@
import logger from '../../../handlers/logger';
import timeouts from '../../../helpers/database/models/timeoutSchema';
import { Message } from 'discord.js';
import logger from "../../../handlers/logger";
import timeouts from "../../../helpers/database/models/timeoutSchema";
import { Message } from "discord.js";
export default async (guildDB: any, userDB: any, message: Message) => {
const { guild, author, channel, content } = message;
@ -11,7 +11,7 @@ export default async (guildDB: any, userDB: any, message: Message) => {
const isTimeout = await timeouts.findOne({
guildId: guild?.id,
userId: author.id,
timeoutId: '2022-03-15-17-42',
timeoutId: "2022-03-15-17-42",
});
// If user is not on timeout
@ -37,7 +37,7 @@ export default async (guildDB: any, userDB: any, message: Message) => {
await timeouts.create({
guildId: guild?.id,
userId: author.id,
timeoutId: '2022-03-15-17-42',
timeoutId: "2022-03-15-17-42",
});
setTimeout(async () => {
@ -54,7 +54,7 @@ export default async (guildDB: any, userDB: any, message: Message) => {
await timeouts.deleteOne({
guildId: guild?.id,
userId: author.id,
timeoutId: '2022-03-15-17-42',
timeoutId: "2022-03-15-17-42",
});
}, guildDB.credits.timeout);
} else {

12
src/events/messageCreate/modules/points.ts
View file

@ -1,7 +1,7 @@
import logger from '../../../handlers/logger';
import timeouts from '../../../helpers/database/models/timeoutSchema';
import logger from "../../../handlers/logger";
import timeouts from "../../../helpers/database/models/timeoutSchema";
import { Message } from 'discord.js';
import { Message } from "discord.js";
export default async (guildDB: any, userDB: any, message: Message) => {
const { author, guild, channel, content } = message;
@ -12,7 +12,7 @@ export default async (guildDB: any, userDB: any, message: Message) => {
const isTimeout = await timeouts.findOne({
guildId: guild?.id,
userId: author.id,
timeoutId: '2022-03-15-17-41',
timeoutId: "2022-03-15-17-41",
});
// If user is not on timeout
@ -37,7 +37,7 @@ export default async (guildDB: any, userDB: any, message: Message) => {
await timeouts.create({
guildId: guild?.id,
userId: author.id,
timeoutId: '2022-03-15-17-41',
timeoutId: "2022-03-15-17-41",
});
setTimeout(async () => {
@ -54,7 +54,7 @@ export default async (guildDB: any, userDB: any, message: Message) => {
await timeouts.deleteOne({
guildId: guild?.id,
userId: author.id,
timeoutId: '2022-03-15-17-41',
timeoutId: "2022-03-15-17-41",
});
}, guildDB.points.timeout);
} else {

8
src/handlers/commands.ts
View file

@ -1,9 +1,9 @@
import fs from 'fs'; // fs
import { Collection } from 'discord.js'; // discord.js
import { Client } from '../types/common/discord';
import fs from "fs"; // fs
import { Collection } from "discord.js"; // discord.js
import { Client } from "../types/common/discord";
export default async (client: Client) => {
client.commands = new Collection();
const commandFiles = fs.readdirSync('./src/commands');
const commandFiles = fs.readdirSync("./src/commands");
for (const file of commandFiles) {
const command = require(`../commands/${file}`);

6
src/handlers/events.ts
View file

@ -1,8 +1,8 @@
import fs from 'fs'; // fs
import { Client } from 'discord.js'; // discord.js
import fs from "fs"; // fs
import { Client } from "discord.js"; // discord.js
export default async (client: Client) => {
const eventFiles = fs.readdirSync('./src/events');
const eventFiles = fs.readdirSync("./src/events");
for (const file of eventFiles) {
const event = require(`../events/${file}`);

6
src/handlers/index.ts
View file

@ -1,6 +0,0 @@
import events from './events';
import commands from './commands';
import locale from './locale';
import schedules from './schedules';
export default { events, commands, locale, schedules };

86
src/handlers/locale.ts
View file

@ -1,22 +1,22 @@
import i18next from 'i18next';
import i18next from "i18next";
export default async () => {
await i18next.init({
lng: 'en', // if you're using a language detector, do not define the lng option
lng: "en", // if you're using a language detector, do not define the lng option
// debug: true,
fallbackLng: 'en',
fallbackLng: "en",
resources: {
en: {
general: { not_available: 'Not Available' },
general: { not_available: "Not Available" },
commands: {
credits: {
general: {
credits_one: '{{count}} credit',
credits_other: '{{count}} credits',
credits_one: "{{count}} credit",
credits_other: "{{count}} credits",
},
addons: {
balance: { embed: { title: 'Credits' } },
gift: { embed: { title: 'Gift' } },
balance: { embed: { title: "Credits" } },
gift: { embed: { title: "Gift" } },
},
},
reputation: {
@ -24,22 +24,22 @@ export default async () => {
give: {
version01: {
embed: {
title: ':medal: Reputation',
title: ":medal: Reputation",
description:
'You have given reputation within the last day, you can not repute now!',
"You have given reputation within the last day, you can not repute now!",
},
},
version02: {
embed: {
title: ':medal: Reputation',
title: ":medal: Reputation",
description:
'You have given {{user}} a {{type}} reputation!',
"You have given {{user}} a {{type}} reputation!",
},
},
version03: {
embed: {
title: ':medal: Reputation',
description: 'You can not repute yourself.',
title: ":medal: Reputation",
description: "You can not repute yourself.",
},
},
},
@ -49,19 +49,19 @@ export default async () => {
addons: {
view: {
embed: {
title: 'Profile',
reputation: 'Reputation (Global)',
level: 'Level (Guild)',
points: 'Points (Guild)',
credits: 'Credits (Guild)',
language_code: 'Language Code (Global)',
title: "Profile",
reputation: "Reputation (Global)",
level: "Level (Guild)",
points: "Points (Guild)",
credits: "Credits (Guild)",
language_code: "Language Code (Global)",
},
},
settings: {
embed: {
title: 'Profile',
description: 'Following settings is set',
fields: { language: 'Language' },
title: "Profile",
description: "Following settings is set",
fields: { language: "Language" },
},
},
},
@ -69,16 +69,16 @@ export default async () => {
},
},
sv: {
general: { not_available: 'Otillgänglig' },
general: { not_available: "Otillgänglig" },
commands: {
credits: {
general: {
credits_one: '{{count}} krona',
credits_other: '{{count}} kronor',
credits_one: "{{count}} krona",
credits_other: "{{count}} kronor",
},
addons: {
balance: { embed: { title: 'Krediter' } },
gift: { embed: { title: 'Gåva' } },
balance: { embed: { title: "Krediter" } },
gift: { embed: { title: "Gåva" } },
},
},
reputation: {
@ -86,21 +86,21 @@ export default async () => {
give: {
version01: {
embed: {
title: ':medal: Omdöme',
title: ":medal: Omdöme",
description:
'Du har redan gett omdöme inom den senaste dagen, du kan inte ge ett omdöme just nu!',
"Du har redan gett omdöme inom den senaste dagen, du kan inte ge ett omdöme just nu!",
},
},
version02: {
embed: {
title: ':medal: Omdöme',
description: 'Du har gett {{user}} ett {{type}} omdöme!',
title: ":medal: Omdöme",
description: "Du har gett {{user}} ett {{type}} omdöme!",
},
},
version03: {
embed: {
title: ':medal: Omdöme',
description: 'Du kan inte ge dig själv ett omdöme.',
title: ":medal: Omdöme",
description: "Du kan inte ge dig själv ett omdöme.",
},
},
},
@ -111,19 +111,19 @@ export default async () => {
addons: {
view: {
embed: {
title: 'Profil',
reputation: 'Omdöme (Globalt)',
level: 'Nivå (Server)',
points: 'Poäng (Server)',
credits: 'Krediter (Server)',
language_code: 'Språkkod (Globalt)',
title: "Profil",
reputation: "Omdöme (Globalt)",
level: "Nivå (Server)",
points: "Poäng (Server)",
credits: "Krediter (Server)",
language_code: "Språkkod (Globalt)",
},
},
settings: {
embed: {
title: 'Profil',
description: 'Följande inställningar är satta',
fields: { language: 'Språk' },
title: "Profil",
description: "Följande inställningar är satta",
fields: { language: "Språk" },
},
},
},

6
src/handlers/logger.ts
View file

@ -1,4 +1,4 @@
import pino from 'pino';
import * as config from '../../config.json';
import pino from "pino";
import * as config from "../../config.json";
export default pino({ level: config.debug ? 'debug' : 'info' });
export default pino({ level: config.debug ? "debug" : "info" });

13
src/helpers/database/index.ts
View file

@ -1,10 +1,9 @@
import mongoose from 'mongoose';
import mongoose from "mongoose";
import * as config from '../../../config.json';
import logger from '../../handlers/logger';
import * as config from "../../../config.json";
import logger from "../../handlers/logger";
export default async () =>
{
await mongoose.connect(config.mongodb.url);
logger.info('Connected to the database');
export default async () => {
await mongoose.connect(config.mongodb.url);
logger.info("Connected to the database");
};

4
src/helpers/database/models/counterSchema.ts
View file

@ -1,4 +1,4 @@
import mongoose from 'mongoose';
import mongoose from "mongoose";
const counterSchema = new mongoose.Schema(
{
@ -31,4 +31,4 @@ const counterSchema = new mongoose.Schema(
{ timestamps: true }
);
export default mongoose.model('counter', counterSchema);
export default mongoose.model("counter", counterSchema);

4
src/helpers/database/models/guildSchema.ts
View file

@ -1,4 +1,4 @@
import mongoose from 'mongoose';
import mongoose from "mongoose";
const guildSchema = new mongoose.Schema(
{
@ -68,4 +68,4 @@ const guildSchema = new mongoose.Schema(
{ timestamps: true }
);
export default mongoose.model('guild', guildSchema);
export default mongoose.model("guild", guildSchema);

15
src/helpers/database/models/index.ts
View file

@ -1,15 +0,0 @@
import users from './userSchema';
import guilds from './guildSchema';
import apis from './apiSchema';
import timeouts from './timeoutSchema';
import counters from './counterSchema';
import shopRoles from './shopRolesSchema';
export default {
users,
guilds,
apis,
timeouts,
counters,
shopRoles,
};

4
src/helpers/database/models/shopRolesSchema.ts
View file

@ -1,4 +1,4 @@
import mongoose from 'mongoose';
import mongoose from "mongoose";
const shopRoleSchema = new mongoose.Schema(
{
@ -36,4 +36,4 @@ const shopRoleSchema = new mongoose.Schema(
{ timestamps: true }
);
export default mongoose.model('shopRole', shopRoleSchema);
export default mongoose.model("shopRole", shopRoleSchema);

4
src/helpers/database/models/timeoutSchema.ts
View file

@ -1,4 +1,4 @@
import mongoose from 'mongoose';
import mongoose from "mongoose";
const timeoutSchema = new mongoose.Schema(
{
@ -19,4 +19,4 @@ const timeoutSchema = new mongoose.Schema(
{ timestamps: true }
);
export default mongoose.model('timeout', timeoutSchema);
export default mongoose.model("timeout", timeoutSchema);

25
src/helpers/dbGuildFix.ts
View file

@ -1,31 +1,24 @@
// TODO This file will make sure that all guilds always has at least one entry in all collections with "guildId"
import apis from "./database/models/apiSchema"
import guilds from "./database/models/guildSchema"
import apis from "./database/models/apiSchema";
import guilds from "./database/models/guildSchema";
import logger from '../handlers/logger';
import { Guild } from 'discord.js';
import logger from "../handlers/logger";
import { Guild } from "discord.js";
export default async (guild: Guild) =>
{
export default async (guild: Guild) => {
const api = await apis.findOne({ guildId: guild.id });
const guildData = await guilds.findOne({ guildId: guild.id });
if (!api)
{
if (!api) {
apis.create({ guildId: guild.id });
logger.debug(`Guild: ${guild.id} added api collection`);
}
else
{
} else {
logger.debug(`Guild: ${guild.id} already in api collection`);
}
if (!guildData)
{
if (!guildData) {
guilds.create({ guildId: guild.id });
logger.debug(`Guild: ${guild.id} added guild collection`);
}
else
{
} else {
logger.debug(`Guild: ${guild.id} already in guild collection`);
}
};

22
src/helpers/dbMemberFix.ts
View file

@ -1,27 +1,21 @@
import users from './database/models/userSchema';
import logger from '../handlers/logger';
import { Guild, User } from 'discord.js';
import users from "./database/models/userSchema";
import logger from "../handlers/logger";
import { Guild, User } from "discord.js";
export default async (user: User, guild: Guild) =>
{
export default async (user: User, guild: Guild) => {
const userData = await users.findOne({ userId: user.id, guildId: guild.id });
if (!userData)
{
if (!userData) {
users
.create({ userId: user.id, guildId: guild.id })
.then(async () =>
{
.then(async () => {
await logger.debug(`User: ${user.id} added user collection`);
})
.catch(async (e) =>
{
.catch(async (e) => {
await logger.error(
`User: ${user.id} failed to added user collection ${e}`
);
});
}
else
{
} else {
logger.debug(`User: ${user.id} already in user collection`);
}

18
src/helpers/deployCommands.ts
View file

@ -1,20 +1,20 @@
import config from '../../config.json';
import logger from '../handlers/logger';
import fs from 'fs';
import { REST } from '@discordjs/rest';
import { Routes } from 'discord-api-types/v9';
import config from "../../config.json";
import logger from "../handlers/logger";
import fs from "fs";
import { REST } from "@discordjs/rest";
import { Routes } from "discord-api-types/v9";
export default async () => {
const commands = [];
const commandFiles = fs.readdirSync('./src/commands');
const commandFiles = fs.readdirSync("./src/commands");
for (const file of commandFiles) {
// eslint-disable-next-line import/no-dynamic-require, global-require
// eslint-disable-next-line global-require
const command = require(`../commands/${file}`);
commands.push(command.default.data.toJSON());
}
const rest = new REST({ version: '9' }).setToken(config.bot.token);
const rest = new REST({ version: "9" }).setToken(config.bot.token);
await rest.put(Routes.applicationCommands(config.bot.clientId), {
body: commands,
@ -32,7 +32,7 @@ export default async () => {
}
)
.then(async () =>
logger.info('Successfully registered application commands.')
logger.info("Successfully registered application commands.")
)
.catch(async (err) => {
await logger.error(err);

1
src/helpers/dropGuild.ts
View file

@ -8,7 +8,6 @@ import timeouts from "../helpers/database/models/timeoutSchema";
import logger from "../handlers/logger";
import { Guild } from "discord.js";
import updatePresence from "../helpers/updatePresence";
export default async (guild: Guild) => {
guilds

6
src/helpers/index.ts
View file

@ -1,6 +0,0 @@
import database from "./database";
import deployCommands from "./deployCommands";
import dbGuildFix from "./dbGuildFix";
import dbMemberFix from "./dbMemberFix";
export default { database, deployCommands, dbGuildFix, dbMemberFix };