diff --git a/configs/main.js.example b/configs/main.js.example index 2e8c1e6a..778d2c21 100644 --- a/configs/main.js.example +++ b/configs/main.js.example @@ -2,6 +2,7 @@ module.exports = { //mongodb connection string dbURL: 'mongodb://username:password@localhost:27017', + dbName: 'jschan', //redis connection info redis: { diff --git a/db/accounts.js b/db/accounts.js index 91f87c95..1c892fd1 100644 --- a/db/accounts.js +++ b/db/accounts.js @@ -1,7 +1,7 @@ 'use strict'; const Mongo = require(__dirname+'/db.js') - , db = Mongo.client.db('jschan').collection('accounts') + , db = Mongo.db.collection('accounts') , bcrypt = require('bcrypt') , cache = require(__dirname+'/../redis.js'); diff --git a/db/bans.js b/db/bans.js index 62b4f937..95124b0b 100644 --- a/db/bans.js +++ b/db/bans.js @@ -2,7 +2,7 @@ 'use strict'; const Mongo = require(__dirname+'/db.js') - , db = Mongo.client.db('jschan').collection('bans'); + , db = Mongo.db.collection('bans'); module.exports = { diff --git a/db/boards.js b/db/boards.js index 0505182f..3443fd57 100644 --- a/db/boards.js +++ b/db/boards.js @@ -3,7 +3,7 @@ const Mongo = require(__dirname+'/db.js') , cache = require(__dirname+'/../redis.js') , dynamicResponse = require(__dirname+'/../helpers/dynamic.js') - , db = Mongo.client.db('jschan').collection('boards'); + , db = Mongo.db.collection('boards'); module.exports = { diff --git a/db/bypass.js b/db/bypass.js index 15b455b2..0bbfd205 100644 --- a/db/bypass.js +++ b/db/bypass.js @@ -2,7 +2,7 @@ const Mongo = require(__dirname+'/db.js') , { blockBypass } = require(__dirname+'/../configs/main.js') - , db = Mongo.client.db('jschan').collection('bypass'); + , db = Mongo.db.collection('bypass'); module.exports = { diff --git a/db/captchas.js b/db/captchas.js index 37efabf8..cdc1ff8b 100644 --- a/db/captchas.js +++ b/db/captchas.js @@ -1,7 +1,7 @@ 'use strict'; const Mongo = require(__dirname+'/db.js') - , db = Mongo.client.db('jschan').collection('captcha'); + , db = Mongo.db.collection('captcha'); module.exports = { diff --git a/db/db.js b/db/db.js index 2df13386..426dfe2f 100644 --- a/db/db.js +++ b/db/db.js @@ -14,11 +14,11 @@ module.exports = { useNewUrlParser: true, useUnifiedTopology: true }); + module.exports.db = module.exports.client.db(configs.dbName); }, checkVersion: async() => { - const currentVersion = await module.exports.client - .db('jschan') + const currentVersion = await module.exports.db .collection('version') .findOne({ '_id': 'version' }) .then(res => res.version); diff --git a/db/files.js b/db/files.js index 988a902e..f1e71bb4 100644 --- a/db/files.js +++ b/db/files.js @@ -3,7 +3,7 @@ const Mongo = require(__dirname+'/db.js') , Boards = require(__dirname+'/boards.js') , formatSize = require(__dirname+'/../helpers/files/formatsize.js') - , db = Mongo.client.db('jschan').collection('files') + , db = Mongo.db.collection('files') module.exports = { diff --git a/db/modlogs.js b/db/modlogs.js index fb87e3d6..a87c48d5 100644 --- a/db/modlogs.js +++ b/db/modlogs.js @@ -1,7 +1,7 @@ 'use strict'; const Mongo = require(__dirname+'/db.js') - , db = Mongo.client.db('jschan').collection('modlog'); + , db = Mongo.db.collection('modlog'); module.exports = { diff --git a/db/news.js b/db/news.js index 8b2d3a3a..13693057 100644 --- a/db/news.js +++ b/db/news.js @@ -2,7 +2,7 @@ 'use strict'; const Mongo = require(__dirname+'/db.js') - , db = Mongo.client.db('jschan').collection('news'); + , db = Mongo.db.collection('news'); module.exports = { diff --git a/db/posts.js b/db/posts.js index 639e3215..6232b45b 100644 --- a/db/posts.js +++ b/db/posts.js @@ -3,7 +3,7 @@ const Mongo = require(__dirname+'/db.js') , Boards = require(__dirname+'/boards.js') , Stats = require(__dirname+'/stats.js') - , db = Mongo.client.db('jschan').collection('posts') + , db = Mongo.db.collection('posts') , { quoteLimit, previewReplies, stickyPreviewReplies , early404Replies, early404Fraction } = require(__dirname+'/../configs/main.js'); diff --git a/db/ratelimits.js b/db/ratelimits.js index 6efe2b55..2f925cb9 100644 --- a/db/ratelimits.js +++ b/db/ratelimits.js @@ -1,7 +1,7 @@ 'use strict'; const Mongo = require(__dirname+'/db.js') - , db = Mongo.client.db('jschan').collection('ratelimit'); + , db = Mongo.db.collection('ratelimit'); module.exports = { diff --git a/db/stats.js b/db/stats.js index d13f4606..9efe266b 100644 --- a/db/stats.js +++ b/db/stats.js @@ -2,7 +2,7 @@ 'use strict'; const Mongo = require(__dirname+'/db.js') - , db = Mongo.client.db('jschan').collection('poststats'); + , db = Mongo.db.collection('poststats'); module.exports = { diff --git a/db/webring.js b/db/webring.js index 27e35033..6f12583e 100644 --- a/db/webring.js +++ b/db/webring.js @@ -1,7 +1,7 @@ 'use strict'; const Mongo = require(__dirname+'/db.js') - , db = Mongo.client.db('jschan').collection('webring'); + , db = Mongo.db.collection('webring'); module.exports = { diff --git a/gulpfile.js b/gulpfile.js index cfa7de40..46caf0f1 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -45,7 +45,7 @@ async function wipe() { const Mongo = require(__dirname+'/db/db.js') const Redis = require(__dirname+'/redis.js') await Mongo.connect(); - const db = Mongo.client.db('jschan'); + const db = Mongo.db; //make these because mongo is dumb and doesnt make them automatically await db.createCollection('accounts'); @@ -313,7 +313,7 @@ async function migrate() { const Mongo = require(__dirname+'/db/db.js') const Redis = require(__dirname+'/redis.js') await Mongo.connect(); - const db = Mongo.client.db('jschan'); + const db = Mongo.db; //get current version from db if present (set in 'reset' task in recent versions) let currentVersion = await db.collection('version').findOne({ diff --git a/schedules/webring.js b/schedules/webring.js index b39f470a..a79a0b30 100644 --- a/schedules/webring.js +++ b/schedules/webring.js @@ -60,7 +60,7 @@ module.exports = async () => { if (webringBoards.length > 0) { //$out from temp collection to replace webring boards - const tempCollection = Mongo.client.db('jschan').collection('tempwebring'); + const tempCollection = Mongo.db.collection('tempwebring'); await tempCollection.insertMany(webringBoards); await tempCollection.aggregate([ { $out : 'webring' }