murm/mrmBot-Matrix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Convert database handler into service, fix skip issue with sound player

Browse source
This commit is contained in:
Essem 2021-08-10 16:34:29 -05:00
parent 9a1fd3b6f3
commit b2c7a43baa
No known key found for this signature in database
GPG key ID: 7D497397CC3A2A8C
13 changed files with 58 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

6
commands/general/channel.js
View file

@ -8,7 +8,7 @@ class ChannelCommand extends Command {
if (this.args.length === 0) return "You need to provide whether I should be enabled or disabled in this channel!";
if (this.args[0] !== "disable" && this.args[0] !== "enable") return "That's not a valid option!";
const guildDB = await db.getGuild(this.message.channel.guild.id);
const guildDB = await db(this.ipc, "getGuild", this.message.channel.guild.id);
if (this.args[0].toLowerCase() === "disable") {
let channel;
@ -21,7 +21,7 @@ class ChannelCommand extends Command {
channel = this.message.channel;
}
await db.disableChannel(channel);
await db(this.ipc, "disableChannel", channel);
return `I have been disabled in this channel. To re-enable me, just run \`${guildDB.prefix}channel enable\`.`;
} else if (this.args[0].toLowerCase() === "enable") {
let channel;
@ -34,7 +34,7 @@ class ChannelCommand extends Command {
channel = this.message.channel;
}
await db.enableChannel(channel);
await db(this.ipc, "enableChannel", channel);
return "I have been re-enabled in this channel.";
}
}

2
commands/general/count.js
View file

@ -6,7 +6,7 @@ class CountCommand extends Command {
async run() {
if (this.message.channel.guild && !this.message.channel.permissionsOf(this.client.user.id).has("addReactions")) return "I don't have the `Add Reactions` permission!";
if (this.message.channel.guild && !this.message.channel.permissionsOf(this.client.user.id).has("embedLinks")) return "I don't have the `Embed Links` permission!";
const counts = await database.getCounts();
const counts = await database(this.ipc, "getCounts");
const countArray = [];
for (const entry of Object.entries(counts)) {
countArray.push(entry);

4
commands/general/help.js
View file

@ -8,13 +8,13 @@ const Command = require("../../classes/command.js");
class HelpCommand extends Command {
async run() {
const { prefix } = this.message.channel.guild ? await database.getGuild(this.message.channel.guild.id) : "N/A";
const { prefix } = this.message.channel.guild ? await database(this.ipc, "getGuild", this.message.channel.guild.id) : "N/A";
const commands = collections.commands;
const aliases = collections.aliases;
if (this.args.length !== 0 && (commands.has(this.args[0].toLowerCase()) || aliases.has(this.args[0].toLowerCase()))) {
const command = aliases.has(this.args[0].toLowerCase()) ? collections.aliases.get(this.args[0].toLowerCase()) : this.args[0].toLowerCase();
const info = collections.info.get(command);
const counts = await database.getCounts();
const counts = await database(this.ipc, "getCounts");
const embed = {
"embed": {
"author": {

4
commands/general/prefix.js
View file

@ -4,10 +4,10 @@ const Command = require("../../classes/command.js");
class PrefixCommand extends Command {
async run() {
if (!this.message.channel.guild) return "This command only works in servers!";
const guild = await database.getGuild(this.message.channel.guild.id);
const guild = await database(this.ipc, "getGuild", this.message.channel.guild.id);
if (this.args.length !== 0) {
if (!this.message.member.permissions.has("administrator") && this.message.member.id !== process.env.OWNER) return "You need to be an administrator to change the bot prefix!";
await database.setPrefix(this.args[0], this.message.channel.guild);
await database(this.ipc, "setPrefix", this.args[0], this.message.channel.guild);
return `The prefix has been changed to ${this.args[0]}.`;
} else {
return `The current prefix is \`${guild.prefix}\`.`;

12
commands/tags/tags.js
View file

@ -7,7 +7,7 @@ class TagsCommand extends Command {
// todo: find a way to split this into subcommands
async run() {
if (!this.message.channel.guild) return "This command only works in servers!";
const guild = await database.getGuild(this.message.channel.guild.id);
const guild = await database(this.ipc, "getGuild", this.message.channel.guild.id);
if ((guild.tagsDisabled || guild.tags_disabled) && this.args[0].toLowerCase() !== ("enable" || "disable")) return;
if (this.args.length === 0) return "You need to provide the name of the tag you want to view!";
@ -27,7 +27,7 @@ class TagsCommand extends Command {
if (this.args[1] === undefined) return "You need to provide the name of the tag you want to delete!";
if (!tags[this.args[1].toLowerCase()]) return "This tag doesn't exist!";
if (tags[this.args[1].toLowerCase()].author !== this.message.author.id && !this.message.member.permissions.has("manageMessages") && this.message.author.id !== process.env.OWNER) return "You don't own this tag!";
await database.removeTag(this.args[1].toLowerCase(), this.message.channel.guild);
await database(this.ipc, "removeTag", this.args[1].toLowerCase(), this.message.channel.guild);
return `The tag \`${this.args[1].toLowerCase()}\` has been deleted!`;
case "edit":
if (this.args[1] === undefined) return "You need to provide the name of the tag you want to edit!";
@ -75,7 +75,7 @@ class TagsCommand extends Command {
case "enable":
case "disable":
if (!this.message.member.permissions.has("manageMessages") && this.message.author.id !== process.env.OWNER) return "You don't have permission to disable tags!";
var toggleResult = await database.toggleTags(this.message.channel.guild);
var toggleResult = await database(this.ipc, "toggleTags", this.message.channel.guild);
return `Tags for this guild have been ${toggleResult ? "disabled" : "enabled"}. To ${toggleResult ? "enable" : "disable"} them again, run ${guild.prefix}tags ${toggleResult ? "enable" : "disable"}.`;
default:
if (!tags[this.args[0].toLowerCase()]) return "This tag doesn't exist!";
@ -86,11 +86,11 @@ class TagsCommand extends Command {
async setTag(content, name, message) {
if ((!content || content.length === 0) && message.attachments.length === 0) return "You need to provide the content of the tag!";
if (message.attachments.length !== 0 && content) {
await database.setTag(name, { content: `${content} ${message.attachments[0].url}`, author: message.author.id }, message.channel.guild);
await database(this.ipc, "setTag", name, { content: `${content} ${message.attachments[0].url}`, author: message.author.id }, message.channel.guild);
} else if (message.attachments.length !== 0) {
await database.setTag(name, { content: message.attachments[0].url, author: message.author.id }, message.channel.guild);
await database(this.ipc, "setTag", name, { content: message.attachments[0].url, author: message.author.id }, message.channel.guild);
} else {
await database.setTag(name, { content: content, author: message.author.id }, message.channel.guild);
await database(this.ipc, "setTag", name, { content: content, author: message.author.id }, message.channel.guild);
}
return;
}