fix starboard

bot.js

@@ -6,11 +6,10 @@ const ora = require('ora');
 const mongoose = require('mongoose');
 const readline = require('readline');
 
-const {SlashCommand} = require('./util/slash');
 const {SlashManager} = require('./util/slashmanager');
-const {SlashCommandBuilder} = require('@discordjs/builders');
 const {Tag} = require('./util/tag');
 const {TagFilter} = require('./util/tagfilter');
+const wait = require('./util/wait');
 
 const flags = Discord.Intents.FLAGS;
 let fl = []; Object.keys(flags).forEach(flag => fl.push(flags[flag]));
@@ -77,6 +76,27 @@ client.misc = {
     fullyReady: false
 };
 
+
+
+
+let waitAmount = 1000 * 10;
+function testConnection() {
+    return new Promise(async r => {
+        require('dns').lookup('www.google.com', async e => {
+            if (e) {
+                await wait(waitAmount);
+                waitAmount *= 2;
+                await testConnection();
+                r();
+            }
+            else {r();}
+        })
+    });
+}
+
+
+
+
 const auth = require('./auth.json');
 
 async function init() {
@@ -178,4 +198,5 @@ async function init() {
     await require('./util/wait')(5000);
     if (!client.misc.readied) {client.misc.forcedReady = true; await require('./events/ready')(client);}
 }
-init().then(() => {});
+
+testConnection().then(() => init());

commands/social/fuck.js

@@ -5,9 +5,12 @@ const UserData = require('../../models/user');
 const VC = require('../../models/vscount');
 
 const makeId = require('../../util/makeid');
+const {Tag} = require('../../util/tag');
+const {TagFilter} = require('../../util/tagfilter');
 
 module.exports = {
     name: "fuck",
+    aliases: ['sex', 'bang', 'rail', 'verykindlythank'],
     help: "Tell others you're horny with `{{p}}fuck`, or bang someone by mentioning someone to fuck!",
     meta: {
         category: 'Social',
@@ -29,7 +32,8 @@ module.exports = {
             : "You can't bang me....... only Wubzy can."
         );}
         let fuck;
-        if (message.channel.nsfw) {
+        let options = new TagFilter([new Tag(['sfw', 'nonsfw', 'clean'], 'sfw', 'toggle')]).test(args.join(" "));
+        if (message.channel.nsfw && !options.sfw) {
             fuck = await VC.findOne({uid: message.author.id, countOf: 'realfuck'}) || new VC({uid: message.author.id, countOf: 'realfuck'});
             savess = await Saves.findOne({name: 'realfuck'}) || new Saves({name: 'realfuck'});
             saves = savess.saves;

events/messageReactionAdd.js

@@ -23,7 +23,7 @@ module.exports = async (client, reaction, user) => {
             if (reaction.message.content.length) {starEmbed.addField("Message", reaction.message.content);}
             starEmbed
                 .addField("Stars", `:star: ${reaction.count}`, true)
-                .addField(`${reaction.message.member.displayName.toLowerCase().endsWith('s') ? `${reaction.message.member.displayName}'` : `${reaction.message.member.displayName}'s`} StarBoard Count`, sd.starCount[reaction.message.author.id] ? sd.starCount[reaction.message.author.id] + 1 : 1, true);
+                .addField(`${reaction.message.member.displayName.toLowerCase().endsWith('s') ? `${reaction.message.member.displayName}'` : `${reaction.message.member.displayName}'s`} StarBoard Count`, `${sd.starCount[reaction.message.author.id] ? sd.starCount[reaction.message.author.id] + 1 : 1}`, true);
             if (reaction.message.attachments.size) {starEmbed.setImage(reaction.message.attachments.first().url);}
             if (Object.keys(sd.stars).includes(reaction.message.id)) {
                 let starMessage = await reaction.message.guild.channels.cache.get(tg.starchannel).messages.fetch(sd.stars[reaction.message.id]);