From 1fde7a8b11d8d51e7c3d01798fd748ebcdf51c0c Mon Sep 17 00:00:00 2001
From: Dragon Fire <danielbodendahl@gmail.com>
Date: Thu, 26 Nov 2020 12:01:32 -0500
Subject: [PATCH] Make dating always be Xiao

---
 .env.example             | 10 +---------
 README.md                | 13 -------------
 commands/other/dating.js | 35 +++++------------------------------
 package.json             |  2 +-
 4 files changed, 7 insertions(+), 53 deletions(-)

diff --git a/.env.example b/.env.example
index f7a8ee71..93f850ee 100644
--- a/.env.example
+++ b/.env.example
@@ -32,15 +32,6 @@ SUPPORT_EMOJI_ID=
 DAMAGE_EMOJI_ID=
 LOADING_EMOJI_ID=
 
-# Dating info
-DATING_OFF=
-DATING_ALBUM_ID=
-DATING_NAME=
-DATING_AGE=
-DATING_TAG=
-DATING_ORIENTATION=
-DATING_SERIOUS=
-
 # API Keys, IDs, and Secrets
 ALPHA_VANTAGE_KEY=
 ANILIST_USERNAME=
@@ -81,6 +72,7 @@ BITE_ALBUM_ID=
 BLUSH_ALBUM_ID=
 BRO_HOOF_ALBUM_ID=
 CELEBRATE_ALBUM_ID=
+DATING_ALBUM_ID=
 EAT_ALBUM_ID=
 EXPLODE_ALBUM_ID=
 FIDGET_ALBUM_ID=
diff --git a/README.md b/README.md
index 9a37f3cc..f7817380 100644
--- a/README.md
+++ b/README.md
@@ -184,19 +184,6 @@ simply switch to basic text.
 * `FLANKER`, `FRONT_LINE`, `SUPPORT`, and `DAMAGE` are used in `paladins`.
 * `LOADING` is used in commands that need to load for a long time before giving a response, such as `vocodes` and `dec-talk`.
 
-### Dating Info
-
-This is the hilarious section that determines what comes out of the
-`dating` command.
-
-* `DATING_OFF` completely turns off the dating feature. Put anything here and it's off.
-* `DATING_ALBUM_ID` is an Imgur album ID (see #imgur-album-ids) that includes the photos you want to send in the command.
-* `DATING_NAME` is the name you want to go by in the command.
-* `DATING_AGE` is the age you want to display in the command.
-* `DATING_TAG` is the Discord tag (ex. dragonfire535#8081) you want to display in the command.
-* `DATING_ORIENTATION` is either "girls" if you want girls, "boys" if you want boys, or "both" if you don't care.
-* `DATING_SERIOUS` is a boolean (true/false) value that determines if you want to be serious about this or not. Really want to meet someone? Set it to "true".
-
 ### API Keys, IDs, and Secrets
 
 Here's where things get LONG. If you're greeted with a log-in page
diff --git a/commands/other/dating.js b/commands/other/dating.js
index cfc40424..9ec5862a 100644
--- a/commands/other/dating.js
+++ b/commands/other/dating.js
@@ -1,15 +1,7 @@
 const ImgurAlbumCommand = require('../../structures/commands/ImgurAlbum');
 const { stripIndents } = require('common-tags');
 const texts = require('../../assets/json/dating');
-const {
-	DATING_OFF,
-	DATING_ALBUM_ID,
-	DATING_NAME,
-	DATING_AGE,
-	DATING_TAG,
-	DATING_ORIENTATION,
-	DATING_SERIOUS
-} = process.env;
+const { DATING_ALBUM_ID } = process.env;
 
 module.exports = class DatingCommand extends ImgurAlbumCommand {
 	constructor(client) {
@@ -20,35 +12,18 @@ module.exports = class DatingCommand extends ImgurAlbumCommand {
 			memberName: 'dating',
 			description: 'Find the person of your dreams with this dating system!',
 			clientPermissions: ['ATTACH_FILES'],
-			albumID: DATING_ALBUM_ID,
-			noImage: Boolean(DATING_OFF)
+			albumID: DATING_ALBUM_ID
 		});
 	}
 
 	generateText() {
-		if (DATING_OFF) return 'The dating feature is currently inactive. Check back soon!';
 		const text = texts[Math.floor(Math.random() * texts.length)];
 		return stripIndents`
-			**${DATING_NAME}, ${DATING_AGE}**
+			**${this.client.user.username}, ${new Date().getFullYear() - 2017}**
 			_${text}_
 
-			Send a friend request to ${DATING_TAG} to meet now! ${this.orientationText}
-			${this.seriousText}
+			Send a friend request to ${this.client.user.tag} to meet now!
+			Don't worry, this is just a joke. Unless...
 		`;
 	}
-
-	get orientationText() {
-		if (DATING_ORIENTATION === 'girls') return '(Note: Girls only)';
-		if (DATING_ORIENTATION === 'boys') return '(Note: Boys only)';
-		if (DATING_ORIENTATION === 'both') return '(All genders welcome!)';
-		return '';
-	}
-
-	get seriousText() {
-		if (!DATING_SERIOUS || DATING_SERIOUS === 'false') return 'Don\'t worry, this is just a joke. Unless...';
-		if (DATING_SERIOUS === 'true') {
-			return 'This may look like a joke, but if you actually want to, feel free to really try.';
-		}
-		return '';
-	}
 };
diff --git a/package.json b/package.json
index db7014f0..7109f2ac 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
 	"name": "xiao",
-	"version": "121.3.2",
+	"version": "122.0.0",
 	"description": "Your personal server companion.",
 	"main": "Xiao.js",
 	"scripts": {