diff --git a/docker-compose.yml b/docker-compose.yml index 0d13efb..87d7124 100644 --- a/docker-compose.yml +++ b/docker-compose.yml @@ -6,13 +6,5 @@ services: context: . dockerfile: DOCKERFILE restart: always - networks: - db_system: - ipv4_address: 172.16.0.11 volumes: - - /home/lucien/chaisebot:/app - -networks: - db_system: - name : dbsystem_db_system - external: true \ No newline at end of file + - /home/lucien/chaisebot:/app \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 2e9f400..b98b8af 100644 --- a/package-lock.json +++ b/package-lock.json @@ -9,7 +9,7 @@ "version": "1.0.0", "license": "ISC", "dependencies": { - "@mistralai/mistralai": "^0.0.10", + "axios": "^1.6.7", "discord.js": "^14.12.1", "dotenv": "^16.3.1", "mysql": "^2.18.1", @@ -98,14 +98,6 @@ "node": ">=16.9.0" } }, - "node_modules/@mistralai/mistralai": { - "version": "0.0.10", - "resolved": "https://registry.npmjs.org/@mistralai/mistralai/-/mistralai-0.0.10.tgz", - "integrity": "sha512-fZOt7A32DcPSff58wTa44pKUBoJBH5toAuzNI9yoM7s5NjTupa1IYcSqqk2LigO8M5EtOEkFsD/XzdyWPnhaRA==", - "dependencies": { - "node-fetch": "^2.6.7" - } - }, "node_modules/@sapphire/async-queue": { "version": "1.5.0", "resolved": "https://registry.npmjs.org/@sapphire/async-queue/-/async-queue-1.5.0.tgz", @@ -165,11 +157,13 @@ "integrity": "sha512-Oei9OH4tRh0YqU3GxhX79dM/mwVgvbZJaSNaRk+bshkj0S5cfHcgYakreBjrHwatXKbz+IoIdYLxrKim2MjW0Q==" }, "node_modules/axios": { - "version": "0.26.1", - "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", - "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "version": "1.6.7", + "resolved": "https://registry.npmjs.org/axios/-/axios-1.6.7.tgz", + "integrity": "sha512-/hDJGff6/c7u0hDkvkGxR/oy6CbCs8ziCsC7SqmhjfozqiJGc8Z11wrv9z9lYfY4K8l+H9TpjcMDX0xOZmx+RA==", "dependencies": { - "follow-redirects": "^1.14.8" + "follow-redirects": "^1.15.4", + "form-data": "^4.0.0", + "proxy-from-env": "^1.1.0" } }, "node_modules/bignumber.js": { @@ -261,9 +255,9 @@ "integrity": "sha512-f3qQ9oQy9j2AhBe/H9VC91wLmKBCCU/gDOnKNAYG5hswO7BLKj09Hc5HYNz9cGI++xlpDCIgDaitVs03ATR84Q==" }, "node_modules/follow-redirects": { - "version": "1.15.2", - "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.2.tgz", - "integrity": "sha512-VQLG33o04KaQ8uYi2tVNbdrWp1QWxNNea+nmIB4EVM28v0hmP17z7aG1+wAkNzVq4KeXTq3221ye5qTJP91JwA==", + "version": "1.15.5", + "resolved": "https://registry.npmjs.org/follow-redirects/-/follow-redirects-1.15.5.tgz", + "integrity": "sha512-vSFWUON1B+yAw1VN4xMfxgn5fTUiaOzAJCKBwIIgT/+7CuGy9+r+5gITvP62j3RmaD5Ph65UaERdOSRGUzZtgw==", "funding": [ { "type": "individual", @@ -350,25 +344,6 @@ "node": ">= 0.6" } }, - "node_modules/node-fetch": { - "version": "2.7.0", - "resolved": "https://registry.npmjs.org/node-fetch/-/node-fetch-2.7.0.tgz", - "integrity": "sha512-c4FRfUm/dbcWZ7U+1Wq0AwCyFL+3nt2bEw05wfxSz+DWpWsitgmSgYmy2dQdWyKC1694ELPqMs/YzUSNozLt8A==", - "dependencies": { - "whatwg-url": "^5.0.0" - }, - "engines": { - "node": "4.x || >=6.0.0" - }, - "peerDependencies": { - "encoding": "^0.1.0" - }, - "peerDependenciesMeta": { - "encoding": { - "optional": true - } - } - }, "node_modules/openai": { "version": "3.3.0", "resolved": "https://registry.npmjs.org/openai/-/openai-3.3.0.tgz", @@ -378,11 +353,24 @@ "form-data": "^4.0.0" } }, + "node_modules/openai/node_modules/axios": { + "version": "0.26.1", + "resolved": "https://registry.npmjs.org/axios/-/axios-0.26.1.tgz", + "integrity": "sha512-fPwcX4EvnSHuInCMItEhAGnaSEXRBjtzh9fOtsE6E1G6p7vl7edEeZe11QHf18+6+9gR5PbKV/sGKNaD8YaMeA==", + "dependencies": { + "follow-redirects": "^1.14.8" + } + }, "node_modules/process-nextick-args": { "version": "2.0.1", "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz", "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==" }, + "node_modules/proxy-from-env": { + "version": "1.1.0", + "resolved": "https://registry.npmjs.org/proxy-from-env/-/proxy-from-env-1.1.0.tgz", + "integrity": "sha512-D+zkORCbA9f1tdWRK0RaCR3GPv50cMxcrz4X8k5LTSUD1Dkw47mKJEZQNunItRTkWwgtaUSo1RVFRIG9ZXiFYg==" + }, "node_modules/readable-stream": { "version": "2.3.7", "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz", @@ -426,11 +414,6 @@ "safe-buffer": "~5.1.0" } }, - "node_modules/tr46": { - "version": "0.0.3", - "resolved": "https://registry.npmjs.org/tr46/-/tr46-0.0.3.tgz", - "integrity": "sha512-N3WMsuqV66lT30CrXNbEjx4GEwlow3v6rr4mCcv6prnfwhS01rkgyFdjPNBYd9br7LpXV1+Emh01fHnq2Gdgrw==" - }, "node_modules/ts-mixer": { "version": "6.0.3", "resolved": "https://registry.npmjs.org/ts-mixer/-/ts-mixer-6.0.3.tgz", @@ -457,20 +440,6 @@ "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz", "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw==" }, - "node_modules/webidl-conversions": { - "version": "3.0.1", - "resolved": "https://registry.npmjs.org/webidl-conversions/-/webidl-conversions-3.0.1.tgz", - "integrity": "sha512-2JAn3z8AR6rjK8Sm8orRC0h/bcl/DqL7tRPdGZ4I1CjdF+EaMLmYxBHyXuKL849eucPFhvBoxMsflfOb8kxaeQ==" - }, - "node_modules/whatwg-url": { - "version": "5.0.0", - "resolved": "https://registry.npmjs.org/whatwg-url/-/whatwg-url-5.0.0.tgz", - "integrity": "sha512-saE57nupxk6v3HY35+jzBwYa0rKSy0XR8JSxZPwgLr7ys0IBzhGviA1/TUGJLmSVqs8pb9AnvICXEuOHLprYTw==", - "dependencies": { - "tr46": "~0.0.3", - "webidl-conversions": "^3.0.0" - } - }, "node_modules/ws": { "version": "8.13.0", "resolved": "https://registry.npmjs.org/ws/-/ws-8.13.0.tgz", diff --git a/package.json b/package.json index ced1ab1..0be50c5 100644 --- a/package.json +++ b/package.json @@ -1,15 +1,16 @@ { - "name": "chaise_bot_2.0", - "version": "1.0.0", + "name": "chaise_bot", + "version": "2.0.0", "description": "", "main": "index.js", "scripts": { - "dev": "nodemon bot.js" + "dev": "nodemon bot.js", + "start": "node bot.js" }, - "author": "", + "author": "Ninja Jambon", "license": "ISC", "dependencies": { - "@mistralai/mistralai": "^0.0.10", + "axios": "^1.6.7", "discord.js": "^14.12.1", "dotenv": "^16.3.1", "mysql": "^2.18.1", diff --git a/setupDatabase.js b/setupDatabase.js deleted file mode 100644 index 381b100..0000000 --- a/setupDatabase.js +++ /dev/null @@ -1,50 +0,0 @@ -var mysql = require('mysql'); -require('dotenv').config(); - -var con = mysql.createConnection({ - host: process.env.MYSQL_HOST, - user: process.env.MYSQL_USER, - password: process.env.MYSQL_PASSWORD -}); - -con.connect(function (err) { - if (err) throw err; - console.log("Connected!"); - con.query("CREATE DATABASE " + process.env.MYSQL_DATABASE, function (err, result) { - if (err) {console.log(err); return;} - console.log("Database created"); - }); - - con.query("USE " + process.env.MYSQL_DATABASE, function (err, result) { - if (err) {console.log(err); return;} - console.log("Using database"); - }); - - var sql = "drop table users;"; - - con.query(sql, function (err, result) { - if (err) {console.log(err); return;} - console.log("Table dropped"); - }); - - var sql = "CREATE TABLE users (id INT AUTO_INCREMENT PRIMARY KEY, username VARCHAR(255), userid VARCHAR(20), quota FLOAT);"; - - con.query(sql, function (err, result) { - if (err) {console.log(err); return;} - console.log("Table created"); - }); - - var sql = "drop table convs;"; - - con.query(sql, function (err, result) { - if (err) {console.log(err); return;} - console.log("Table dropped"); - }); - - var sql = "CREATE TABLE convs (id INT AUTO_INCREMENT PRIMARY KEY, userid VARCHAR(20), channelid VARCHAR(20), guildid VARCHAR(20));"; - - con.query(sql, function (err, result) { - if (err) {console.log(err); return;} - console.log("Table created"); - }); -}); \ No newline at end of file