Additional refactoring whoa

Author: johnholdun

package-lock.json

@@ -17,6 +17,7 @@
     "csv-stringify": "^6.4.2",
     "dotenv": "^16.0.3",
     "es6-promisify": "^7.0.0",
+    "escape-html": "^1.0.3",
     "express": "^4.18.2",
     "express-basic-auth": "^1.2.1",
     "express-handlebars": "^6.0.7",
@@ -26,8 +27,7 @@
     "open-graph-scraper": "^5.2.3",
     "sqlite": "^5.0.1",
     "sqlite3": "^5.1.5",
-    "string-strip-html": "^13.4.2",
-    "escape-html": "^1.0.3"
+    "string-strip-html": "^13.4.2"
   },
   "engines": {
     "node": ">=16.x"
@@ -49,6 +49,7 @@
     "eslint": "^8.43.0",
     "eslint-config-airbnb-base": "^15.0.0",
     "eslint-config-prettier": "^9.0.0",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-node": "^11.1.0",
     "eslint-plugin-prettier": "^5.0.0",
     "nodemon": "^2.0.20",

package.json

@@ -7,8 +7,8 @@ import escapeHTML from 'escape-html';
 import { domain, simpleLogger, getActorInfo, replaceEmptyText } from './src/util.js';
 import session, { isAuthenticated } from './src/session-auth.js';
 import * as bookmarksDb from './src/bookmarks-db.js';
-import * as apDb from './src/activity-pub-db.js';
 import * as db from './src/database.js';
+import './src/boot.js';
 
 import routes from './src/routes/index.js';
 
@@ -31,7 +31,6 @@ app.use(async (req, res, next) => {
 });
 
 app.set('bookmarksDb', bookmarksDb);
-app.set('apDb', apDb);
 app.set('db', db);
 app.set('domain', domain);