a

Author: undefined-moe

development.js

@@ -23,10 +23,10 @@ async function run() {
     let config;
     try {
         config = require('./config.js');
-        config.lib = ['@'];
         config.middleware = [
             hydro.handler.trace,
-            '@',
+            hydro.handler.nunjucks,
+            hydro.handler.log,
             hydro.handler.base,
             hydro.handler.user
         ];
@@ -40,7 +40,6 @@ async function run() {
             ]
         };
         config.perm = require('./permission.js');
-        config.deploy = require('./scripts/deploy.js');
         config.constants = {
             MODE_NAME: ['osu!', 'osu!taiko', 'osu!catch', 'osu!mania']
         };

handler/bbs/main.js

@@ -21,7 +21,12 @@ exports.handler = class {
         queue = await Promise.all(queue);
         for (let i in queue) comment.reply[i].author = queue;
     }
+    async prepare() {
+        let cfg = await this.lib.config.get('categories');
+        if (!cfg) await this.lib.config.set('categories', [{ id: 'default', name: 'Default Category' }]);
+    }
     async init() {
+        await this.prepare();
         this.router
             .get('/', async ctx => {
                 let categories = await this.lib.conf.get('categories');
@@ -161,3 +166,5 @@ exports.handler = class {
         return this.router;
     }
 };
+exports.depends = ['database', 'user'];
+exports.id = 'bbs.main';

handler/bbs/message.js

@@ -1,4 +1,5 @@
 const
+    MESSAGES_PER_PAGE = 50,
     Router = require('koa-router'),
     { ObjectID } = require('bson'),
     { PermissionError, NotFoundError } = require('hydro-framework').errors,
@@ -18,14 +19,18 @@ exports.handler = class {
         this.router
             .get('/m', async ctx => {
                 if (!ctx.state.user._id) throw new PermissionError('You are not logged in!');
-                let messages = await this.db.collection('message').find({ user: ctx.state.user._id }).toArray();
+                let page = ctx.query.page || 1;
+                let messages = await this.lib.message.find({ uid: ctx.state.user._id })
+                    .skip((page - 1) * MESSAGES_PER_PAGE)
+                    .limit(MESSAGES_PER_PAGE)
+                    .toArray();
                 await ctx.render('message', { messages });
             })
             .post('/m/ack/:id', async ctx => {
-                let message = await this.db.collection('message').findOne({ _id: ctx.params.id, user: ctx.state.user._id });
-                if (!message) throw new NotFoundError('Message not found!');
-                await this.db.collection('message').delete({ _id: ctx.params.id, user: ctx.state.user._id });
+                await this.lib.message.ack(ctx.params.id, ctx.state.user._id);
             });
         return this.router;
     }
-};
+};
+exports.depends = ['database', 'user'];
+exports.id = 'bbs.message';

handler/file/main.js

@@ -24,3 +24,4 @@ exports.handler = class {
         return this.router;
     }
 };
+exports.depends = ['database', 'user'];

handler/main/api.js

@@ -27,3 +27,4 @@ exports.handler = class {
         return this.router;
     }
 };
+exports.depends = ['database', 'user'];

handler/main/main.js

@@ -46,3 +46,4 @@ exports.handler = class {
         return this.router;
     }
 };
+exports.depends = ['database', 'user'];

package.json

@@ -23,12 +23,9 @@
   "homepage": "https://github.com/sayobot-dev/bbs#readme",
   "dependencies": {
     "axios": "^0.19.0",
-    "hydro-framework": "^0.0.3"
+    "hydro-framework": "^0.0.4"
   },
   "devDependencies": {
     "eslint": "^6.5.1"
-  },
-  "optionalDependencies": {
-    "bbs-ui-default": "../bbs-ui-default"
   }
 }

scripts/deploy.js

@@ -32,9 +32,9 @@
     "@types/node" "*"
 
 "@types/node@*":
-  version "12.11.7"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.11.7.tgz#57682a9771a3f7b09c2497f28129a0462966524a"
-  integrity sha512-JNbGaHFCLwgHn/iCckiGSOZ1XYHsKFwREtzPwSGCVld1SGhOlmZw2D4ZI94HQCrBHbADzW9m4LER/8olJTRGHA==
+  version "12.12.6"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-12.12.6.tgz#a47240c10d86a9a57bb0c633f0b2e0aea9ce9253"
+  integrity sha512-FjsYUPzEJdGXjwKqSpE0/9QEh6kzhTAeObA54rn6j3rR4C/mzpI9L0KNfoeASSPMMdxIsoJuCLDWcM/rVjIsSA==
 
 a-sync-waterfall@^1.0.0:
   version "1.0.1"
