From a00638d3d713b5830bd154943884ad11f10f3a4d Mon Sep 17 00:00:00 2001 From: Daniel Odendahl Jr Date: Fri, 22 Sep 2017 13:05:43 +0000 Subject: [PATCH] Remove Source Code Stuff --- .travis.yml | 7 -- README.md | 218 +----------------------------------- commands/util/info.js | 5 +- commands/util/shard-info.js | 6 +- package.json | 8 +- 5 files changed, 11 insertions(+), 233 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index 48e5dc58..00000000 --- a/.travis.yml +++ /dev/null @@ -1,7 +0,0 @@ -sudo: false -language: node_js -node_js: - - '8' -before_install: - - npm i -g eslint eslint-config-aqua eslint-plugin-json -install: npm test diff --git a/README.md b/README.md index d547fc59..62500600 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # XiaoBot [![Discord](https://discordapp.com/api/guilds/252317073814978561/embed.png)](https://discord.gg/fqQF8mc) -Public Source Code for the Discord Bot XiaoBot, a Discord bot coded in +The Discord Bot XiaoBot, a Discord bot coded in JavaScript with [discord.js](https://github.com/hydrabolt/discord.js) using the [Commando](https://github.com/Gawdl3y/discord.js-commando) command framework. @@ -12,222 +12,6 @@ Visit XiaoBot's page on the Discord Bots list, which is quite fancy, with ## Home Server You can join the home server with [this link](https://discord.gg/fqQF8mc). -## Commands -Xiao has nearly 200 helpful commands to power up your Discord server! - -### Utility -- `prefix` Shows or sets the command prefix. -- `eval` Executes JavaScript code. -- `donate` Responds with Xiao's donation links. -- `help` Displays a list of available commands, or detailed information for a specified command. -- `info` Responds with detailed bot information. -- `invite` Responds with an invite for the bot and an invite to the home server. -- `ping` Checks the bot's ping to the Discord server. -- `shard-info` Responds with detailed information for a specific Shard. -- `uptime` Responds with how long the bot has been active on this Shard. -- `upvote` Responds with Xiao's upvoter link on Discord Bots. - -### Command Management -- `groups` Lists all command groups. -- `enable` Enables a command or command group. -- `disable` Disables a command or command group. -- `reload` Reloads a command or command group. -- `load` Loads a new command. -- `unload` Unloads a command. - -### User Info -- `avatar` Responds with a link to a user's avatar. -- `user-info` Responds with detailed information on a user. - -### Server Info -- `channel-info` Responds with detailed information on a channel. -- `emoji` Responds with a list of the server's custom emoji. -- `role-info` Responds with detailed information on a role. -- `server-info` Responds with detailed information on the server. - -### Moderation -- `ban` Bans a user. -- `clear-channel` Deletes all messages in a channel by cloning it and then deleting it. -- `hackban` Bans a user who doesn't have to be in the server. -- `kick` Kicks a user. -- `lockdown` Prevents users from posting in the current channel, or removes a lockdown. -- `prune` Deletes up to 99 messages from the current channel. -- `softban` Kicks a user and deletes their messages. -- `unban` Unbans a user. - -### Random Response -- `8-ball` Asks your question to the Magic 8 Ball. -- `cat-fact` Responds with a cat fact. -- `choose` Chooses between options you provide. -- `chuck-norris` Responds with a Chuck Norris quote. -- `coin` Flips a coin. -- `compliment` Compliments a user. -- `dog-fact` Responds with a dog fact. -- `fact-core` Responds with a random Fact Core quote. -- `fortune` Responds with a random fortune. -- `history` Responds with an event that occurred today in history, or on a specific day. -- `joke` Responds with a random joke. -- `magic-conch` Asks your question to the Magic Conch. -- `name` Responds with a random name, with the gender of your choice. -- `new-york-times` Responds with an article from the New York Times. -- `number-fact` Responds with a random fact about a number. -- `offspring` Decides if your new child will be a boy or a girl. -- `quantum-coin` Flips a coin that lands on some form of nothing. -- `quote` Responds with a random quote. -- `rate-waifu` Rates your waifu. -- `roast` Roasts a user. -- `roll` Rolls a dice with a maximum value of your choice. -- `roulette` Chooses a random member of the server. -- `ship` Ships things/people together. -- `would-you-rather` Responds with a random would you rather question. - -### Random Image -- `cat` Responds with a random cat image. -- `dog` Responds with a random dog image. -- `fidget` Responds with a random image of Fidget. -- `xiao` Responds with a random image of Xiao Pai. - -### Image Manipulation -- `achievement` Sends a Minecraft achievement with the text of your choice. -- `color` Sends an image of the color you choose. -- `meme` Sends a meme with the text and background of your choice. -- `pokemon-fusion` Fuses two Generation I Pokémon together. - -### Avatar Manipulation -- `3000-years` Draws a user's avatar over Pokémon's "It's been 3000 years" meme. -- `approved` Draws an "approved" stamp over a user's avatar. -- `avatar-fusion` Draws a a user's avatar over a user's avatar. -- `beautiful` Draws a user's avatar over Gravity Falls' "Oh, this? This is beautiful." meme. -- `bob-ross` Draws a user's avatar over Bob Ross' canvas. -- `card` Draws a trading card of random rarity based on a user's profile. -- `challenger` Draws a user's avatar over Super Smash Bros.'s "Challenger Approaching" screen. -- `dexter` Draws a user's avatar over Dexter from Pokémon's screen. -- `greyscale` Draws a user's avatar in greyscale. -- `invert` Draws a user's avatar inverted. -- `rainbow` Draws a rainbow over a user's avatar. -- `rejected` Draws a "rejected" stamp over a user's avatar. -- `rip` Draws a user's avatar over a gravestone. -- `simba` Draws a user's avatar over Simba from The Lion King's reflection. -- `steam-card` Draws a user's avatar over a Steam Trading Card. -- `steam-now-playing` Draws a user's avatar and the game of your choice over a Steam "now playing" notification. -- `thug-life` Draws "Thug Life" over a user's avatar. -- `triggered` Draws a user's avatar over a Triggered meme. -- `wanted` Draws a user's avatar over a wanted poster. -- `yu-gi-oh-token` Draws a user's avatar over a blank Yu-Gi-Oh! Token card. - -### Text Manipulation -- `b` 🅱. -- `binary` Converts text to binary. -- `clap` Sends 👏 text 👏 like 👏 this. -- `cow-say` Converts text to cow-say. -- `embed` Sends a message in an embed. -- `emojify` Converts text to emoji form. -- `mocking` SenDs TexT lIkE ThiS. -- `morse` Converts text to morse code. -- `organization-xiii-name` Converts a name into the Organization XIII style. -- `pirate` Converts text to pirate. -- `repeat` Repeat text over and over and over and over (etc). -- `reverse` Reverses text. -- `say` Make XiaoBot say what you wish. -- `ship-name` Creates a ship name from two names. -- `shuffle` Shuffles text. -- `temmie` Converts text to Temmie speak. -- `translate` Translates text to a specified language. -- `upside-down` Flips text upside-down. -- `webhook` Posts a message to the webhook defined in your process.env. -- `yoda` Converts text to Yoda speak. -- `zalgo` Converts text to zalgo. - -### Number Manipulation -- `currency` Converts a number from one currency to another. -- `temperature` Converts temperatures to/from celsius, fahrenheit, or kelvin. - -### Search -- `anime` Searches Kitsu.io for your query, getting anime results. -- `bot-info` Searches Discord Bots for information on a bot. -- `bulbapedia` Searches Bulbapedia for your query. -- `define` Defines a word. -- `discrim` Searches for other users with a certain discriminator. -- `flickr` Searches Flickr for your query. -- `giphy` Searches Giphy for your query. -- `github` Searches GitHub for information on a repository. -- `itunes` Searches iTunes for your query. -- `kickstarter` Searches Kickstarter for your query. -- `manga` Searches Kitsu.io for your query, getting manga results. -- `map` Responds with a map based upon your query. -- `mdn` Searches MDN for your query. -- `movie` Searches TMDB for your query, getting movie results. -- `nasa` Responds with an image from NASA based upon your query. -- `neopet` Searches for Neopets with the username of your query. -- `npm` Searches NPM for info on an NPM package. -- `osu` Searches osu! usernames for your query. -- `pokedex` Searches the Pokédex for a Pokémon. -- `recipe` Searches for recipes that include your query. -- `reddit` Gets a random recent post from a subreddit. -- `steam` Searches Steam for your query. -- `stocks` Get the current stocks for a symbol. -- `tv-show` Searches TMDB for your query, getting TV show results. -- `urban` Searches Urban Dictionary for your query. -- `vocaloid` Searches VocaDB for your query. -- `wattpad` Searches Wattpad for your query. -- `weather` Responds with weather information for a specified location. -- `wikia` Searches a specified Wikia wiki for your query. -- `wikipedia` Searches Wikipedia for your query. -- `youtube` Searches YouTube for your query. -- `yu-gi-oh` Responds with info on a Yu-Gi-Oh! card. - -### Games -- `akinator` Play a game of Akinator! -- `battle` Engage in a turn-based battle against another user or the AI. -- `emoji-emoji-revolution` Play a game of Emoji Emoji Revolution. -- `fishy` Go fishing. -- `gunfight` Engage in a western gunfight against another user. -- `hangman` Play a game of hangman. -- `lottery` Attempt to win the lottery, with a 1 in 100 chance of winning. -- `math-game` See how fast you can answer a math problem in a given time limit. -- `quiz` Answer a quiz question. -- `rock-paper-scissors` Play Rock-Paper-Scissors. -- `slots` Play a game of slots. -- `tic-tac-toe` Play a game of tic-tac-toe. -- `typing-game` See how fast you can type a sentence in a given time limit. -- `whos-that-pokemon` Guess who that Pokémon is. - -### Random/Other -- `can-you-not` Can YOU not? -- `days-until` Responds with how many days until a certain date this year. -- `eat-pant` eat pant -- `give-flower` Gives Xiao Pai a flower. -- `horoscope` Responds with today's horoscope for a particular sign. -- `lenny` Responds with the lenny face. -- `lmgtfy` Creates a LMGTFY link with the query you provide. -- `shorten-url` Creates a goo.gl short URL from another URL. -- `slow-clap` _slow clap_ -- `soundboard` Plays a sound in your voice channel. -- `spam` Responds with a picture of Spam. -- `spoopy-link` Checks if a link is spoopy or not. -- `strawpoll` Creates a Strawpoll from the options you provide. -- `tag` Little mini responses that didn't quite make the command cut. -- `xkcd` Gets an XKCD Comic, optionally opting for today's or a specific number. - -### Roleplay -- `break-up` Breaks up with a user. -- `cuddle` Cuddles a user. -- `eat` Eats a user. -- `evolve` Evolves a user. -- `falcon-punch` Falcon Punches a user. -- `fist-bump` Fistbumps a user. -- `high-five` High Fives a user. -- `hit-with-shovel` Hits a user with a shovel. -- `hug` Hugs a user. -- `inhale` Inhales a user. -- `kill` Kills a user. -- `kiss` Kisses a user. -- `marry` Marries a user. -- `pat` Pats a user. -- `poke` Pokes a user. -- `punch` Punches a user. -- `slap` Slaps a user. - ## Licensing The bot is licensed under an [ISC License](https://opensource.org/licenses/ISC). See the file `LICENSE.md` for more information. diff --git a/commands/util/info.js b/commands/util/info.js index 478cb70b..60200d18 100644 --- a/commands/util/info.js +++ b/commands/util/info.js @@ -18,18 +18,19 @@ module.exports = class InfoCommand extends Command { async run(msg) { const guilds = await this.client.shard.fetchClientValues('guilds.size'); + const users = await this.client.shard.fetchClientValues('users.size'); const memory = await this.client.shard.broadcastEval('process.memoryUsage().heapUsed'); const embed = new MessageEmbed() .setColor(0x00AE86) .setFooter('©2017 dragonfire535#8081') .addField('❯ Servers', guilds.reduce((prev, val) => prev + val, 0), true) + .addField('❯ Users', + users.reduce((prev, val) => prev + val, 0), true) .addField('❯ Shards', this.client.options.shardCount, true) .addField('❯ Commands', this.client.registry.commands.size, true) - .addField('❯ Source Code', - '[View Here](https://github.com/dragonfire535/xiaobot)', true) .addField('❯ Memory Usage', `${Math.round(memory.reduce((prev, val) => prev + val, 0) / 1024 / 1024)}MB`, true) .addField('❯ Uptime', diff --git a/commands/util/shard-info.js b/commands/util/shard-info.js index d7b080b6..540e0460 100644 --- a/commands/util/shard-info.js +++ b/commands/util/shard-info.js @@ -27,16 +27,16 @@ module.exports = class ShardInfoCommand extends Command { } async run(msg, { shard }) { - const memory = await this.client.shard.broadcastEval('process.memoryUsage().heapUsed'); const uptime = await this.client.shard.fetchClientValues('uptime'); const guilds = await this.client.shard.fetchClientValues('guilds.size'); + const users = await this.client.shard.fetchClientValues('users.size'); const embed = new MessageEmbed() .setTitle(`Shard ${shard}`) .setColor(0x00AE86) .addField('❯ Servers', guilds[shard], true) - .addField('❯ Memory Usage', - `${Math.round(memory[shard] / 1024 / 1024)}MB`, true) + .addField('❯ Users', + users[shard], true) .addField('❯ Uptime', duration(uptime[shard]).format(), true); return msg.embed(embed); diff --git a/package.json b/package.json index ea86a861..b3b69972 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiaobot", - "version": "41.4.1", + "version": "41.4.2", "description": "Your personal server companion.", "main": "Shard.js", "scripts": { @@ -10,7 +10,7 @@ }, "repository": { "type": "git", - "url": "git+https://github.com/dragonfire535/xiaobot.git" + "url": "git+https://bitbucket.org/dragonfire535/xiaobot.git" }, "keywords": [ "bot", @@ -24,9 +24,9 @@ "author": "dragonfire535 ", "license": "ISC", "bugs": { - "url": "https://github.com/dragonfire535/xiaobot/issues" + "url": "https://bitbucket.org/dragonfire535/xiaobot/issues" }, - "homepage": "https://github.com/dragonfire535/xiaobot#readme", + "homepage": "https://bitbucket.org/dragonfire535/xiaobot#readme", "engines": { "node": ">=8.0.0" },