Feature/vba 77 #178

Merged
Vylpes merged 13 commits from feature/VBA-77 into develop 2022-09-05 18:10:04 +01:00
4 changed files with 29 additions and 11 deletions
Showing only changes of commit 7c90b2ff88 - Show all commits

View file

@ -11,3 +11,6 @@ BOT_VER=3.1
BOT_AUTHOR=Vylpes BOT_AUTHOR=Vylpes
BOT_DATE=08 Aug 2022 BOT_DATE=08 Aug 2022
BOT_OWNERID=147392775707426816 BOT_OWNERID=147392775707426816
ABOUT_FUNDING=
ABOUT_REPO=

View file

@ -1,6 +1,6 @@
{ {
"name": "vylbot-app", "name": "vylbot-app",
"version": "3.0.4", "version": "3.1.0",
"description": "A discord bot made for Vylpes' Den", "description": "A discord bot made for Vylpes' Den",
"main": "./dist/vylbot", "main": "./dist/vylbot",
"typings": "./dist", "typings": "./dist",
@ -13,12 +13,12 @@
}, },
"repository": { "repository": {
"type": "git", "type": "git",
"url": "git+https://github.com/Vylpes/vylbot-app.git" "url": "https://gitea.vylpes.xyz/rabbitlabs/vylbot-app"
}, },
"author": "Vylpes", "author": "Vylpes",
"license": "MIT", "license": "MIT",
"bugs": "https://github.com/Vylpes/vylbot-app/issues", "bugs": "https://gitea.vylpes.xyz/rabbitlabs/vylbot-app/issues",
"homepage": "https://github.com/Vylpes/vylbot-app", "homepage": "https://gitea.vylpes.xyz/rabbitlabs/vylbot-app",
"dependencies": { "dependencies": {
"@types/jest": "^27.0.3", "@types/jest": "^27.0.3",
"@types/uuid": "^8.3.4", "@types/uuid": "^8.3.4",

View file

@ -1,3 +1,5 @@
import { Emoji, MessageActionRow, MessageButton } from "discord.js";
import { MessageButtonStyles } from "discord.js/typings/enums";
import { ICommandContext } from "../contracts/ICommandContext"; import { ICommandContext } from "../contracts/ICommandContext";
import PublicEmbed from "../helpers/embeds/PublicEmbed"; import PublicEmbed from "../helpers/embeds/PublicEmbed";
import { Command } from "../type/command"; import { Command } from "../type/command";
@ -9,11 +11,24 @@ export default class About extends Command {
} }
public override async execute(context: ICommandContext) { public override async execute(context: ICommandContext) {
const fundingLink = process.env.ABOUT_FUNDING;
const repoLink = process.env.ABOUT_REPO;
const embed = new PublicEmbed(context, "About", "") const embed = new PublicEmbed(context, "About", "")
.addField("Version", process.env.BOT_VER!) .addField("Version", process.env.BOT_VER!, true)
.addField("Author", process.env.BOT_AUTHOR!) .addField("Author", process.env.BOT_AUTHOR!, true)
.addField("Date", process.env.BOT_DATE!); .addField("Date", process.env.BOT_DATE!, true);
const row = new MessageActionRow();
if (repoLink) {
row.addComponents(new MessageButton().setURL(repoLink).setLabel("Repo").setStyle(MessageButtonStyles.LINK));
}
if (fundingLink) {
row.addComponents(new MessageButton().setURL(fundingLink).setLabel("Funding").setStyle(MessageButtonStyles.LINK));
}
await embed.SendToCurrentChannel(); await embed.SendToCurrentChannel({ components: [row] });
} }
} }

View file

@ -1,4 +1,4 @@
import { MessageEmbed, Permissions, TextChannel } from "discord.js"; import { MessageEmbed, MessageOptions, Permissions, TextChannel } from "discord.js";
import { ICommandContext } from "../../contracts/ICommandContext"; import { ICommandContext } from "../../contracts/ICommandContext";
export default class PublicEmbed extends MessageEmbed { export default class PublicEmbed extends MessageEmbed {
@ -20,7 +20,7 @@ export default class PublicEmbed extends MessageEmbed {
} }
// Send methods // Send methods
public async SendToCurrentChannel() { public async SendToCurrentChannel(options?: MessageOptions) {
const channel = this.context.message.channel as TextChannel; const channel = this.context.message.channel as TextChannel;
const botMember = await this.context.message.guild?.members.fetch({ user: this.context.message.client.user! }); const botMember = await this.context.message.guild?.members.fetch({ user: this.context.message.client.user! });
@ -30,6 +30,6 @@ export default class PublicEmbed extends MessageEmbed {
if (!permissions.has(Permissions.FLAGS.SEND_MESSAGES)) return; if (!permissions.has(Permissions.FLAGS.SEND_MESSAGES)) return;
this.context.message.channel.send({ embeds: [ this ]}); this.context.message.channel.send({ embeds: [ this ], ...options});
} }
} }