@@ -202,14 +202,6 @@ axios@^0.19.0:
     follow-redirects "1.5.10"
     is-buffer "^2.0.2"
 
-babel-runtime@^6.9.2:
-  version "6.26.0"
-  resolved "https://registry.yarnpkg.com/babel-runtime/-/babel-runtime-6.26.0.tgz#965c7058668e82b55d7bfe04ff2337bc8b5647fe"
-  integrity sha1-llxwWGaOgrVde/4E/yM3vItWR/4=
-  dependencies:
-    core-js "^2.4.0"
-    regenerator-runtime "^0.11.0"
-
 [email protected]:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/backo2/-/backo2-1.0.2.tgz#31ab1ac8b129363463e35b3ebb69f4dfcfba7947"
@@ -255,11 +247,6 @@ basic-auth@~2.0.0:
   dependencies:
     safe-buffer "5.1.2"
 
-bbs-ui-default@../bbs-ui-default:
-  version "0.0.0"
-  dependencies:
-    fs-extra "^8.1.0"
-
 better-assert@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/better-assert/-/better-assert-1.0.2.tgz#40866b9e1b9e0b55b481894311e68faffaebc522"
@@ -277,11 +264,6 @@ [email protected]:
   resolved "https://registry.yarnpkg.com/blob/-/blob-0.0.5.tgz#d680eeef25f8cd91ad533f5b01eed48e64caf683"
   integrity sha512-gaqbzQPqOoamawKg0LGVd7SzLgXS+JH61oWprSLH+P+abTczqJbhTR8CmJ2u9/bUYNmHTGJx/UEmn6doAvvuig==
 
-bluebird@^3.1.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/bluebird/-/bluebird-3.7.1.tgz#df70e302b471d7473489acf26a93d63b53f874de"
-  integrity sha512-DdmyoGCleJnkbp3nkbxTLJ18rjDsE4yCggEwKNXkeV123sPNfOCYeDoeuOY+F2FrSjO1YXcTU+dsy96KMy+gcg==
-
 brace-expansion@^1.1.7:
   version "1.1.11"
   resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-1.1.11.tgz#3c7fcbf529d87226f3d2f52b966ff5271eb441dd"
@@ -539,11 +521,6 @@ copy-descriptor@^0.1.0:
   resolved "https://registry.yarnpkg.com/copy-descriptor/-/copy-descriptor-0.1.1.tgz#676f6eb3c39997c2ee1ac3a924fd6124748f578d"
   integrity sha1-Z29us8OZl8LuGsOpJP1hJHSPV40=
 
-core-js@^2.4.0:
-  version "2.6.10"
-  resolved "https://registry.yarnpkg.com/core-js/-/core-js-2.6.10.tgz#8a5b8391f8cc7013da703411ce5b585706300d7f"
-  integrity sha512-I39t74+4t+zau64EN1fE5v2W31Adtc/REhzWN+gWRRXg6WH5qAsZm62DHpQ1+Yhe4047T55jvzz7MUqF/dBBlA==
-
 core-util-is@~1.0.0:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/core-util-is/-/core-util-is-1.0.2.tgz#b5fd54220aa2bc5ab57aab7140c940754503c1a7"
@@ -976,15 +953,6 @@ fresh@~0.5.2:
   resolved "https://registry.yarnpkg.com/fresh/-/fresh-0.5.2.tgz#3d8cadd90d976569fa835ab1f8e4b23a105605a7"
   integrity sha1-PYyt2Q2XZWn6g1qx+OSyOhBWBac=
 
-fs-extra@^8.1.0:
-  version "8.1.0"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-8.1.0.tgz#49d43c45a88cd9677668cb7be1b46efdb8d2e1c0"
-  integrity sha512-yhlQgA6mnOJUKOsRUFsgJdQCvkKhcz8tlZG5HBQfReYZy46OwLcY+Zia0mtdHsOo9y/hP+CxMN0TU9QxoOtG4g==
-  dependencies:
-    graceful-fs "^4.2.0"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-minipass@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -1061,7 +1029,7 @@ globals@^11.7.0:
   resolved "https://registry.yarnpkg.com/globals/-/globals-11.12.0.tgz#ab8795338868a0babd8525758018c2a7eb95c42e"
   integrity sha512-WOBp/EEGUiIsJSp7wcv/y6MO+lV9UoncWqxuFfm8eBwzWNgyfBd6Gz+IeKQ9jCmyhoH99g15M3T+QaVHFjizVA==
 
