chore: organized import ordering

.eslintrc.json

@@ -54,12 +54,13 @@
     },
     "overrides": [
         {
-            "files": ["**/*.ts"],
+            "files": ["**/*.ts", "**/*.d.ts"],
             "rules": {
                 "@typescript-eslint/no-empty-interface": "warn",
                 "@typescript-eslint/no-inferrable-types": "off",
                 "@typescript-eslint/typedef": "error",
-                "@typescript-eslint/explicit-function-return-type": "error"
+                "@typescript-eslint/explicit-function-return-type": "error",
+                "@typescript-eslint/consistent-type-imports": ["error", { "prefer": "type-imports" }]
             }
         },
         {

src/database.ts

@@ -1,36 +1,36 @@
-import { set, connect as _connect, connection as _connection, Connection } from 'mongoose';
+import mongoose from 'mongoose';
 import { FuzzySearch } from 'mongoose-fuzzy-search-next';
+import { info } from '@/logger';
+import { COMMUNITY } from '@/models/communities';
+import { CONTENT } from '@/models/content';
+import { CONVERSATION } from '@/models/conversation';
+import { ENDPOINT } from '@/models/endpoint';
+import { NOTIFICATION } from '@/models/notifications';
+import { POST } from '@/models/post';
+import { SETTINGS } from '@/models/settings';
+import { REPORT } from '@/models/report';
+import type { HydratedCommunityDocument, ICommunity } from '@/types/mongoose/communities';
+import type { HydratedPostDocument, IPost } from '@/types/mongoose/post';
+import type { HydratedEndpointDocument } from '@/types/mongoose/endpoint';
+import type { HydratedSettingsDocument } from '@/types/mongoose/settings';
+import type { HydratedContentDocument, IContent } from '@/types/mongoose/content';
+import type { HydratedConversationDocument } from '@/types/mongoose/conversation';
+import type { HydratedNotificationDocument } from '@/types/mongoose/notifications';
+import type { HydratedReportDocument } from '@/types/mongoose/report';
 import { mongoose as mongooseConfig } from '../config.json';
-import { COMMUNITY } from './models/communities';
-import { CONTENT } from './models/content';
-import { CONVERSATION } from './models/conversation';
-import { ENDPOINT } from './models/endpoint';
-import { NOTIFICATION } from './models/notifications';
-import { POST } from './models/post';
-import { SETTINGS } from './models/settings';
-import { REPORT } from './models/report';
 
 const { uri, database, options } = mongooseConfig;
-import { info } from './logger';
-import { HydratedCommunityDocument, ICommunity } from './types/mongoose/communities';
-import { HydratedPostDocument, IPost } from './types/mongoose/post';
-import { HydratedEndpointDocument } from './types/mongoose/endpoint';
-import { HydratedSettingsDocument } from './types/mongoose/settings';
-import { HydratedContentDocument, IContent } from './types/mongoose/content';
-import { HydratedConversationDocument } from './types/mongoose/conversation';
-import { HydratedNotificationDocument } from './types/mongoose/notifications';
-import { HydratedReportDocument } from './types/mongoose/report';
-
-let connection: Connection;
-set('strictQuery', true);
+
+let connection: mongoose.Connection;
+mongoose.set('strictQuery', true);
 
 export async function connect(): Promise<void> {
-	await _connect(`${uri}/${database}`, options);
-	connection = _connection;
-	connection.on('connected', function (this: Connection) {
+	await mongoose.connect(`${uri}/${database}`, options);
+	connection = mongoose.connection;
+	connection.on('connected', function (this: mongoose.Connection) {
 		info(`MongoDB connected ${this.name}`);
 	});
-	// Should this use the logger?
+	// ? Should this use the logger?
 	connection.on('error', console.error.bind(console, 'connection error:'));
 	connection.on('close', () => {
 		connection.removeAllListeners();

src/middleware/checkBan.ts

@@ -1,7 +1,7 @@
-import config from '../../config.json';
 import moment from 'moment/moment';
-import db from '../database';
-import { Request, Response, NextFunction } from 'express';
+import db from '@/database';
+import type { Request, Response, NextFunction } from 'express';
+import config from '../../config.json';
 
 export async function checkBan(request: Request, response: Response, next: NextFunction): Promise<void> {
 	if (!request.user && !request.guest_access && request.path !== '/login') {

src/middleware/consoleAuth.ts

@@ -1,7 +1,7 @@
-import { User } from '@/types/common/user';
+import util from '@/util';
+import type { User } from '@/types/common/user';
+import type { Request, Response, NextFunction } from 'express';
 import config from '../../config.json';
-import util from '../util';
-import { Request, Response, NextFunction } from 'express';
 
 export async function auth(request: Request, response: Response, next: NextFunction): Promise<void> {
 

src/middleware/detectVersion.ts

@@ -1,5 +1,5 @@
-import util from '../util';
-import { Request, Response, NextFunction } from 'express';
+import util from '@/util';
+import type { Request, Response, NextFunction } from 'express';
 
 export async function detectVersion(request: Request, response: Response, next: NextFunction): Promise<void> {
 	request.timerDate = Date.now();

src/middleware/discovery.ts

@@ -1,6 +1,6 @@
+import db from '@/database';
+import type { Request, Response, NextFunction } from 'express';
 import config from '../../config.json';
-import db from '../database';
-import { Request, Response, NextFunction } from 'express';
 
 export async function checkDiscovery(request: Request, response: Response, next: NextFunction): Promise<void> {
 	const discovery = await db.getEndPoint(config.server_environment);

src/middleware/staticFiles.ts

@@ -1,5 +1,5 @@
-import util from '../util';
-import { Request, Response, NextFunction } from 'express';
+import util from '@/util';
+import type { Request, Response, NextFunction } from 'express';
 
 export async function staticFiles(request: Request, response: Response, next: NextFunction): Promise<void> {
 	// Web files

src/middleware/webAuth.ts

@@ -1,5 +1,5 @@
-import util from '../util';
-import { Request, Response, NextFunction } from 'express';
+import util from '@/util';
+import type { Request, Response, NextFunction } from 'express';
 
 export async function webAuth(request: Request, response: Response, next: NextFunction): Promise<void> {
 	// Get pid and fetch user data

src/models/communities.ts

@@ -1,5 +1,5 @@
-import { CommunityModel, HydratedCommunityDocument, ICommunity, ICommunityMethods, IPermissions, PermissionsModel } from '@/types/mongoose/communities';
 import { Schema, model } from 'mongoose';
+import type { CommunityModel, HydratedCommunityDocument, ICommunity, ICommunityMethods, IPermissions, PermissionsModel } from '@/types/mongoose/communities';
 
 export const PermissionsSchema = new Schema<IPermissions, PermissionsModel>({
 	open: {

src/models/content.ts

@@ -1,5 +1,5 @@
-import { ContentModel, HydratedContentDocument, IContent, IContentMethods } from '@/types/mongoose/content';
 import { Schema, model } from 'mongoose';
+import type { ContentModel, HydratedContentDocument, IContent, IContentMethods } from '@/types/mongoose/content';
 
 export const ContentSchema = new Schema<IContent, ContentModel, IContentMethods>({
 	pid: Number,

src/models/conversation.ts

@@ -1,6 +1,6 @@
-import { ConversationModel, HydratedConversationDocument, IConversation, IConversationMethods, IUser, UserModel } from '@/types/mongoose/conversation';
 import { Schema, model } from 'mongoose';
 import { Snowflake } from 'node-snowflake';
+import type { ConversationModel, HydratedConversationDocument, IConversation, IConversationMethods, IUser, UserModel } from '@/types/mongoose/conversation';
 
 const user = new Schema<IUser, UserModel>({
 	pid: Number,

src/models/endpoint.ts

@@ -1,5 +1,5 @@
-import { EndpointModel, IEndpoint } from '@/types/mongoose/endpoint';
 import { Schema, model } from 'mongoose';
+import type { EndpointModel, IEndpoint } from '@/types/mongoose/endpoint';
 
 export const endpointSchema = new Schema<IEndpoint, EndpointModel>({
 	status: Number,

src/models/notifications.ts

@@ -1,5 +1,5 @@
-import { HydratedNotificationDocument, INotification, INotificationMethods, NotificationModel } from '@/types/mongoose/notifications';
 import { Schema, model } from 'mongoose';
+import type { HydratedNotificationDocument, INotification, INotificationMethods, NotificationModel } from '@/types/mongoose/notifications';
 
 export const NotificationSchema = new Schema<INotification, NotificationModel, INotificationMethods>({
 	pid: String,

src/models/post.ts

@@ -1,5 +1,5 @@
-import { HydratedPostDocument, IPost, IPostMethods, PostModel } from '@/types/mongoose/post';
 import { Schema, model } from 'mongoose';
+import type { HydratedPostDocument, IPost, IPostMethods, PostModel } from '@/types/mongoose/post';
 
 export const PostSchema = new Schema<IPost, PostModel, IPostMethods>({
 	id: String,

src/models/report.ts

@@ -1,5 +1,5 @@
-import { HydratedReportDocument, IReport, IReportMethods, ReportModel } from '@/types/mongoose/report';
 import { Schema, model } from 'mongoose';
+import type { HydratedReportDocument, IReport, IReportMethods, ReportModel } from '@/types/mongoose/report';
 
 export const ReportSchema = new Schema<IReport, ReportModel, IReportMethods>({
 	pid: Number,

src/models/settings.ts

@@ -1,5 +1,5 @@
-import { HydratedSettingsDocument, ISettings, ISettingsMethods, SettingsModel } from '@/types/mongoose/settings';
 import { Schema, model } from 'mongoose';
+import type { HydratedSettingsDocument, ISettings, ISettingsMethods, SettingsModel } from '@/types/mongoose/settings';
 
 export const SettingsSchema = new Schema<ISettings, SettingsModel, ISettingsMethods>({
 	pid: Number,

src/redisCache.ts

@@ -1,6 +1,7 @@
 import redis from 'redis';
-import logger from './logger';
+import logger from '@/logger';
 import config from '../config.json';
+
 const { host, port } = config.redis;
 
 export const redisClient = redis.createClient({ socket: { host, port } });

src/server.ts

@@ -1,15 +1,15 @@
-process.title = 'Pretendo - Juxt-Web';
-
 import express from 'express';
 import morgan from 'morgan';
 import cookieParser from 'cookie-parser';
 import session from 'express-session';
 import { default as RedisStore } from 'connect-redis';
-import database from './database';
-import logger from './logger';
-import { redisClient } from './redisCache';
+import logger from '@/logger';
+import database from '@/database';
+import { redisClient } from '@/redisCache';
+import juxt_web from '@/services/juxt-web';
 import config from '../config.json';
-import juxt_web from './services/juxt-web';
+
+process.title = 'Pretendo - Juxt-Web';
 
 const { http: { port } } = config;
 const app = express();

src/services/juxt-web/routes/admin/admin.ts

@@ -1,11 +1,11 @@
-import express from 'express';
-import database from '../../../../database';
-import { POST } from '../../../../models/post';
-import { SETTINGS } from '../../../../models/settings';
-import util from '../../../../util';
 import moment from 'moment';
+import express from 'express';
+import database from '@/database';
+import { POST } from '@/models/post';
+import { SETTINGS } from '@/models/settings';
+import util from '@/util';
+import type { HydratedPostDocument } from '@/types/mongoose/post';
 import config from '../../../../../config.json';
-import { HydratedPostDocument } from '@/types/mongoose/post';
 
 const router = express.Router();
 
@@ -15,7 +15,7 @@ router.get('/posts', async function (req, res): Promise<void> {
 	}
 
 	const reports = await database.getAllOpenReports();
-	const communityMap = await util.getCommunityHash();
+	const communityMap = util.getCommunityHash();
 	const userContent = await database.getUserContent(req.pid);
 	const userMap = util.getUserHash();
 	const postIDs = reports.map(obj => obj.post_id);
@@ -60,7 +60,7 @@ router.get('/accounts', async function (req, res) {
 	const limit = 20;
 
 	const users = search ? await database.getUserSettingsFuzzySearch(search, limit, page * limit) : await database.getUsersContent(limit, page * limit);
-	const userMap = await util.getUserHash();
+	const userMap = util.getUserHash();
 
 	res.render(req.directory + '/users.ejs', {
 		lang: req.lang,

src/services/juxt-web/routes/console/communities.ts

@@ -1,14 +1,14 @@
 import express from 'express';
-import database from '../../../../database';
-import util from '../../../../util';
-import config from '../../../../../config.json';
 import multer from 'multer';
 import moment from 'moment';
-import { POST } from '../../../../models/post';
-import { COMMUNITY } from '../../../../models/communities';
-import redis from '../../../../redisCache';
-import { HydratedCommunityDocument, ICommunity } from '@/types/mongoose/communities';
-import { HydratedPostDocument } from '@/types/mongoose/post';
+import database from '@/database';
+import util from '@/util';
+import { POST } from '@/models/post';
+import { COMMUNITY } from '@/models/communities';
+import redis from '@/redisCache';
+import type { HydratedCommunityDocument, ICommunity } from '@/types/mongoose/communities';
+import type { HydratedPostDocument } from '@/types/mongoose/post';
+import config from '../../../../../config.json';
 
 const upload = multer({dest: 'uploads/'});
 const router = express.Router();
@@ -120,7 +120,7 @@ router.get('/:communityID/:type', async function (req, res) {
 
 	if (!community.permissions) {
 		community.permissions = {
-			open: false,
+			open: (community as any).open,
 			minimum_new_post_access_level: 0,
 			minimum_new_comment_access_level: 0,
 			minimum_new_community_access_level: 0

src/services/juxt-web/routes/console/feed.ts

@@ -1,9 +1,9 @@
 import express from 'express';
-import database from '../../../../database';
-import util from '../../../../util';
-import config from '../../../../../config.json';
 import moment from 'moment';
-import { HydratedPostDocument } from '@/types/mongoose/post';
+import database from '@/database';
+import util from '@/util';
+import type { HydratedPostDocument } from '@/types/mongoose/post';
+import config from '../../../../../config.json';
 
 const router = express.Router();
 

src/services/juxt-web/routes/console/messages.ts

@@ -1,13 +1,13 @@
+import crypto from 'crypto';
 import express from 'express';
-import database from '../../../../database';
-import util from '../../../../util';
-import config from '../../../../../config.json';
-import { POST } from '../../../../models/post';
 import moment from 'moment';
-import { CONVERSATION } from '../../../../models/conversation';
-import crypto from 'crypto';
-import { IPost } from '@/types/mongoose/post';
 import { Snowflake as snowflake } from 'node-snowflake';
+import database from '@/database';
+import util from '@/util';
+import { POST } from '@/models/post';
+import { CONVERSATION } from '@/models/conversation';
+import type { IPost } from '@/types/mongoose/post';
+import config from '../../../../../config.json';
 
 const router = express.Router();
 

src/services/juxt-web/routes/console/notifications.ts

@@ -1,8 +1,9 @@
 import express from 'express';
-import database from '../../../../database';
-import config from '../../../../../config.json';
-import util from '../../../../util';
 import moment from 'moment';
+import database from '@/database';
+import util from '@/util';
+import config from '../../../../../config.json';
+
 const router = express.Router();
 
 router.get('/my_news', async function (req, res) {

src/services/juxt-web/routes/console/posts.ts

@@ -1,16 +1,16 @@
+import crypto from 'crypto';
 import express from 'express';
-import database from '../../../../database';
-import util from '../../../../util';
-import config from '../../../../../config.json';
-import { POST } from '../../../../models/post';
 import multer from 'multer';
 import moment from 'moment';
 import rateLimit from 'express-rate-limit';
-import { REPORT } from '../../../../models/report';
-import crypto from 'crypto';
-import redis from '../../../../redisCache';
-import { Request, Response } from 'express';
-import { IPost } from '@/types/mongoose/post';
+import database from '../../../../database';
+import util from '@/util';
+import redis from '@/redisCache';
+import { POST } from '@/models/post';
+import { REPORT } from '@/models/report';
+import type { Request, Response } from 'express';
+import type { IPost } from '@/types/mongoose/post';
+import config from '../../../../../config.json';
 
 const upload = multer({dest: 'uploads/'});
 const router = express.Router();

src/services/juxt-web/routes/console/show.ts

@@ -1,6 +1,6 @@
 import express from 'express';
-import database from '../../../../database';
-import util from '../../../../util';
+import database from '@/database';
+import util from '@/util';
 import config from '../../../../../config.json';
 
 const router = express.Router();

src/services/juxt-web/routes/console/topics.ts

@@ -1,9 +1,9 @@
 import express from 'express';
-import database from '../../../../database';
-import util from '../../../../util';
-import config from '../../../../../config.json';
 import moment from 'moment';
-import { POST } from '../../../../models/post';
+import database from '@/database';
+import util from '@/util';
+import { POST } from '@/models/post';
+import config from '../../../../../config.json';
 
 const router = express.Router();