Fixed .calc by moving to WolframAlpha API

package-lock.json

@@ -16,9 +16,9 @@
                 "figlet": "^1.5.2",
                 "glob": "^7.2.0",
                 "inquirer": "^8.2.0",
-                "mathjs": "^9.5.1",
                 "moment": "^2.29.1",
                 "ms": "^2.1.3",
+                "node-wolfram-alpha": "^1.2.5",
                 "onion-lasers": "npm:onion-lasers-v13@^2.1.0",
                 "pet-pet-gif": "^1.0.9",
                 "relevant-urban": "^2.0.0",
@@ -592,6 +592,7 @@
             "version": "7.16.0",
             "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.0.tgz",
             "integrity": "sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw==",
+            "dev": true,
             "dependencies": {
                 "regenerator-runtime": "^0.13.4"
             },
@@ -1453,6 +1454,16 @@
             "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
             "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
         },
+        "node_modules/axios": {
+            "version": "0.18.1",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz",
+            "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
+            "deprecated": "Critical security vulnerability fixed in v0.21.1. For more information, see https://github.com/axios/axios/pull/3410",
+            "dependencies": {
+                "follow-redirects": "1.5.10",
+                "is-buffer": "^2.0.2"
+            }
+        },
         "node_modules/babel-jest": {
             "version": "27.3.1",
             "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.3.1.tgz",
@@ -1958,6 +1969,7 @@
             "version": "2.0.15",
             "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.15.tgz",
             "integrity": "sha512-gDBvQU8IG139ZBQTSo2qvDFP+lANMGluM779csXOr6ny1NUtA3wkUnCFjlDNH/moAVfXtvClYt6G0zarFbtz5w==",
+            "dev": true,
             "engines": {
                 "node": "*"
             },
@@ -2120,7 +2132,8 @@
         "node_modules/decimal.js": {
             "version": "10.3.1",
             "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-            "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
+            "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+            "dev": true
         },
         "node_modules/decompress-response": {
             "version": "4.2.1",
@@ -2382,7 +2395,8 @@
         "node_modules/escape-latex": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz",
-            "integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="
+            "integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==",
+            "dev": true
         },
         "node_modules/escape-string-regexp": {
             "version": "1.0.5",
@@ -2740,6 +2754,30 @@
                 "node": ">=0.10.0"
             }
         },
+        "node_modules/follow-redirects": {
+            "version": "1.5.10",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+            "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+            "dependencies": {
+                "debug": "=3.1.0"
+            },
+            "engines": {
+                "node": ">=4.0"
+            }
+        },
+        "node_modules/follow-redirects/node_modules/debug": {
+            "version": "3.1.0",
+            "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+            "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+            "dependencies": {
+                "ms": "2.0.0"
+            }
+        },
+        "node_modules/follow-redirects/node_modules/ms": {
+            "version": "2.0.0",
+            "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+            "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+        },
         "node_modules/forever-agent": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -2765,6 +2803,7 @@
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
             "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
+            "dev": true,
             "engines": {
                 "node": "*"
             },
@@ -3248,6 +3287,28 @@
                 "node": ">=8.0.0"
             }
         },