-graceful-fs@^4.1.11, graceful-fs@^4.1.6, graceful-fs@^4.2.0:
+graceful-fs@^4.1.11:
   version "4.2.3"
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
@@ -1073,13 +1041,6 @@ gridfs-stream@^1.1.1:
   dependencies:
     flushwritable "^1.0.0"
 
-gridfs@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/gridfs/-/gridfs-1.0.0.tgz#fe75f2ce817d0078503fc60e1cbb665ac88ea477"
-  integrity sha1-/nXyzoF9AHhQP8YOHLtmWsiOpHc=
-  dependencies:
-    gridfs-stream "^1.1.1"
-
 has-binary2@~1.0.2:
   version "1.0.3"
   resolved "https://registry.yarnpkg.com/has-binary2/-/has-binary2-1.0.3.tgz#7776ac627f3ea77250cfc332dab7ddf5e4f5d11d"
@@ -1162,24 +1123,24 @@ http-errors@~1.6.2:
     setprototypeof "1.1.0"
     statuses ">= 1.4.0 < 2"
 
-hydro-framework@^0.0.3:
-  version "0.0.3"
-  resolved "https://registry.yarnpkg.com/hydro-framework/-/hydro-framework-0.0.3.tgz#c247428fe8c60490102502f21a7483227fa03b3b"
-  integrity sha512-b4PamhTZeb0KBBp0ZTGxkK2RlTUzxOQeXLyuc5q2AbAzXzEIBc/Dyo1A9CkZhDjZW7dgpmKEsv1qLvnUePWobw==
+hydro-framework@^0.0.4:
+  version "0.0.4"
+  resolved "https://registry.yarnpkg.com/hydro-framework/-/hydro-framework-0.0.4.tgz#8b6b7a9c75cc4a27d9342449aabf1b962ca87389"
+  integrity sha512-yC1qFm2uvDZqm1whKkOZk9hmf72QpKZD/Zl8ufkJBrfTDvmQbgaMZHkk3489+eAVPHWsUInfPsnZuJBVzUjbLw==
   dependencies:
     bson "^4.0.2"
-    gridfs "^1.0.0"
+    gridfs-stream "^1.1.1"
     js-yaml "^3.13.1"
     koa "^2.8.2"
     koa-body "^4.1.1"
     koa-morgan "^1.0.1"
-    koa-nunjucks-2 "^3.0.2"
     koa-router "^7.4.0"
     koa-send "^5.0.0"
     koa-static "^5.0.0"
     lodash "^4.17.15"
     mongodb "^3.3.2"
     nodemailer "^6.3.1"
+    nunjucks "^3.2.0"
     socket.io "^2.3.0"
 
 [email protected], iconv-lite@^0.4.24, iconv-lite@^0.4.4:
@@ -1466,13 +1427,6 @@ json-stable-stringify-without-jsonify@^1.0.1:
   resolved "https://registry.yarnpkg.com/json-stable-stringify-without-jsonify/-/json-stable-stringify-without-jsonify-1.0.1.tgz#9db7b59496ad3f3cfef30a75142d2d930ad72651"
   integrity sha1-nbe1lJatPzz+8wp1FC0tkwrXJlE=
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 keygrip@~1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/keygrip/-/keygrip-1.1.0.tgz#871b1681d5e159c62a445b0c74b615e0917e7226"
@@ -1540,18 +1494,6 @@ koa-morgan@^1.0.1:
   dependencies:
     morgan "^1.6.1"
 
-koa-nunjucks-2@^3.0.2:
-  version "3.0.2"
-  resolved "https://registry.yarnpkg.com/koa-nunjucks-2/-/koa-nunjucks-2-3.0.2.tgz#78b15a64a54d9234ae82cccf4a1bdbb966730208"
-  integrity sha512-KDiCRr8eWgMH1bMWb6b7cvoyWei6Kxtju7okHTK/yVmcNqNx+Kb+h+5CXXwNZhwEkb3XFgUc5nqYgSWLAPfwvA==
-  dependencies:
-    babel-runtime "^6.9.2"
-    bluebird "^3.1.1"
-    lodash.defaults "^4.0.0"
-    lodash.difference "^4.0.1"
-    lodash.merge "^4.0.1"
-    nunjucks "^3.0.0"
-
 koa-router@^7.4.0:
   version "7.4.0"
   resolved "https://registry.yarnpkg.com/koa-router/-/koa-router-7.4.0.tgz#aee1f7adc02d5cb31d7d67465c9eacc825e8c5e0"
@@ -1627,21 +1569,6 @@ levn@^0.3.0, levn@~0.3.0:
     prelude-ls "~1.1.2"
     type-check "~0.3.2"
 
