From 8cffa16ca6b3d09dc4a7b84bf10f6b6616dcef16 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sun, 16 May 2021 11:37:00 +0200 Subject: [PATCH 1/9] remove shaChat --- Main.js | 4 ++-- cmds/fun/chat.js | 5 +++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/Main.js b/Main.js index 7bee20c..a5678a6 100644 --- a/Main.js +++ b/Main.js @@ -9,7 +9,7 @@ const sqlite = require('sqlite'); let configFile = require('./config.json'); const { errLog, trySend } = require('./resources/functions'); const { join } = require('path'); -const { chatAnswer } = require("./resources/shaChat"); +// const { chatAnswer } = require("./resources/shaChat"); require("./database/mongo"); client.registry @@ -42,7 +42,7 @@ client.on('ready', async () => { client.on("message", async msg => { if (msg.channel.id === "837178237322919966" && !msg.author.bot && !msg.content.toLowerCase().startsWith(client.commandPrefix+"chat")) { - chatAnswer(client, msg); + // chatAnswer(client, msg); } if (!msg.guild) { diff --git a/cmds/fun/chat.js b/cmds/fun/chat.js index 15c8a4b..a0533a9 100644 --- a/cmds/fun/chat.js +++ b/cmds/fun/chat.js @@ -1,7 +1,7 @@ 'use strict'; const commando = require("@iceprod/discord.js-commando"); -const { chatAnswer } = require("../../resources/shaChat"); +// const { chatAnswer } = require("../../resources/shaChat"); module.exports = class chat extends commando.Command { constructor(client) { @@ -13,6 +13,7 @@ module.exports = class chat extends commando.Command { }); } async run(msg) { - chatAnswer(this.client, msg); + return "Chat is currently unavailable."; + // chatAnswer(this.client, msg); } }; \ No newline at end of file From 0a9ee4bdd1da68334a01731c38bb4ec8a9f77eaa Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sun, 16 May 2021 12:09:52 +0200 Subject: [PATCH 2/9] remove puppeteer --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index d73dc77..7d16c09 100644 --- a/package.json +++ b/package.json @@ -15,7 +15,6 @@ "node": "^15.12.0", "node-fetch": "^2.6.1", "pup": "^0.0.2", - "puppeteer": "^9.0.0", "sqlite": "^4.0.21", "sqlite3": "^5.0.2", "utf-8-validate": "^5.0.4", From 3d5ec92e30167de1a7afc001cd9ea7dd2779ecb6 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sun, 16 May 2021 12:14:22 +0200 Subject: [PATCH 3/9] remove pup and nightmare --- package.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/package.json b/package.json index 7d16c09..e229e54 100644 --- a/package.json +++ b/package.json @@ -11,10 +11,8 @@ "fs-extra": "^9.1.0", "lodash": "^4.17.21", "mongodb": "^3.6.6", - "nightmare": "^3.0.2", "node": "^15.12.0", "node-fetch": "^2.6.1", - "pup": "^0.0.2", "sqlite": "^4.0.21", "sqlite3": "^5.0.2", "utf-8-validate": "^5.0.4", From 7444b4467a4d291ae37bd7d30063a6838a3c77b5 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sun, 16 May 2021 12:21:10 +0200 Subject: [PATCH 4/9] make erlpack optional --- package.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index e229e54..a7931d6 100644 --- a/package.json +++ b/package.json @@ -7,7 +7,6 @@ "cleverbot-node": "^0.3.11", "discord.js": "^12.5.2", "discord.js-commando": "^0.12.3", - "erlpack": "github:discord/erlpack", "fs-extra": "^9.1.0", "lodash": "^4.17.21", "mongodb": "^3.6.6", @@ -17,5 +16,8 @@ "sqlite3": "^5.0.2", "utf-8-validate": "^5.0.4", "zlib-sync": "^0.1.7" + }, + "optionalDependencies": { + "erlpack": "github:discord/erlpack" } } From 950d33d0034c6c35b1aed13a35f21e0ab98e98f7 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sun, 16 May 2021 13:02:24 +0200 Subject: [PATCH 5/9] Make db slaves ok --- database/mongo.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/database/mongo.js b/database/mongo.js index a0d97fe..857a8c1 100644 --- a/database/mongo.js +++ b/database/mongo.js @@ -11,6 +11,7 @@ dbClient.connect(e => { console.error(e); return process.exit(); } + dbClient.slaveOk(); console.log("Database connected!"); }); @@ -19,4 +20,4 @@ const database = dbClient.db("Shasha"); /** * @type {dbClient: MongoClient, database: Db} */ -module.exports = { dbClient, database } \ No newline at end of file +module.exports = { dbClient, database } From 9ebf7b1f91d7e2574e187667ffff27e3621caf67 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sun, 16 May 2021 13:06:31 +0200 Subject: [PATCH 6/9] Fix slaveok --- database/mongo.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/database/mongo.js b/database/mongo.js index 857a8c1..0729706 100644 --- a/database/mongo.js +++ b/database/mongo.js @@ -11,7 +11,7 @@ dbClient.connect(e => { console.error(e); return process.exit(); } - dbClient.slaveOk(); + dbClient.getMongo().slaveOk(); console.log("Database connected!"); }); From b855031e7fc775a9566d9b77abca86b0ce71e5f9 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sun, 16 May 2021 13:08:13 +0200 Subject: [PATCH 7/9] revert --- database/mongo.js | 1 - 1 file changed, 1 deletion(-) diff --git a/database/mongo.js b/database/mongo.js index 0729706..2280372 100644 --- a/database/mongo.js +++ b/database/mongo.js @@ -11,7 +11,6 @@ dbClient.connect(e => { console.error(e); return process.exit(); } - dbClient.getMongo().slaveOk(); console.log("Database connected!"); }); From 3406b04893efeca5de7226be23f1d259b53273a6 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sun, 30 May 2021 17:46:32 +0200 Subject: [PATCH 8/9] remove unused lines --- Main.js | 2 -- 1 file changed, 2 deletions(-) diff --git a/Main.js b/Main.js index d772c29..07c002a 100644 --- a/Main.js +++ b/Main.js @@ -13,8 +13,6 @@ const { errLog, trySend } = require('./resources/functions'); const { join } = require('path'); // const { chatAnswer } = require("./resources/shaChat"); require("./database/mongo"); -//const { chatAnswer } = require("./resources/shaChat"); -const { timestampAt } = require("./resources/debug"); client.registry .registerGroups([ From 36075a74428264dc236c8f85be5202467afd48b6 Mon Sep 17 00:00:00 2001 From: Daniel Bulant Date: Sun, 30 May 2021 17:53:36 +0200 Subject: [PATCH 9/9] bump neko counter --- cmds/image/neko.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmds/image/neko.js b/cmds/image/neko.js index 90cf592..ac8b4b9 100644 --- a/cmds/image/neko.js +++ b/cmds/image/neko.js @@ -14,7 +14,7 @@ module.exports = class neko extends commando.Command { } async run(msg) { const title = `${msg.guild ? msg.member.displayName : msg.author.username}! ~Nyann~ (UwU) <3`; - const image = `https://nekos.best/nekos/${String(Math.floor(Math.random() * 314)).padStart(4, '0')}.png`; + const image = `https://nekos.best/nekos/${String(Math.floor(Math.random() * 450)).padStart(4, '0')}.png`; const emb = await defaultImageEmbed(msg, image, title); return trySend(this.client, msg, emb); }