Supositware/Haha-Yes
2
1
Fork 1
Code Issues Pull requests Projects Releases Activity

Implement censor again and new account restriction to 6 months and attachment to 1 year

Browse source
This commit is contained in:
supositware 2021-02-24 18:37:25 +01:00
parent 6d864dd2ec
commit b31b37051f
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
commands/general/tweet.js
View file

@ -6,6 +6,7 @@ const fs = require('fs');
const rand = require('../../rand.js'); const rand = require('../../rand.js');
const TwitterBlacklist = require('../../models').TwitterBlacklist; const TwitterBlacklist = require('../../models').TwitterBlacklist;
const { twiConsumer, twiConsumerSecret, twiToken, twiTokenSecret, twiChannel } = require('../../config.json'); const { twiConsumer, twiConsumerSecret, twiToken, twiTokenSecret, twiChannel } = require('../../config.json');
const wordToCensor = require('../../json/censor.json');
class tweetCommand extends Command { class tweetCommand extends Command {
constructor() { constructor() {
@ -31,13 +32,6 @@ class tweetCommand extends Command {
} }
async exec(message, args) { async exec(message, args) {
if (args.text) {
// Very simple link detection
if (new RegExp('([a-zA-Z0-9]+://)?([a-zA-Z0-9_]+:[a-zA-Z0-9_]+@)?([a-zA-Z0-9.-]+\\.[A-Za-z]{2,4})(:[0-9]+)?(/.*)?').test(args.text) && !args.text.includes('twitter.com')) return message.channel.send('You may not tweet links outside of twitter.com');
// Do not allow discord invites
if (args.text.includes('discord.gg') || args.text.includes('discord.com/invite/')) return message.channel.send('No discord invite allowed.');
}
let Attachment = (message.attachments).array(); let Attachment = (message.attachments).array();
if (!Attachment[0] && !args.text) return message.channel.send('You need to input something for me to tweet!'); if (!Attachment[0] && !args.text) return message.channel.send('You need to input something for me to tweet!');
@ -48,16 +42,30 @@ class tweetCommand extends Command {
if (blacklist) { if (blacklist) {
return message.channel.send(`You have been blacklisted for the following reasons: \`${blacklist.get('reason')}\` be less naughty next time.`); return message.channel.send(`You have been blacklisted for the following reasons: \`${blacklist.get('reason')}\` be less naughty next time.`);
} }
// Don't let account new account use this command to prevent spam // If account is less than 6 months old don't accept the tweet ( alt prevention )
if (message.author.createdAt > date.setDate(date.getDate() - 7)) { if (message.author.createdAt > date.setMonth(date.getMonth() - 6)) {
return message.channel.send('Your account is too new to be able to use this command!'); return message.channel.send('Your account is too new to be able to use this command!');
} }
// If account is younger than 6 months old don't accept attachment // If account is less than 1 year old don't accept attachment
if (Attachment[0] && message.author.createdAt > date.setMonth(date.getMonth() - 6)) { if (Attachment[0] && message.author.createdAt > date.setMonth(date.getMonth() - 12)) {
return message.channel.send('Your account need to be 6 months or older to be able to send attachment!'); return message.channel.send('Your account need to be 6 months or older to be able to send attachment!');
} }
if (args.text) {
// Detect banned word (Blacklist the user directly)
if (wordToCensor.includes(args.text)) {
const body = {userID: message.author.id, reason: 'Automatic ban from banned word.'};
TwitterBlacklist.create(body);
return message.channel.send('Sike, you just posted cringe! Enjoy the blacklist :)');
}
// Very simple link detection
if (new RegExp('([a-zA-Z0-9]+://)?([a-zA-Z0-9_]+:[a-zA-Z0-9_]+@)?([a-zA-Z0-9.-]+\\.[A-Za-z]{2,4})(:[0-9]+)?(/.*)?').test(args.text) && !args.text.includes('twitter.com')) return message.channel.send('You may not tweet links outside of twitter.com');
// Do not allow discord invites
if (args.text.includes('discord.gg') || args.text.includes('discord.com/invite/')) return message.channel.send('No discord invite allowed.');
}
const client = this.client; const client = this.client;
let T = new Twit({ let T = new Twit({

2
json/censor.json
View file

@ -1 +1 @@
["1488","14/88","14 88","niggar","nigar","n\ni\ng\ng\ne\nr","n i g g e r","@jack","nugger","pd","fdp","nègre","negro","a","we must secure the existance of our people and a future for white children."] ["1488","14/88","14 88","niggar", "nigger","nigar", "kys", "kill yourself", "faggot", "fag", "kill ur self","n\ni\ng\ng\ne\nr","n i g g e r","we must secure the existance of our people and a future for white children."]