From e885919be313c8477d6e5e508334f061ecce6be7 Mon Sep 17 00:00:00 2001
From: ledlamp <ledlamp89@gmail.com>
Date: Fri, 11 May 2018 23:32:40 -0700
Subject: [PATCH] aaa
---
.gitignore | 1 -
.slugignore | 1 -
package.json | 5 +---
src/config.js | 25 ++++++++++++++++++++
src/main.js | 7 ++----
src/package-lock.json | 55 -------------------------------------------
6 files changed, 28 insertions(+), 66 deletions(-)
create mode 100644 src/config.js
delete mode 100755 src/package-lock.json
diff --git a/.gitignore b/.gitignore
index 9aecbdb..5e6c27e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
/local/
-/src/config.json
node_modules/
\ No newline at end of file
diff --git a/.slugignore b/.slugignore
index 8906628..92086b3 100644
--- a/.slugignore
+++ b/.slugignore
@@ -1,2 +1 @@
-/src/
/local/
\ No newline at end of file
diff --git a/package.json b/package.json
index 86c2c5e..f8d169c 100644
--- a/package.json
+++ b/package.json
@@ -5,9 +5,6 @@
"puppeteer": "^0.13.0",
"ws": "^3.3.2",
"mongodb": "^3.0.0-rc0",
- "decompress": "^4.2.0",
- "async-exit-hook": "^2.0.1",
- "socket.io-client": "^2.0.4",
- "striptags": "~3.1.1"
+ "async-exit-hook": "^2.0.1"
}
}
diff --git a/src/config.js b/src/config.js
new file mode 100644
index 0000000..5d10bf2
--- /dev/null
+++ b/src/config.js
@@ -0,0 +1,25 @@
+module.exports = {
+ "testmode": false,
+
+ "token": process.env.DISCORD_TOKEN,
+
+ "webhooks": {
+ "console": process.env.TOKEN_WEBHOOK_CONSOLE,
+ "welcome": process.env.TOKEN_WEBHOOK_WELCOME,
+ },
+
+ "opID": "281134216115257344",
+ "guildID": "321819041348190249",
+ "channels": {
+ "main": "321819041348190249"
+ },
+
+ "mppname": "[discord.gg/k44Eqha]",
+ "disabledRooms": [
+ "RP Room",
+ "Legends of Alorgon {RP Room}",
+ "Legends of Alorgon",
+ "Breastmilk ♥ 7:45 AM"
+ ]
+
+}
\ No newline at end of file
diff --git a/src/main.js b/src/main.js
index 5f1684a..3420dcf 100755
--- a/src/main.js
+++ b/src/main.js
@@ -1,7 +1,7 @@
global.exitHook = require('async-exit-hook');
global.Discord = require('discord.js');
global.fs = require('fs');
-global.config = require('./config.json');
+global.config = require('./config');
global.dClient = new Discord.Client({ disableEveryone: true });
console._log = console.log;
@@ -35,7 +35,7 @@ process.on('uncaughtException', error => {
(require('mongodb').MongoClient).connect(process.env.MONGODB_URI).then(client=>{
global.mdbClient = client;
- dClient.login(config.testmode ? config.test_token : config.token);
+ dClient.login(config.token);
});
dClient.once('ready', () => {
@@ -47,9 +47,6 @@ dClient.once('ready', () => {
require('./screenshotter.js');
require('./misc.js');
- // backup
- dClient.channels.get('394962139644690432').send(new Discord.MessageAttachment(global['files.zip'], 'files.zip'));
- delete global['files.zip'];
});
dClient.on('error', console.error);
dClient.on('warn', console.warn);
\ No newline at end of file
diff --git a/src/package-lock.json b/src/package-lock.json
deleted file mode 100755
index a90edb5..0000000
--- a/src/package-lock.json
+++ /dev/null
@@ -1,55 +0,0 @@
-{
- "requires": true,
- "lockfileVersion": 1,
- "dependencies": {
- "async-limiter": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/async-limiter/-/async-limiter-1.0.0.tgz",
- "integrity": "sha512-jp/uFnooOiO+L211eZOoSyzpOITMXx1rBITauYykG3BRYPu8h0UcxsPNB04RR5vo4Tyz3+ay17tR6JVf9qzYWg=="
- },
- "discord.js": {
- "version": "github:hydrabolt/discord.js#b186472785db6bbe7de37e1a75104d79dd0cc44f",
- "requires": {
- "pako": "1.0.6",
- "prism-media": "0.2.1",
- "snekfetch": "3.6.4",
- "tweetnacl": "1.0.0",
- "ws": "4.1.0"
- }
- },
- "pako": {
- "version": "1.0.6",
- "resolved": "https://registry.npmjs.org/pako/-/pako-1.0.6.tgz",
- "integrity": "sha512-lQe48YPsMJAig+yngZ87Lus+NF+3mtu7DVOBu6b/gHO1YpKwIj5AWjZ/TOS7i46HD/UixzWb1zeWDZfGZ3iYcg=="
- },
- "prism-media": {
- "version": "0.2.1",
- "resolved": "https://registry.npmjs.org/prism-media/-/prism-media-0.2.1.tgz",
- "integrity": "sha512-Kfp1+6gzjY6X8mqKHa6D3brX+BtMUPFwzAkz4zgtVPgbkA2XxhITROdfQXVurU4fuJsylFRwqo7ciQlQCm9hAw=="
- },
- "safe-buffer": {
- "version": "5.1.1",
- "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.1.tgz",
- "integrity": "sha512-kKvNJn6Mm93gAczWVJg7wH+wGYWNrDHdWvpUmHyEsgCtIwwo3bqPtV4tR5tuPaUhTOo/kvhVwd8XwwOllGYkbg=="
- },
- "snekfetch": {
- "version": "3.6.4",
- "resolved": "https://registry.npmjs.org/snekfetch/-/snekfetch-3.6.4.tgz",
- "integrity": "sha512-NjxjITIj04Ffqid5lqr7XdgwM7X61c/Dns073Ly170bPQHLm6jkmelye/eglS++1nfTWktpP6Y2bFXjdPlQqdw=="
- },
- "tweetnacl": {
- "version": "1.0.0",
- "resolved": "https://registry.npmjs.org/tweetnacl/-/tweetnacl-1.0.0.tgz",
- "integrity": "sha1-cT2LgY2kIGh0C/aDhtBHnmb8ins="
- },
- "ws": {
- "version": "4.1.0",
- "resolved": "https://registry.npmjs.org/ws/-/ws-4.1.0.tgz",
- "integrity": "sha512-ZGh/8kF9rrRNffkLFV4AzhvooEclrOH0xaugmqGsIfFgOE/pIz4fMc4Ef+5HSQqTEug2S9JZIWDR47duDSLfaA==",
- "requires": {
- "async-limiter": "1.0.0",
- "safe-buffer": "5.1.1"
- }
- }
- }
-}