+        "node_modules/is-buffer": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+            "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ==",
+            "funding": [
+                {
+                    "type": "github",
+                    "url": "https://github.com/sponsors/feross"
+                },
+                {
+                    "type": "patreon",
+                    "url": "https://www.patreon.com/feross"
+                },
+                {
+                    "type": "consulting",
+                    "url": "https://feross.org/support"
+                }
+            ],
+            "engines": {
+                "node": ">=4"
+            }
+        },
         "node_modules/is-core-module": {
             "version": "2.8.0",
             "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
@@ -3433,7 +3494,8 @@
         "node_modules/javascript-natural-sort": {
             "version": "0.7.1",
             "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
-            "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k="
+            "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=",
+            "dev": true
         },
         "node_modules/jest": {
             "version": "27.3.1",
@@ -4351,6 +4413,7 @@
             "version": "9.5.1",
             "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-9.5.1.tgz",
             "integrity": "sha512-yYu67sdmrLrQeRyN+DPH0aRQphdmI/gz4oNXFx4YR43NKifOiNTfXT30+ACsNIWaqJ1KihhVDD+X1kwfI2/X9g==",
+            "dev": true,
             "dependencies": {
                 "@babel/runtime": "^7.15.4",
                 "complex.js": "^2.0.15",
@@ -4586,6 +4649,14 @@
             "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
             "dev": true
         },
+        "node_modules/node-wolfram-alpha": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/node-wolfram-alpha/-/node-wolfram-alpha-1.2.5.tgz",
+            "integrity": "sha512-HwtfV9JpjfFg15Fi0FSh6Q4QYazmQdEtSAAj5Ik0WuyZ/LKn0nT6WM+vTOEFTNBMlhpxNaDuG0UJ6+pSDyB1AA==",
+            "dependencies": {
+                "axios": "^0.18.0"
+            }
+        },
         "node_modules/nopt": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
@@ -5079,7 +5150,8 @@
         "node_modules/regenerator-runtime": {
             "version": "0.13.9",
             "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+            "dev": true
         },
         "node_modules/relevant-urban": {
             "version": "2.0.0",
@@ -5287,7 +5359,8 @@
         "node_modules/seedrandom": {
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
-            "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
+            "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==",
+            "dev": true
         },
         "node_modules/semver": {
             "version": "7.3.5",
@@ -5642,7 +5715,8 @@
         "node_modules/tiny-emitter": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
+            "dev": true
         },
         "node_modules/tmp": {
             "version": "0.0.33",
@@ -5835,6 +5909,7 @@
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-2.0.0.tgz",
             "integrity": "sha512-Hhy1Iwo/e4AtLZNK10ewVVcP2UEs408DS35ubP825w/YgSBK1KVLwALvvIG4yX75QJrxjCpcWkzkVRB0BwwYlA==",
+            "dev": true,
             "engines": {
                 "node": ">= 8"
             }
@@ -6670,6 +6745,7 @@
             "version": "7.16.0",
             "resolved": "https://registry.npmjs.org/@babel/runtime/-/runtime-7.16.0.tgz",
             "integrity": "sha512-Nht8L0O8YCktmsDV6FqFue7vQLRx3Hb0B37lS5y0jDRqRxlBG4wIJHnf9/bgSE2UyipKFA01YtS+npRdTWBUyw==",
+            "dev": true,
             "requires": {
                 "regenerator-runtime": "^0.13.4"
             }
@@ -7388,6 +7464,15 @@
             "resolved": "https://registry.npmjs.org/aws4/-/aws4-1.11.0.tgz",
             "integrity": "sha512-xh1Rl34h6Fi1DC2WWKfxUTVqRsNnr6LsKz2+hfwDxQJWmrx8+c7ylaqBMcHfl1U1r2dsifOvKX3LQuLNZ+XSvA=="
         },
+        "axios": {
+            "version": "0.18.1",
+            "resolved": "https://registry.npmjs.org/axios/-/axios-0.18.1.tgz",
+            "integrity": "sha512-0BfJq4NSfQXd+SkFdrvFbG7addhYSBA2mQwISr46pD6E5iqkWg02RAs8vyTT/j0RTnoYmeXauBuSv1qKwR179g==",
+            "requires": {
+                "follow-redirects": "1.5.10",
+                "is-buffer": "^2.0.2"
+            }
+        },
         "babel-jest": {
             "version": "27.3.1",
             "resolved": "https://registry.npmjs.org/babel-jest/-/babel-jest-27.3.1.tgz",
@@ -7766,7 +7851,8 @@
         "complex.js": {
             "version": "2.0.15",
             "resolved": "https://registry.npmjs.org/complex.js/-/complex.js-2.0.15.tgz",
-            "integrity": "sha512-gDBvQU8IG139ZBQTSo2qvDFP+lANMGluM779csXOr6ny1NUtA3wkUnCFjlDNH/moAVfXtvClYt6G0zarFbtz5w=="
+            "integrity": "sha512-gDBvQU8IG139ZBQTSo2qvDFP+lANMGluM779csXOr6ny1NUtA3wkUnCFjlDNH/moAVfXtvClYt6G0zarFbtz5w==",
+            "dev": true
         },
         "concat-map": {
             "version": "0.0.1",
@@ -7890,7 +7976,8 @@
         "decimal.js": {
             "version": "10.3.1",
             "resolved": "https://registry.npmjs.org/decimal.js/-/decimal.js-10.3.1.tgz",
-            "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ=="
+            "integrity": "sha512-V0pfhfr8suzyPGOx3nmq4aHqabehUZn6Ch9kyFpV79TGDTWFmHqUqXdabR7QHqxzrYolF4+tVmJhUG4OURg5dQ==",
+            "dev": true
         },
         "decompress-response": {
             "version": "4.2.1",
@@ -8081,7 +8168,8 @@
         "escape-latex": {
             "version": "1.2.0",
             "resolved": "https://registry.npmjs.org/escape-latex/-/escape-latex-1.2.0.tgz",
-            "integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw=="
+            "integrity": "sha512-nV5aVWW1K0wEiUIEdZ4erkGGH8mDxGyxSeqPzRNtWP7ataw+/olFObw7hujFWlVjNsaDFw5VZ5NzVSIqRgfTiw==",
+            "dev": true
         },
         "escape-string-regexp": {
             "version": "1.0.5",
@@ -8255,6 +8343,29 @@
                 "path-exists": "^4.0.0"
             }
         },
+        "follow-redirects": {
+            "version": "1.5.10",
+            "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.5.10.tgz",
+            "integrity": "sha512-0V5l4Cizzvqt5D44aTXbFZz+FtyXV1vrDN6qrelxtfYQKW0KO0W2T/hkE8xvGa/540LkZlkaUjO4ailYTFtHVQ==",
+            "requires": {
+                "debug": "=3.1.0"
+            },
+            "dependencies": {
+                "debug": {
+                    "version": "3.1.0",
+                    "resolved": "https://registry.npmjs.org/debug/-/debug-3.1.0.tgz",
+                    "integrity": "sha512-OX8XqP7/1a9cqkxYw2yXss15f26NKWBpDXQd0/uK/KPqdQhxbPa994hnzjcE2VqQpDslf55723cKPUOGSmMY3g==",
+                    "requires": {
+                        "ms": "2.0.0"
+                    }
+                },
+                "ms": {
+                    "version": "2.0.0",
+                    "resolved": "https://registry.npmjs.org/ms/-/ms-2.0.0.tgz",
+                    "integrity": "sha1-VgiurfwAvmwpAd9fmGF4jeDVl8g="
+                }
+            }
+        },
         "forever-agent": {
             "version": "0.6.1",
             "resolved": "https://registry.npmjs.org/forever-agent/-/forever-agent-0.6.1.tgz",
@@ -8273,7 +8384,8 @@
         "fraction.js": {
             "version": "4.1.1",
             "resolved": "https://registry.npmjs.org/fraction.js/-/fraction.js-4.1.1.tgz",
-            "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg=="
+            "integrity": "sha512-MHOhvvxHTfRFpF1geTK9czMIZ6xclsEor2wkIGYYq+PxcQqT7vStJqjhe6S1TenZrMZzo+wlqOufBDVepUEgPg==",
+            "dev": true
         },
         "from": {
             "version": "0.1.7",
@@ -8620,6 +8732,11 @@
                 "through": "^2.3.6"
             }
         },
+        "is-buffer": {
+            "version": "2.0.5",
+            "resolved": "https://registry.npmjs.org/is-buffer/-/is-buffer-2.0.5.tgz",
+            "integrity": "sha512-i2R6zNFDwgEHJyQUtJEk0XFi1i0dPFn/oqjK3/vPCcDeJvW5NQ83V8QbicfF1SupOaB0h8ntgBC2YiE7dfyctQ=="
+        },
         "is-core-module": {
             "version": "2.8.0",
             "resolved": "https://registry.npmjs.org/is-core-module/-/is-core-module-2.8.0.tgz",
@@ -8759,7 +8876,8 @@
         "javascript-natural-sort": {
             "version": "0.7.1",
             "resolved": "https://registry.npmjs.org/javascript-natural-sort/-/javascript-natural-sort-0.7.1.tgz",
-            "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k="
+            "integrity": "sha1-+eIwPUUH9tdDVac2ZNFED7Wg71k=",
+            "dev": true
         },
         "jest": {
             "version": "27.3.1",
@@ -9482,6 +9600,7 @@
             "version": "9.5.1",
             "resolved": "https://registry.npmjs.org/mathjs/-/mathjs-9.5.1.tgz",
             "integrity": "sha512-yYu67sdmrLrQeRyN+DPH0aRQphdmI/gz4oNXFx4YR43NKifOiNTfXT30+ACsNIWaqJ1KihhVDD+X1kwfI2/X9g==",
+            "dev": true,
             "requires": {
                 "@babel/runtime": "^7.15.4",
                 "complex.js": "^2.0.15",
@@ -9659,6 +9778,14 @@
             "integrity": "sha512-CqyzN6z7Q6aMeF/ktcMVTzhAHCEpf8SOarwpzpf8pNBY2k5/oM34UHldUwp8VKI7uxct2HxSRdJjBaZeESzcxA==",
             "dev": true
         },
+        "node-wolfram-alpha": {
+            "version": "1.2.5",
+            "resolved": "https://registry.npmjs.org/node-wolfram-alpha/-/node-wolfram-alpha-1.2.5.tgz",
+            "integrity": "sha512-HwtfV9JpjfFg15Fi0FSh6Q4QYazmQdEtSAAj5Ik0WuyZ/LKn0nT6WM+vTOEFTNBMlhpxNaDuG0UJ6+pSDyB1AA==",
+            "requires": {
+                "axios": "^0.18.0"
+            }
+        },
         "nopt": {
             "version": "5.0.0",
             "resolved": "https://registry.npmjs.org/nopt/-/nopt-5.0.0.tgz",
@@ -10026,7 +10153,8 @@
         "regenerator-runtime": {
             "version": "0.13.9",
             "resolved": "https://registry.npmjs.org/regenerator-runtime/-/regenerator-runtime-0.13.9.tgz",
-            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA=="
+            "integrity": "sha512-p3VT+cOEgxFsRRA9X4lkI1E+k2/CtnKtU4gcxyaCUreilL/vqI6CdZ3wxVUx3UOUg+gnUOQQcRI7BmSI656MYA==",
+            "dev": true
         },
         "relevant-urban": {
             "version": "2.0.0",
@@ -10198,7 +10326,8 @@
         "seedrandom": {
             "version": "3.0.5",
             "resolved": "https://registry.npmjs.org/seedrandom/-/seedrandom-3.0.5.tgz",
-            "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg=="
+            "integrity": "sha512-8OwmbklUNzwezjGInmZ+2clQmExQPvomqjL7LFqOYqtmuxRgQYqOD3mHaU+MvZn5FLUeVxVfQjwLZW/n/JFuqg==",
+            "dev": true
         },
         "semver": {
             "version": "7.3.5",
@@ -10471,7 +10600,8 @@
         "tiny-emitter": {
             "version": "2.1.0",
             "resolved": "https://registry.npmjs.org/tiny-emitter/-/tiny-emitter-2.1.0.tgz",
-            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q=="
+            "integrity": "sha512-NB6Dk1A9xgQPMoGqC5CVXn123gWyte215ONT5Pp5a0yt4nlEoO1ZWeCwpncaekPHXO60i47ihFnZPiRPjRMq4Q==",
+            "dev": true
         },
         "tmp": {
             "version": "0.0.33",
@@ -10603,7 +10733,8 @@
         "typed-function": {
             "version": "2.0.0",
             "resolved": "https://registry.npmjs.org/typed-function/-/typed-function-2.0.0.tgz",
-            "integrity": "sha512-Hhy1Iwo/e4AtLZNK10ewVVcP2UEs408DS35ubP825w/YgSBK1KVLwALvvIG4yX75QJrxjCpcWkzkVRB0BwwYlA=="
+            "integrity": "sha512-Hhy1Iwo/e4AtLZNK10ewVVcP2UEs408DS35ubP825w/YgSBK1KVLwALvvIG4yX75QJrxjCpcWkzkVRB0BwwYlA==",
+            "dev": true
         },
         "typedarray-to-buffer": {
             "version": "3.1.5",

package.json

@@ -21,9 +21,9 @@
         "figlet": "^1.5.2",
         "glob": "^7.2.0",
         "inquirer": "^8.2.0",
-        "mathjs": "^9.5.1",
         "moment": "^2.29.1",
         "ms": "^2.1.3",
+        "node-wolfram-alpha": "^1.2.5",
         "onion-lasers": "npm:onion-lasers-v13@^2.1.0",
         "pet-pet-gif": "^1.0.9",
         "relevant-urban": "^2.0.0",

src/commands/utility/calc.ts

@@ -1,24 +1,34 @@
 import {NamedCommand, RestCommand} from "onion-lasers";
-import * as math from "mathjs";
+import {WolframClient} from "node-wolfram-alpha";
 import {MessageEmbed} from "discord.js";
+import {Config} from "../../structures";
 
 export default new NamedCommand({
     description: "Calculates a specified math expression.",
     run: "Please provide a calculation.",
     any: new RestCommand({
         async run({send, combined}) {
+            if (Config.wolfram === null) return send("There's no Wolfram token in the config.");
+
+            const wClient = new WolframClient(Config.wolfram);
             let resp;
             try {
-                resp = math.evaluate(combined);
+                resp = await wClient.query(combined);
-            } catch (e) {
+            } catch (e: any) {
-                return send("Please provide a *valid* calculation.");
+                return send("Something went wrong.");
             }
+
+            if (!resp.data.queryresult.pods) return send("No pods were returned. Your query was likely invalid.");
+            else {
+                // TODO: Please don't hardcode the pod to fetch, try to figure out
+                // which is the right one based on some comparisons instead
                 const embed = new MessageEmbed()
                     .setColor(0xffffff)
                     .setTitle("Math Calculation")
-                .addField("Input", `\`\`\`js\n${combined}\`\`\``)
+                    .addField("Input", `\`\`\`\n${combined}\`\`\``)
-                .addField("Output", `\`\`\`js\n${resp}\`\`\``);
+                    .addField("Output", `\`\`\`\n${resp.data.queryresult.pods[1].subpods[0].plaintext}\`\`\``);
                 return send({embeds: [embed]});
             }
+        }
     })
 });

src/structures.ts

@@ -14,6 +14,7 @@ class ConfigStructure extends GenericStructure {
     public admins: string[];
     public support: string[];
     public lavalink: boolean | null;
+    public wolfram: string | null;
     public systemLogsChannel: string | null;
     public webhooks: {[id: string]: string}; // id-token pairs
 
@@ -25,6 +26,7 @@ class ConfigStructure extends GenericStructure {
         this.admins = select(data.admins, [], String, true);
         this.support = select(data.support, [], String, true);
         this.lavalink = select(data.lavalink, null, Boolean);
+        this.wolfram = select(data.wolfram, null, String);
         this.systemLogsChannel = select(data.systemLogsChannel, null, String);
         this.webhooks = {};