Simp-O-Matic

commit 259dd1a5b43ee5c7ad86a6bc611dbc5cd5944a62
parent cfe47a612eeb8e4e3730c02037ae8bcdfea811db
Author: knutsen <samuel@knutsen.co>
Date:   Sun, 18 Apr 2021 13:55:36 +0100

Fix compile errors.

Diffstat:
M
lib/commands/metric.ts
 | 
76
++++++++++++++++++++++++++++++++++++++--------------------------------------
M
start.sh
 | 
2
+-

2 files changed, 39 insertions(+), 39 deletions(-)
diff --git a/lib/commands/metric.ts b/lib/commands/metric.ts
@@ -1,45 +1,46 @@
-export default async (home_scope: HomeScope) => {
-	const { message, args } = home_scope;
-	const units = {
-		"fahrenheit": ftoc,
-		"inch": n => [2.54 * n, "cm"],
-		"feet": ftom,
-		"foot": ftom,
-		"ft":   ftom,
-		"mile": n => [1.609344 * n, "km"],
-		"yard": n => [0.9144 * n, "m"],
-		"yd":   n => [0.9144 * n, "m"],
-		"acre": n => [4046.873 * n, "m^2"],
-		"pint": n => [473.176 * n, "ml"],
-		"quart": n => [0.946 * n, "l"],
-		"gallon": n => [3.785 * n, "l"],
-		"oz"  :  n => [28.349 * n, "g"],
-		"ounce": n => [28.349 * n, "g"],
-		"pound": n => [0.453 * n, "kg"],
-		"lb":    n => [0.453 * n, "kg"]
-	};
-	var r = /[\d.]+(F| (mile|inch|feet|foot|ft|ounce|gallon|yard|oz|fl.?.?oz|yd|acre|pint|quart|pound|lb|fahrenheit))/gi;
-	message.channel.send(args.match(r).map(s => s.toLowerCase()).map(s => {
-		if(s[s.length - 1] == "f"){
+const noop = (..._) => undefined;
+const ftoc = n => 5/9 * (n - 32);
+const ftom = n => [0.3048 * n, "m"];
+
+const UNITS = {
+	"fahrenheit": ftoc,
+	"inch": n => [2.54 * n, "cm"],
+	"feet": ftom,
+	"foot": ftom,
+	"ft":   ftom,
+	"mile": n => [1.609344 * n, "km"],
+	"yard": n => [0.9144 * n, "m"],
+	"yd":   n => [0.9144 * n, "m"],
+	"acre": n => [4046.873 * n, "m^2"],
+	"pint": n => [473.176 * n, "ml"],
+	"quart": n => [0.946 * n, "l"],
+	"gallon": n => [3.785 * n, "l"],
+	"oz"  :  n => [28.349 * n, "g"],
+	"ounce": n => [28.349 * n, "g"],
+	"pound": n => [0.453 * n, "kg"],
+	"lb":    n => [0.453 * n, "kg"]
+};
+
+const QUANTITY_REGEX = /[\d.]+(F|\s(mile|inch|feet|foot|ft|ounce|gallon|yard|oz|fl.?.?oz|yd|acre|pint|quart|pound|lb|fahrenheit))/gi;
+
+export default async (homescope: HomeScope) => {
+	const { message, args } = homescope;
+
+	const msg = args.join(" ").match(QUANTITY_REGEX).map(s => {
+		s = s.toLowerCase();
+		if (s[s.length - 1] === "f") {
 			return Math.round(ftoc(s.slice(0, -1))) + "C";
 		}
-		if(s.split(" ")[1].startsWith("fl")){
-			return Math.round(29.573 * s.split(" ")[0]) + " ml"
+		if (s.split(" ")[1].startsWith("fl")) {
+			return Math.round(29.573 * Number(s.split(" ")[0])) + " ml"
 		}
-		let out = (units[s.split(" ")[1]] || noop)(s.split(" ")[0]);
-		if(out){
+		const out = (UNITS[s.split(" ")[1]] || noop)(Number(s.split(" ")[0]));
+		if (out) {
 			return `${s} = ${Math.round(out[0] * 10) / 10} ${out[1]}`;
 		} else {
 			return "";
 		}
-	}).join("\n"));
-}
-function ftoc(n){
-	return 5/9 * (n - 32);
-}
-function ftom(n){
-	return [0.3048 * n, "m"];
-}
-function noop(){
+	}).join("\n").trim();
 
-}-
\ No newline at end of file
+	if (msg.length > 0) message.channel.send(msg);
+};
diff --git a/start.sh b/start.sh
@@ -5,6 +5,6 @@ yarn build
 . ./.env
 
 # Starting the bot.
-PID="$(sh -c 'echo $$; exec yarn start 2>&1 >./.log' &)"
+PID="$(sh -c 'echo $$; exec yarn start >./.log 2>&1' &)"
 echo "$PID" > ./.pid