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

Added channel, allow using a mention on hackban and snowflake

Browse source
This commit is contained in:
TheEssem 2020-04-09 21:40:52 -05:00
parent 56b382fce3
commit 628a002205
7 changed files with 117 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

3
events/guildCreate.js
View file

@ -10,7 +10,8 @@ module.exports = async (guild) => {
id: guild.id,
tags: misc.tagDefaults,
prefix: "&",
warns: {}
warns: {},
disabledChannels: []
});
await guildDB.save();
};

22
events/messageCreate.js
View file

@ -14,27 +14,12 @@ module.exports = async (message) => {
if (!message.channel.guild.members.get(client.user.id).permission.has("sendMessages") || !message.channel.permissionsOf(client.user.id).has("sendMessages")) return;
// prefix can be a mention or a set of special characters
const guildDB = (await database.guilds.find({ id: message.channel.guild.id }).exec())[0];
const prefixMention = new RegExp(`^<@!?${client.user.id}> `);
const prefix = prefixMention.test(message.content) ? message.content.match(prefixMention)[0] : (await database.guilds.find({ id: message.channel.guild.id }).exec())[0].prefix;
const prefix = prefixMention.test(message.content) ? message.content.match(prefixMention)[0] : guildDB.prefix;
// ignore other stuff
if (message.content.startsWith(prefix) === false) return;
// && message.channel.id !== "573553254575898626"
// funny stuff
/*if (message.channel.id === "573553254575898626" && message.channel.guild.id === "433408970955423765") {
const generalChannel = client.guilds.get("631290275456745502").channels.get("631290275888627713");
if (message.attachments.length !== 0) {
const attachments = [];
for (const attachment of message.attachments) {
const res = await require("node-fetch")(attachment.url);
attachments.push({ file: await res.buffer(), name: attachment.filename });
}
await client.createMessage(generalChannel.id, message.content, attachments);
} else {
await client.createMessage(generalChannel.id, message.content);
}
}*/
// separate commands and args
const prefixRegex = new RegExp(`^(${misc.regexEscape(prefix)})`);
@ -42,6 +27,9 @@ module.exports = async (message) => {
const args = content.split(/ +/g);
const command = args.shift().toLowerCase();
// don't run if message is in a disabled channel
if (guildDB.disabledChannels.includes(message.channel.id) && command != "channel") return;
// check if command exists
const cmd = collections.commands.get(command) || collections.commands.get(collections.aliases.get(command));
if (!cmd) return;

110
events/ready.js
View file

@ -5,29 +5,42 @@ const database = require("../utils/database.js");
const logger = require("../utils/logger.js");
const messages = require("../messages.json");
const misc = require("../utils/misc.js");
const helpGenerator = process.env.OUTPUT !== "" ? require("../utils/help.js") : null;
const twitter = process.env.TWITTER === "true" ? require("../utils/twitter.js") : null;
const helpGenerator =
process.env.OUTPUT !== "" ? require("../utils/help.js") : null;
const twitter =
process.env.TWITTER === "true" ? require("../utils/twitter.js") : null;
// run when ready
module.exports = async () => {
// make sure settings/tags exist
for (const [id] of client.guilds) {
const guildDB = (await database.guilds.find({
id: id
}).exec())[0];
const guildDB = (
await database.guilds
.find({
id: id,
})
.exec()
)[0];
if (!guildDB) {
logger.log(`Registering guild database entry for guild ${id}...`);
const newGuild = new database.guilds({
id: id,
tags: misc.tagDefaults,
prefix: "&",
warns: {}
warns: {},
disabledChannels: []
});
await newGuild.save();
} else if (guildDB && !guildDB.warns) {
logger.log(`Creating warn object for guild ${id}...`);
guildDB.set("warns", {});
await guildDB.save();
} else if (guildDB) {
if (!guildDB.warns) {
logger.log(`Creating warn object for guild ${id}...`);
guildDB.set("warns", {});
await guildDB.save();
} else if (!guildDB.disabledChannels) {
logger.log(`Creating disabled channels object for guild ${id}...`);
guildDB.set("disabledChannels", []);
await guildDB.save();
}
}
}
@ -39,7 +52,7 @@ module.exports = async () => {
// set activity (a.k.a. the gamer code)
(async function activityChanger() {
client.editStatus("dnd", {
name: `${misc.random(messages)} | @esmBot help`
name: `${misc.random(messages)} | @esmBot help`,
});
setTimeout(activityChanger, 900000);
})();
@ -49,11 +62,20 @@ module.exports = async () => {
gm.prototype.streamPromise = promisify(gm.prototype.stream);
gm.prototype.sizePromise = promisify(gm.prototype.size);
gm.prototype.identifyPromise = promisify(gm.prototype.identify);
//gm.prototype.bufferPromise = promisify(gm.prototype.toBuffer);
gm.prototype.bufferPromise = function(format, delay, type) {
return new Promise((resolve, reject) => {
if (format) {
this.in(delay ? "-delay" : "", delay ? delay.split("/").reverse().join("x") : "").out(type !== "sonic" ? "-layers" : "", type !== "sonic" ? "optimize" : "").out("-limit", "memory", "64MB").out("-limit", "map", "128MB").stream(format, (err, stdout, stderr) => {
this.in(
delay ? "-delay" : "",
delay ? delay.split("/").reverse().join("x") : ""
)
.out(
type !== "sonic" ? "-layers" : "",
type !== "sonic" ? "OptimizeTransparency" : ""
)
.out("-fuzz", "2%")
.out("-limit", "memory", "64MB")
.out("-limit", "map", "128MB")
.stream(format, (err, stdout, stderr) => {
if (err) return reject(err);
const chunks = [];
stdout.on("data", (chunk) => {
@ -68,34 +90,20 @@ module.exports = async () => {
reject(data.toString());
});
});
} else {
this.in(delay ? "-delay" : "", delay ? delay.split("/").reverse().join("x") : "").out(type !== "sonic" ? "-layers" : "", type !== "sonic" ? "optimize" : "").out("-limit", "memory", "64MB").out("-limit", "map", "128MB").stream((err, stdout, stderr) => {
if (err) return reject(err);
const chunks = [];
stdout.on("data", (chunk) => {
chunks.push(chunk);
});
// these are 'once' because they can and do fire multiple times for multiple errors,
// but this is a promise so you'll have to deal with them one at a time
stdout.once("end", () => {
resolve(Buffer.concat(chunks));
});
stderr.once("data", (data) => {
reject(data.toString());
});
});
}
});
};
// tweet stuff
if (twitter !== null && twitter.active === false) {
const blocks = await twitter.client.blocks.ids();
const tweet = async () => {
const tweets = (await database.tweets.find({
enabled: true
}).exec())[0];
const tweets = (
await database.tweets
.find({
enabled: true,
})
.exec()
)[0];
const tweetContent = await misc.getTweet(tweets);
try {
const info = await twitter.client.statuses.update(tweetContent);
@ -115,19 +123,32 @@ module.exports = async () => {
twitter.active = true;
const stream = twitter.client.statuses.filter(`@${process.env.HANDLE}`);
stream.on("data", async (tweet) => {
if (tweet.user.screen_name !== "esmBot_" && !blocks.ids.includes(tweet.user.id_str)) {
const tweets = (await database.tweets.find({
enabled: true
}).exec())[0];
if (
tweet.user.screen_name !== "esmBot_" &&
!blocks.ids.includes(tweet.user.id_str)
) {
const tweets = (
await database.tweets
.find({
enabled: true,
})
.exec()
)[0];
let tweetContent;
if (tweet.text.includes("@this_vid") || tweet.text.includes("@DownloaderBot") || tweet.text.includes("@GetVideoBot") || tweet.text.includes("@DownloaderB0t") || tweet.text.includes("@thisvid_")) {
if (
tweet.text.includes("@this_vid") ||
tweet.text.includes("@DownloaderBot") ||
tweet.text.includes("@GetVideoBot") ||
tweet.text.includes("@DownloaderB0t") ||
tweet.text.includes("@thisvid_")
) {
tweetContent = await misc.getTweet(tweet, true, true);
} else {
tweetContent = await misc.getTweet(tweets, true);
}
const payload = {
status: `@${tweet.user.screen_name} ${tweetContent}`,
in_reply_to_status_id: tweet.id_str
in_reply_to_status_id: tweet.id_str,
};
const info = await twitter.client.statuses.update(payload);
logger.log(`Reply with id ${info.id_str} has been posted.`);
@ -136,5 +157,8 @@ module.exports = async () => {
});
}
logger.log("info", `Successfully started ${client.user.username}#${client.user.discriminator} with ${client.users.size} users in ${client.guilds.size} servers.`);
};
logger.log(
"info",
`Successfully started ${client.user.username}#${client.user.discriminator} with ${client.users.size} users in ${client.guilds.size} servers.`
);
};