Cleanup | Fix: suggest, shorten, video | Added: osur, inventory

newFsh/commands/economy/balance.js

@@ -10,8 +10,8 @@ module.exports = {
   name: ["amount", "balance", "bal"],
   params: ["member", false],
   info: "Amount of fsh that someone has",
-
   category: "economy",
+
   async execute(message, arguments2, fsh) {
     let user = String(arguments2[0]).replace(/<@/g, "").replace(/>/g, "");
     if (!typeof Number(user) == "Number") return;
@@ -34,4 +34,4 @@ ${fsh.emojis.fsh} \`${
       embeds: [embed],
     });
   }
-};
+};

newFsh/commands/economy/explore.js

@@ -1,15 +1,15 @@
 const Discord = require("discord.js");
 
 module.exports = {
-  name: ["inventory", "inv"],
-  params: ['user', false],
+  name: "explore",
+  params: ['location', false],
   info: "Info on command",
   category: "hidden",
 
   async execute(message, arguments2, fsh) {
-    let user = String(arguments2[0]).replace(/<@/g, "").replace(/>/g, "");
-    if (!typeof Number(user) == "Number") return;
-    user = fsh.client.users.cache.get(user) || message.author;
+    // temp dev only //
+    if (!fsh.devIds.includes(message.author.id)) return;
+    // ------------- //
 
     let inv = fsh.user_inventory.get(user.id) || {};
 

newFsh/commands/economy/inventory.js

@@ -3,18 +3,18 @@ const Discord = require("discord.js");
 module.exports = {
   name: ["inventory", "inv"],
   params: ['user', false],
-  info: "Info on command",
-  category: "hidden",
+  info: "View your or others items",
+  category: "economy",
 
   async execute(message, arguments2, fsh) {
     let user = String(arguments2[0]).replace(/<@/g, "").replace(/>/g, "");
     if (!typeof Number(user) == "Number") return;
     user = fsh.client.users.cache.get(user) || message.author;
 
     let inv = fsh.user_inventory.get(user.id) || {};
-    
+
     let embed = new Discord.EmbedBuilder()
-      .setTitle(`${fsh.emojis.economy} Inventory`)
+      .setTitle(`${fsh.emojis.economy} Inventory of ${user.globalName || user.username}`)
       .setDescription(Object.keys(inv).map(e => {
         return `- ${inv[e]}x ${fsh.items.get(e).name} ${fsh.emojis[fsh.items.get(e).emoji] || ''}
   - ${fsh.items.get(e).desc}`
@@ -23,7 +23,7 @@ module.exports = {
       .setFooter({ text: `V${fsh.version}` })
       .setThumbnail(user.displayAvatarURL({ format: "png" }))
       .setColor("#888888");
-    
+
     message.channel.send({
       embeds: [embed]
     })

newFsh/commands/economy/profile.js

@@ -10,8 +10,8 @@ module.exports = {
   name: "profile",
   params: ["member", false],
   info: "Shows the economy profile of someone",
-
   category: "economy",
+
   async execute(message, arguments2, fsh) {
     let user = String(arguments2[0]).replace(/<@/g, "").replace(/>/g, "");
     if (!typeof Number(user) == "Number") return;
@@ -54,4 +54,4 @@ ${fsh.emojis.net} **${fsh.user_fsh.get(user.id) || 0}** in net  |  ${
       embeds: [embed],
     });
   },
-};
+};

newFsh/commands/economy/tank.js

@@ -27,10 +27,6 @@ module.exports = {
   category: "economy",
 
   async execute(message, arguments2, fsh) {
-    // temp dev only //
-    //if (!fsh.devIds.includes(message.author.id)) return;
-    // ------------- //
-
     let embed = new Discord.EmbedBuilder()
       .setTitle(`${fsh.emojis.tank} Tank`)
       .setTimestamp()

newFsh/commands/fun/osur.js

@@ -0,0 +1,46 @@
+const Discord = require("discord.js");
+
+function formatBytes(bytes) {
+  if (bytes === 0) return '0B';
+  const sizes = ['B', 'KB', 'MB', 'GB', 'TB', 'PB', 'EB', 'ZB', 'YB'];
+  const i = Math.floor(Math.log(bytes) / Math.log(1024));
+  return parseFloat((bytes / Math.pow(1024, i)).toFixed(0)) + sizes[i];
+}
+
+function cl(txt) {
+  return txt
+    .replace('A custom osu! ruleset ','')
+    .replace('A custom game mode for osu!lazer project ','')
+    .replace('A custom ruleset for osu!lazer that ','')
+}
+
+module.exports = {
+  name: ['osur', 'osuruleset'],
+  params: ['query', true],
+  info: "Search for a custom lazer ruleset",
+  category: "fun",
+
+  async execute(message, arguments2, fsh) {
+    let s = arguments2.join(' ');
+    if (!s) {
+      message.reply('include query');
+      return;
+    }
+    let data = await fetch('https://rulesets.info/api/rulesets');
+    data = await data.json();
+    data = data.filter(e=>e.can_download).filter(e=>e.name.toLowerCase().includes(s)||e.description.toLowerCase().includes(s));
+
+    var embed = new Discord.EmbedBuilder()
+      .setTitle(`Ruleset search "${s}"`)
+      .setFooter({ text: `V${fsh.version}` })
+      .setTimestamp(new Date())
+      .setColor("#999999")
+      .setDescription(`${data.length} results
+${data.map(e=>`**${e.name}** | By: [${e.owner_detail?.user?.username || 'Deleted'}](https://rulesets.info/profile/${e.owner_detail.id || '0'}) | [${fsh.emojis.fileimport} (${formatBytes(e.status.file_size)})](${e.direct_download_link})
+${cl(e.description)}`).join('\n')}`);
+
+    message.channel.send({
+      embeds: [embed]
+    })
+  }
+};

newFsh/commands/fun/review.js

@@ -46,9 +46,9 @@ module.exports = {
       let rews = reviews.reviews;
       if (arguments2[1] != "non" && arguments2[0] != "non") {
       rews = rews
-        .filter(e => {return e.comment.length > 3})
+        .filter(e => {return e.comment.length > 3 || e.comment == 'fsh'})
         .filter(e => {return e.comment.length < 100});
-      ["cool","craz","crazy","doodooballs","ass","cum","rule34","xxx","e621","sigma","smoooooth","Roblox Story","My name is Walter Hartwell White","they (put|locked) me in a ","cheese drill"," love men","person (above|below) me is"].forEach(e => {
+      ["craz","crazy","doodooballs","ass","cum","cock","sex","esex","rule34","xxx","e621","sigma","smoooooth","Roblox Story","My name is Walter Hartwell White","they (put|locked) me in a ","cheese drill"," love men","person (above|below) me is","fanum","poo","edged","btich","bitch","rizz","skibidi"].forEach(e => {
         let ff = new RegExp(e, "ig");
         rews = rews.filter(ee => {return !ee.comment.match(ff)});
       })

newFsh/commands/main/suggest.js

@@ -12,7 +12,7 @@ module.exports = {
       });
       return;
     }
-    let text = await fetch(`https://api.fsh.plus/filter?text=${arguments2.join(" ").replaceAll(" ","%20")}`);
+    let text = await fetch(`https://api.fsh.plus/filter?text=${message.content.split(' ').slice(0, message.content.split(' ').length-1).join(' ').replaceAll(" ","%20")}`);
     text = await text.json();
     text = text.censor.replaceAll("%20"," ")
     let embed = new Discord.EmbedBuilder()

newFsh/commands/util/shorten.js

@@ -7,7 +7,11 @@ module.exports = {
   category: "utility",
 
   async execute(message, arguments2, fsh) {
-    let d = await fetch('https://link.fsh.plus/create?url='+encodeURIComponent(arguments2[0]))
+    if (!arguments2[0]) {
+      message.reply('include url');
+      return;
+    }
+    let d = await fetch('https://link.fsh.plus/create?url='+encodeURIComponent(arguments2[0]), {method:'POST'})
     d = await d.json();
     if (d.url) {
       message.reply(`new url: <${d.url}>`)