-lodash.defaults@^4.0.0:
-  version "4.2.0"
-  resolved "https://registry.yarnpkg.com/lodash.defaults/-/lodash.defaults-4.2.0.tgz#d09178716ffea4dde9e5fb7b37f6f0802274580c"
-  integrity sha1-0JF4cW/+pN3p5ft7N/bwgCJ0WAw=
-
-lodash.difference@^4.0.1:
-  version "4.5.0"
-  resolved "https://registry.yarnpkg.com/lodash.difference/-/lodash.difference-4.5.0.tgz#9ccb4e505d486b91651345772885a2df27fd017c"
-  integrity sha1-nMtOUF1Ia5FlE0V3KIWi3yf9AXw=
-
-lodash.merge@^4.0.1:
-  version "4.6.2"
-  resolved "https://registry.yarnpkg.com/lodash.merge/-/lodash.merge-4.6.2.tgz#558aa53b43b661e1925a0afdfa36a9a1085fe57a"
-  integrity sha512-0KpjqXRVvrYyCsX1swR/XTK0va6VQkQM6MNo7PqW77ByjAhoARA8EfrP1N4+KlKj8YS0ZUCtRT/YUuhyYDujIQ==
-
 lodash@^4.17.12, lodash@^4.17.14, lodash@^4.17.15:
   version "4.17.15"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
@@ -1923,7 +1850,7 @@ number-is-nan@^1.0.0:
   resolved "https://registry.yarnpkg.com/number-is-nan/-/number-is-nan-1.0.1.tgz#097b602b53422a522c1afb8790318336941a011d"
   integrity sha1-CXtgK1NCKlIsGvuHkDGDNpQaAR0=
 
-nunjucks@^3.0.0:
+nunjucks@^3.2.0:
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/nunjucks/-/nunjucks-3.2.0.tgz#53e95f43c9555e822e8950008a201b1002d49933"
   integrity sha512-YS/qEQ6N7qCnUdm6EoYRBfJUdWNT0PpKbbRnogV2XyXbBm2STIP1O6yrdZHgwMVK7fIYUx7i8+yatEixnXSB1w==
@@ -2114,9 +2041,9 @@ punycode@^2.1.0:
   integrity sha512-XRsRjdf+j5ml+y/6GKHPZbrF/8p2Yga0JPtdqTIY2Xe5ohJPD9saDJJLPvp9+NSBprVvevdXZybnj2cv8OEd0A==
 
 qs@^6.4.0:
-  version "6.9.0"
-  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.0.tgz#d1297e2a049c53119cb49cca366adbbacc80b409"
-  integrity sha512-27RP4UotQORTpmNQDX8BHPukOnBP3p1uUJY5UnDhaJB+rMt9iMsok724XL+UHU23bEFOHRMQ2ZhI99qOWUMGFA==
+  version "6.9.1"
+  resolved "https://registry.yarnpkg.com/qs/-/qs-6.9.1.tgz#20082c65cb78223635ab1a9eaca8875a29bf8ec9"
+  integrity sha512-Cxm7/SS/y/Z3MHWSxXb8lIFqgqBowP5JMlTUFyJN88y0SGQhVmZnqFK/PeuMX9LzUyWsqqhNxIyg0jlzq946yA==
 
 raw-body@^2.2.0:
   version "2.4.1"
@@ -2160,11 +2087,6 @@ readdirp@^2.2.1:
     micromatch "^3.1.10"
     readable-stream "^2.0.2"
 
-regenerator-runtime@^0.11.0:
-  version "0.11.1"
-  resolved "https://registry.yarnpkg.com/regenerator-runtime/-/regenerator-runtime-0.11.1.tgz#be05ad7f9bf7d22e056f9726cee5017fbf19e2e9"
-  integrity sha512-MguG95oij0fC3QV3URf4V2SDYGJhJnJGqvIIgdECeODCT98wSWDAJ94SSuVpYQUoTcGUIL6L4yNB7j1DFFHSBg==
-
 regex-not@^1.0.0, regex-not@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/regex-not/-/regex-not-1.0.2.tgz#1f4ece27e00b0b65e0247a6810e6a85d83a5752c"
@@ -2693,11 +2615,6 @@ union-value@^1.0.0:
     is-extendable "^0.1.1"
     set-value "^2.0.1"
 
-universalify@^0.1.0:
-  version "0.1.2"
-  resolved "https://registry.yarnpkg.com/universalify/-/universalify-0.1.2.tgz#b646f69be3942dabcecc9d6639c80dc105efaa66"
-  integrity sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==
-
 [email protected]:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/unpipe/-/unpipe-1.0.0.tgz#b2bf4ee8514aae6165b4817829d21b2ef49904ec"