From bda18aa3aece41d7ffebd43dd3411e7c805271cd Mon Sep 17 00:00:00 2001 From: lilyissillyyy Date: Tue, 26 Aug 2025 22:30:54 -0400 Subject: [PATCH] Lots of small changes --- assets/json/compliment.json | 194 +++++++++--------- assets/json/roast.json | 121 ++++++----- commands/edit-image-text/axis-cult-sign-up.js | 2 +- commands/random-res/boredom.js | 4 +- commands/random-res/joke.js | 2 +- commands/random-res/name.js | 10 +- commands/random-res/offspring.js | 2 + commands/random-res/pun.js | 2 +- commands/random-seed/guess-looks.js | 4 +- commands/search/periodic-table.js | 9 + package.json | 2 +- 11 files changed, 183 insertions(+), 169 deletions(-) diff --git a/assets/json/compliment.json b/assets/json/compliment.json index ef0a47b3..a75fad6d 100644 --- a/assets/json/compliment.json +++ b/assets/json/compliment.json @@ -1,104 +1,104 @@ [ - "Your smile is contagious.", - "You look great today.", - "You're a smart cookie.", + "your smile is contagious.", + "you look great today.", + "you're a smart cookie.", "I bet you make babies smile.", - "You have impeccable manners.", + "you have impeccable manners.", "I like your style.", - "You have the best laugh.", + "you have the best laugh.", "I appreciate you.", - "You are the most perfect you there is.", - "You are enough.", - "You're strong.", - "Your perspective is refreshing.", - "You're an awesome friend.", - "You light up the room.", - "You shine brighter than a shooting star.", - "You deserve a hug right now.", - "You should be proud of yourself.", - "You're more helpful than you realize.", - "You have a great sense of humor.", - "You've got all the right moves!", - "Is that your picture next to 'charming' in the dictionary?", - "Your kindness is a balm to all who encounter it.", - "You're all that and a super-size bag of chips.", - "On a scale from 1 to 10, you're an 11.", - "You are brave.", - "You're even more beautiful on the inside than you are on the outside.", - "You have the courage of your convictions.", - "Your eyes are breathtaking.", - "If cartoon bluebirds were real, a bunch of them would be sitting on your shoulders singing right now.", - "You are making a difference.", - "You're like sunshine on a rainy day.", - "You bring out the best in other people.", - "Your ability to recall random factoids at just the right time is impressive.", - "You're a great listener.", - "How is it that you always look great, even in sweatpants?", - "Everything would be better if more people were like you!", + "you are the most perfect you there is.", + "you are enough.", + "you're strong.", + "your perspective is refreshing.", + "you're an awesome friend.", + "you light up the room.", + "you shine brighter than a shooting star.", + "you deserve a hug right now.", + "you should be proud of yourself.", + "you're more helpful than you realize.", + "you have a great sense of humor.", + "you've got all the right moves!", + "is that your picture next to 'charming' in the dictionary?", + "your kindness is a balm to all who encounter it.", + "you're all that and a super-size bag of chips.", + "on a scale from 1 to 10, you're an 11.", + "you are brave.", + "you're even more beautiful on the inside than you are on the outside.", + "you have the courage of your convictions.", + "your eyes are breathtaking.", + "if cartoon bluebirds were real, a bunch of them would be sitting on your shoulders singing right now.", + "you are making a difference.", + "you're like sunshine on a rainy day.", + "you bring out the best in other people.", + "your ability to recall random factoids at just the right time is impressive.", + "you're a great listener.", + "how is it that you always look great, even in sweatpants?", + "everything would be better if more people were like you!", "I bet you sweat glitter.", - "You were cool way before hipsters were cool.", - "That color is perfect on you.", - "Hanging out with you is always a blast.", - "You always know -- and say -- exactly what I need to hear when I need to hear it.", - "You smell really good.", - "You may dance like no one's watching, but everyone's watching because you're an amazing dancer!", - "Being around you makes everything better!", - "When you say, 'I meant to do that,' I totally believe you.", - "When you're not afraid to be yourself is when you're most incredible.", - "Colors seem brighter when you're around.", - "You're more fun than a ball pit filled with candy. (And seriously, what could be more fun than that?)", - "That thing you don't like about yourself is what makes you so interesting.", - "You're wonderful.", - "You have cute elbows. For reals!", - "Jokes are funnier when you tell them.", - "You're better than a triple-scoop ice cream cone. With sprinkles.", - "Your bellybutton is kind of adorable.", - "Your hair looks stunning.", - "You're one of a kind!", - "You're inspiring.", - "If you were a box of crayons, you'd be the giant name-brand one with the built-in sharpener.", - "You should be thanked more often. So thank you!!", - "Our community is better because you're in it.", - "Someone is getting through something hard right now because you've got their back.", - "You have the best ideas.", - "You always know how to find that silver lining.", - "Everyone gets knocked down sometimes, but you always get back up and keep going.", - "You're a candle in the darkness.", - "You're a great example to others.", - "Being around you is like being on a happy little vacation.", - "You always know just what to say.", - "You're always learning new things and trying to better yourself, which is awesome.", - "If someone based an Internet meme on you, it would have impeccable grammar.", - "You could survive a Zombie apocalypse.", - "You're more fun than bubble wrap.", - "When you make a mistake, you fix it.", - "Who raised you? They deserve a medal for a job well done.", - "You're great at figuring stuff out.", - "Your voice is magnificent.", - "The people you love are lucky to have you in their lives.", - "You're like a breath of fresh air.", - "You're gorgeous -- and that's the least interesting thing about you, too.", - "You're so thoughtful.", - "Your creative potential seems limitless.", - "Your name suits you to a T.", - "You're irresistible when you blush.", - "Actions speak louder than words, and yours tell an incredible story.", - "Somehow you make time stop and fly at the same time.", - "When you make up your mind about something, nothing stands in your way.", - "You seem to really know who you are.", - "Any team would be lucky to have you on it.", - "In high school I bet you were voted 'most likely to keep being awesome.'", + "you were cool way before hipsters were cool.", + "that color is perfect on you.", + "hanging out with you is always a blast.", + "you always know -- and say -- exactly what I need to hear when I need to hear it.", + "you smell really good.", + "you may dance like no one's watching, but everyone's watching because you're an amazing dancer!", + "being around you makes everything better!", + "when you say, 'I meant to do that,' I totally believe you.", + "when you're not afraid to be yourself is when you're most incredible.", + "colors seem brighter when you're around.", + "you're more fun than a ball pit filled with candy. (And seriously, what could be more fun than that?)", + "that thing you don't like about yourself is what makes you so interesting.", + "you're wonderful.", + "you have cute elbows. For reals!", + "jokes are funnier when you tell them.", + "you're better than a triple-scoop ice cream cone. With sprinkles.", + "your bellybutton is kind of adorable.", + "your hair looks stunning.", + "you're one of a kind!", + "you're inspiring.", + "if you were a box of crayons, you'd be the giant name-brand one with the built-in sharpener.", + "you should be thanked more often. So thank you!!", + "our community is better because you're in it.", + "someone is getting through something hard right now because you've got their back.", + "you have the best ideas.", + "you always know how to find that silver lining.", + "everyone gets knocked down sometimes, but you always get back up and keep going.", + "you're a candle in the darkness.", + "you're a great example to others.", + "being around you is like being on a happy little vacation.", + "you always know just what to say.", + "you're always learning new things and trying to better yourself, which is awesome.", + "if someone based an Internet meme on you, it would have impeccable grammar.", + "you could survive a Zombie apocalypse.", + "you're more fun than bubble wrap.", + "when you make a mistake, you fix it.", + "who raised you? They deserve a medal for a job well done.", + "you're great at figuring stuff out.", + "your voice is magnificent.", + "the people you love are lucky to have you in their lives.", + "you're like a breath of fresh air.", + "you're gorgeous -- and that's the least interesting thing about you, too.", + "you're so thoughtful.", + "your creative potential seems limitless.", + "your name suits you to a T.", + "you're irresistible when you blush.", + "actions speak louder than words, and yours tell an incredible story.", + "somehow you make time stop and fly at the same time.", + "when you make up your mind about something, nothing stands in your way.", + "you seem to really know who you are.", + "any team would be lucky to have you on it.", + "in high school I bet you were voted 'most likely to keep being awesome.'", "I bet you do the crossword puzzle in ink.", - "Babies and small animals probably love you.", - "If you were a scented candle they'd call it Perfectly Imperfect (and it would smell like summer).", - "There's ordinary, and then there's you.", - "You're someone's reason to smile.", - "You're even better than a unicorn, because you're real.", - "How do you keep being so funny and making everyone laugh?", - "You have a good head on your shoulders.", - "Has anyone ever told you that you have great posture?", - "The way you treasure your loved ones is incredible.", - "You're really something special.", - "You're a gift to those around you.", - "You don't deserve it." + "babies and small animals probably love you.", + "if you were a scented candle they'd call it Perfectly Imperfect (and it would smell like summer).", + "there's ordinary, and then there's you.", + "you're someone's reason to smile.", + "you're even better than a unicorn, because you're real.", + "how do you keep being so funny and making everyone laugh?", + "you have a good head on your shoulders.", + "has anyone ever told you that you have great posture?", + "the way you treasure your loved ones is incredible.", + "you're really something special.", + "you're a gift to those around you.", + "you don't deserve it." ] diff --git a/assets/json/roast.json b/assets/json/roast.json index 5bdf6210..596df4bc 100644 --- a/assets/json/roast.json +++ b/assets/json/roast.json @@ -1,77 +1,76 @@ [ - "*Puts you in the oven.*", - "You're so stupid.", - "Sorry, I can't hear you over how annoying you are.", + "*puts you in the oven.*", + "you're so stupid.", + "sorry, I can't hear you over how annoying you are.", "I've got better things to do.", - "You're as dumb as Cleverbot.", - "Your IQ is lower than the Mariana Trench.", - "You're so annoying even the flies stay away from your stench.", - "Go away, please.", + "you're as dumb as Cleverbot.", + "your IQ is lower than the Mariana Trench.", + "you're so annoying even the flies stay away from your stench.", + "go away, please.", "I'd give you a nasty look but you've already got one.", - "It looks like your face caught fire and someone tried to put it out with a hammer.", - "Your family tree must be a cactus because everyone on it is a prick.", - "Someday you will go far, and I hope you stay there.", - "The zoo called. They're wondering how you got out of your cage.", + "it looks like your face caught fire and someone tried to put it out with a hammer.", + "your family tree must be a cactus because everyone on it is a prick.", + "someday you will go far, and I hope you stay there.", + "the zoo called. They're wondering how you got out of your cage.", "I was hoping for a battle of wits, but you appear to be unarmed.", - "You are proof that evolution can go in reverse.", - "Brains aren't everything, in your case, they're nothing.", - "Sorry I didn't get that, I don't speak idiot.", - "Why is it acceptable for you to be an idiot, but not for me to point it out?", - "We all sprang from apes, but you did not spring far enough.", - "Even monkeys can go to space, so clearly you lack some potential.", - "It's brains over brawn, yet you have neither.", - "You look like a monkey, and you smell like one too.", - "Even among idiots you're lacking.", - "You fail even when you're doing absolutely nothing.", - "If there was a vote for 'least likely to succeed' you'd win first prize.", + "you are proof that evolution can go in reverse.", + "sorry I didn't get that, I don't speak idiot.", + "why is it acceptable for you to be an idiot, but not for me to point it out?", + "we all sprang from apes, but you did not spring far enough.", + "even monkeys can go to space, so clearly you lack some potential.", + "it's brains over brawn, yet you have neither.", + "you look like a monkey, and you smell like one too.", + "even among idiots you're lacking.", + "you fail even when you're doing absolutely nothing.", + "if there was a vote for 'least likely to succeed' you'd win first prize.", "I'm surrounded by idiots... Or, wait, that's just you.", "I wanna go home. Well, really I just want to get away from the awful aroma you've got going there.", - "Every time you touch me I have to go home and wash all my clothes nine times just to get a normal smell back.", - "If I had a dollar for every brain you don't have, I'd have one dollar.", + "every time you touch me I have to go home and wash all my clothes nine times just to get a normal smell back.", + "if I had a dollar for every brain you don't have, I'd have one dollar.", "I'd help you succeed but you're incapable.", - "Your hairline is built like a graph chart, positive and negative forces attract but the clippers and your hair repel.", + "your hairline is built like a graph chart, positive and negative forces attract but the clippers and your hair repel.", "I know a good joke! You!", - "You have two parts of your brain, 'left' and 'right'. In the left side, there's nothing right. In the right side, there's nothing left.", - "Is your ass jealous of the amount of shit that just came out of your mouth?", + "you have two parts of your brain, 'left' and 'right'. In the left side, there's nothing right. In the right side, there's nothing left.", + "is your ass jealous of the amount of shit that just came out of your mouth?", "I don't engage in mental combat with the unarmed.", - "Two wrongs don't make a right, take your parents as an example.", - "Your birth certificate is an apology letter from the condom factory.", - "You sound reasonable. It must be time to up my medication!", - "You must have been born on a highway because that's where most accidents happen.", - "You're so ugly, when your mom dropped you off at school she got a fine for littering.", - "If laughter is the best medicine, your face must be curing the world.", + "two wrongs don't make a right, take your parents as an example.", + "your birth certificate is an apology letter from the condom factory.", + "you sound reasonable. It must be time to up my medication!", + "you must have been born on a highway because that's where most accidents happen.", + "you're so ugly, when your mom dropped you off at school she got a fine for littering.", + "if laughter is the best medicine, your face must be curing the world.", "I'd like to see things from your point of view but I can't seem to get my head that far up my ass.", - "The only way you'll ever get laid is if you crawl up a chicken's ass and wait.", + "the only way you'll ever get laid is if you crawl up a chicken's ass and wait.", "I'm jealous of all the people that haven't met you!", - "If I had a face like yours, I'd sue my parents.", - "There's only one problem with your face. I can see it.", - "Don't you love nature, despite what it did to you?", - "What language are you speaking? Cause it sounds like bullshit.", - "Stupidity is not a crime so you are free to go.", - "So, a thought crossed your mind? Must have been a long and lonely journey.", - "You have a room temperature IQ - if the room is in Antarctica.", - "If you really want to know about mistakes, you should ask your parents.", + "if I had a face like yours, I'd sue my parents.", + "there's only one problem with your face. I can see it.", + "don't you love nature, despite what it did to you?", + "what language are you speaking? Cause it sounds like bullshit.", + "stupidity is not a crime so you are free to go.", + "so, a thought crossed your mind? Must have been a long and lonely journey.", + "you have a room temperature IQ - if the room is in Antarctica.", + "if you really want to know about mistakes, you should ask your parents.", "I would ask you how old you are but I know you can't count that high.", - "Do you want to know how I get all these insults? I use something called intelligence.", + "do you want to know how I get all these insults? I use something called intelligence.", "I was going to give you a nasty look, but you already have one.", "I don't know what your problem is, but I'll bet it's hard to pronounce.", - "Brains aren't everything. In your case they're nothing.", - "As an outsider, what do you think of the human race?", - "You look like a before picture.", - "Oh, what? Sorry. I was trying to imagine you with a personality.", - "You're the reason the gene pool needs a lifeguard.", - "We can always tell when you are lying. Your lips move.", + "brains aren't everything. In your case they're nothing.", + "as an outsider, what do you think of the human race?", + "you look like a before picture.", + "oh, what? Sorry. I was trying to imagine you with a personality.", + "you're the reason the gene pool needs a lifeguard.", + "we can always tell when you are lying. Your lips move.", "I may love to shop but I'm not buying your bullshit.", - "Hell is wallpapered with all your deleted selfies.", - "You are living proof that manure can sprout legs and walk.", - "You do realize makeup isn't going to fix your stupidity?", - "Calling you an idiot would be an insult to all stupid people.", - "You have the perfect face for radio.", - "Aww, it's so cute when you try to talk about things you don't understand.", - "If I wanted to hear from an asshole, I'd fart.", - "What's the difference between you and an egg? Eggs get laid!", - "You look like a rock smashed into a pile of sand, rolled into a blunt, and got smoked through an asthma inhaler.", - "Your advice is about as useful as a paper-mache bomb shelter.", - "Is it sad that your theme song might as well have a 0/0 signature?", - "You're so fat, you make the galaxy look like it's on the molecular scale." + "hell is wallpapered with all your deleted selfies.", + "you are living proof that manure can sprout legs and walk.", + "you do realize makeup isn't going to fix your stupidity?", + "calling you an idiot would be an insult to all stupid people.", + "you have the perfect face for radio.", + "aww, it's so cute when you try to talk about things you don't understand.", + "if I wanted to hear from an asshole, I'd fart.", + "what's the difference between you and an egg? Eggs get laid!", + "you look like a rock smashed into a pile of sand, rolled into a blunt, and got smoked through an asthma inhaler.", + "your advice is about as useful as a paper-mache bomb shelter.", + "is it sad that your theme song might as well have a 0/0 signature?", + "you're so fat, you make the galaxy look like it's on the molecular scale." ] diff --git a/commands/edit-image-text/axis-cult-sign-up.js b/commands/edit-image-text/axis-cult-sign-up.js index 9587a892..1b6bc0a6 100644 --- a/commands/edit-image-text/axis-cult-sign-up.js +++ b/commands/edit-image-text/axis-cult-sign-up.js @@ -39,7 +39,7 @@ module.exports = class AxisCultSignUpCommand extends Command { { key: 'gender', type: 'string', - oneOf: ['male', 'female'] + oneOf: ['male', 'female', 'other'] }, { key: 'age', diff --git a/commands/random-res/boredom.js b/commands/random-res/boredom.js index 0228ec68..52527b24 100644 --- a/commands/random-res/boredom.js +++ b/commands/random-res/boredom.js @@ -11,7 +11,7 @@ module.exports = class BoredomCommand extends Command { credit: [ { name: 'Bored API', - url: 'https://www.boredapi.com/', + url: 'https://bored.api.lewagon.com/', reason: 'API' } ] @@ -19,7 +19,7 @@ module.exports = class BoredomCommand extends Command { } async run(msg) { - const { body } = await request.get('https://www.boredapi.com/api/activity/'); + const { body } = await request.get('https://bored.api.lewagon.com/api/activity/'); return msg.say(`${body.activity} (${body.type})`); } }; diff --git a/commands/random-res/joke.js b/commands/random-res/joke.js index 103773fd..47174fec 100644 --- a/commands/random-res/joke.js +++ b/commands/random-res/joke.js @@ -28,7 +28,7 @@ module.exports = class JokeCommand extends Command { if (body.type === 'twopart') { return msg.say(stripIndents` ${body.setup} - ${body.delivery} + ||${body.delivery}|| `); } return msg.say(body.joke); diff --git a/commands/random-res/name.js b/commands/random-res/name.js index 9edc10a4..7d70228a 100644 --- a/commands/random-res/name.js +++ b/commands/random-res/name.js @@ -1,6 +1,10 @@ const Command = require('../../framework/Command'); const request = require('node-superfetch'); -const genders = ['male', 'female', 'both']; +const genders = { + masculine: 'male', + feminine: 'female', + any: '' +}; module.exports = class NameCommand extends Command { constructor(client) { @@ -21,7 +25,7 @@ module.exports = class NameCommand extends Command { key: 'gender', type: 'string', default: 'both', - oneOf: genders, + oneOf: Object.keys(genders), parse: gender => gender.toLowerCase() } ] @@ -34,7 +38,7 @@ module.exports = class NameCommand extends Command { .query({ inc: 'name', noinfo: '', - gender: gender === 'both' ? '' : gender, + gender: genders[gender], nat: 'AU,US,CA,GB' }); const data = body.results[0].name; diff --git a/commands/random-res/offspring.js b/commands/random-res/offspring.js index 0639c006..e46024e6 100644 --- a/commands/random-res/offspring.js +++ b/commands/random-res/offspring.js @@ -12,6 +12,8 @@ module.exports = class OffspringCommand extends Command { } run(msg) { + const chance = Math.floor(Math.random() * 5500); + if (!chance) return msg.say('It\'s a... Wait, what is it?'); return msg.say(`It's a ${genders[Math.floor(Math.random() * genders.length)]}!`); } }; diff --git a/commands/random-res/pun.js b/commands/random-res/pun.js index 1386cfb1..f6c8a738 100644 --- a/commands/random-res/pun.js +++ b/commands/random-res/pun.js @@ -28,7 +28,7 @@ module.exports = class PunCommand extends Command { if (body.type === 'twopart') { return msg.say(stripIndents` ${body.setup} - ${body.delivery} + ||${body.delivery}|| `); } return msg.say(body.joke); diff --git a/commands/random-seed/guess-looks.js b/commands/random-seed/guess-looks.js index 6c35a34e..dbeed1fa 100644 --- a/commands/random-seed/guess-looks.js +++ b/commands/random-seed/guess-looks.js @@ -1,7 +1,7 @@ const Command = require('../../framework/Command'); const { oneLine } = require('common-tags'); const { MersenneTwister19937, integer } = require('random-js'); -const genders = ['male', 'female']; +const genders = ['man', 'woman']; const { eyeColors, hairColors, hairStyles, extras } = require('../../assets/json/guess-looks'); const { LOVER_USER_ID } = process.env; @@ -44,7 +44,7 @@ module.exports = class GuessLooksCommand extends Command { const extra = extras[integer(0, extras.length - 1)(random)]; return msg.reply(oneLine` I think ${authorUser ? 'you are' : `${user.username} is`} a ${age} year old ${gender} with ${eyeColor} eyes - and ${hairStyle} ${hairColor} hair. ${authorUser ? 'You are' : `${gender === 'male' ? 'He' : 'She'} is`} + and ${hairStyle} ${hairColor} hair. ${authorUser ? 'You are' : `${gender === 'man' ? 'He' : 'She'} is`} ${feet}'${inches}" and weigh${authorUser ? '' : 's'} ${weight} pounds. Don't forget the ${extra}! `); } diff --git a/commands/search/periodic-table.js b/commands/search/periodic-table.js index c39a25cc..695218c3 100644 --- a/commands/search/periodic-table.js +++ b/commands/search/periodic-table.js @@ -16,6 +16,14 @@ const batman = { phase: 'Solid', symbol: '🦇' }; +const jerktonium = { + name: 'Jerktonium', + atomic_mass: 240, + number: 1999, + period: 'Bikini Bottom', + phase: 'Solid', + symbol: 'Jt' +}; module.exports = class PeriodicTableCommand extends Command { constructor(client) { @@ -106,6 +114,7 @@ module.exports = class PeriodicTableCommand extends Command { .get('https://raw.githubusercontent.com/Bowserinator/Periodic-Table-JSON/master/PeriodicTableJSON.json'); this.table = JSON.parse(text).elements; this.table.unshift(batman); + this.table.unshift(jerktonium); return this.table; } }; diff --git a/package.json b/package.json index c2d88d9b..ce4a55ff 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "xiao", - "version": "153.1.1", + "version": "153.2.0", "description": "Your personal server companion.", "main": "Xiao.js", "scripts": {