Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
File renamed without changes.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -100,4 +100,7 @@ dist
.tern-port

# Local Netlify folder
.netlify
.netlify

# env
.env
4 changes: 2 additions & 2 deletions app.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import express from 'express';

import * as controllers from './controllers';
import * as middlewares from './middlewares';
import * as controllers from './controllers/index.js';
import * as middlewares from './middlewares/index.js';

const app = express();
app.set('view engine', 'jade');
Expand Down
2 changes: 1 addition & 1 deletion controllers/achievements.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import express from 'express';
import * as middlewares from '../middlewares';
import * as middlewares from '../middlewares/index.js';

export const router = express.Router();

Expand Down
2 changes: 1 addition & 1 deletion controllers/cache.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import express from 'express';
import { memjsClient } from '../utils/caches';
import { memjsClient } from '../utils/caches.js';

export const router = express.Router();

Expand Down
2 changes: 1 addition & 1 deletion controllers/guild.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import express from 'express';
import * as middlewares from '../middlewares';
import * as middlewares from '../middlewares/index.js';

export const router = express.Router();

Expand Down
2 changes: 1 addition & 1 deletion controllers/home.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import express from 'express';
import fs from 'fs';
import marked from 'marked';
import { marked } from 'marked';
import path from 'path';

export const router = express.Router();
Expand Down
16 changes: 8 additions & 8 deletions controllers/index.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
export { router as achievements } from './achievements';
export { router as cache } from './cache';
export { router as guild } from './guild';
export { router as home } from './home';
export { router as name } from './name';
export { router as pets } from './pets';
export { router as player } from './player';
export { router as quests } from './quests';
export { router as achievements } from './achievements.js';
export { router as cache } from './cache.js';
export { router as guild } from './guild.js';
export { router as home } from './home.js';
export { router as name } from './name.js';
export { router as pets } from './pets.js';
export { router as player } from './player.js';
export { router as quests } from './quests.js';
2 changes: 1 addition & 1 deletion controllers/name.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import express from 'express';
import * as middlewares from '../middlewares';
import * as middlewares from '../middlewares/index.js';

export const router = express.Router();

Expand Down
2 changes: 1 addition & 1 deletion controllers/pets.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import express from 'express';
import * as middlewares from '../middlewares';
import * as middlewares from '../middlewares/index.js';

export const router = express.Router();

Expand Down
2 changes: 1 addition & 1 deletion controllers/player.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import express from 'express';
import * as middlewares from '../middlewares';
import * as middlewares from '../middlewares/index.js';

export const router = express.Router();

Expand Down
2 changes: 1 addition & 1 deletion controllers/quests.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import express from 'express';
import * as middlewares from '../middlewares';
import * as middlewares from '../middlewares/index.js';

export const router = express.Router();

Expand Down
39 changes: 39 additions & 0 deletions eslint.config.mjs
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
import { defineConfig } from "eslint/config";
import onlyWarn from "eslint-plugin-only-warn";
import globals from "globals";
import path from "node:path";
import { fileURLToPath } from "node:url";
import js from "@eslint/js";
import { FlatCompat } from "@eslint/eslintrc";

const __filename = fileURLToPath(import.meta.url);
const __dirname = path.dirname(__filename);
const compat = new FlatCompat({
baseDirectory: __dirname,
recommendedConfig: js.configs.recommended,
allConfig: js.configs.all
});

export default defineConfig([
{
ignores: ["node_modules/**", "*.min.js", "coverage/**", "dist/**", "build/**"],
},
{
extends: compat.extends("eslint:recommended"),

plugins: {
"only-warn": onlyWarn,
},

languageOptions: {
globals: {
...globals.node,
},

ecmaVersion: 12,
sourceType: "module",
},

rules: {},
}
]);
4 changes: 2 additions & 2 deletions middlewares/guild.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
import { getHypixelGuild } from '../utils/requests';
import { sendHypixelError } from '../utils/errors';
import { getHypixelGuild } from '../utils/requests.js';
import { sendHypixelError } from '../utils/errors.js';

export async function guild(req, res, next) {
const slug = res.locals.slug;
Expand Down
22 changes: 11 additions & 11 deletions middlewares/index.js
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
export * from './cors'
export * from './guild'
export * from './mojang'
export * from './name'
export * from './names'
export * from './player'
export * from './ratelimit'
export * from './resources'
export * from './send'
export * from './slug'
export * from './status'
export * from './cors.js'
export * from './guild.js'
export * from './mojang.js'
export * from './name.js'
export * from './names.js'
export * from './player.js'
export * from './ratelimit.js'
export * from './resources.js'
export * from './send.js'
export * from './slug.js'
export * from './status.js'
6 changes: 3 additions & 3 deletions middlewares/mojang.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { memjsClient } from '../utils/caches';
import { filterMojang } from '../utils/filters';
import { getMojang } from '../utils/requests';
import { memjsClient } from '../utils/caches.js';
import { filterMojang } from '../utils/filters.js';
import { getMojang } from '../utils/requests.js';

export async function mojang(req, res, next) {
const slug = res.locals.slug;
Expand Down
6 changes: 3 additions & 3 deletions middlewares/name.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { memjsClient } from '../utils/caches';
import { getHypixelPlayer, getMojang } from '../utils/requests';
import { filterMojang, filterName } from '../utils/filters';
import { memjsClient } from '../utils/caches.js';
import { getHypixelPlayer, getMojang } from '../utils/requests.js';
import { filterMojang, filterName } from '../utils/filters.js';

export async function name(req, res, next) {
const slug = res.locals.slug;
Expand Down
2 changes: 1 addition & 1 deletion middlewares/names.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { memjsClient } from '../utils/caches';
import { memjsClient } from '../utils/caches.js';

export async function names(req, res, next) {
let names = {};
Expand Down
8 changes: 4 additions & 4 deletions middlewares/player.js
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { memjsClient } from '../utils/caches';
import * as filters from '../utils/filters';
import { getHypixelPlayer } from '../utils/requests';
import { sendHypixelError } from '../utils/errors';
import { memjsClient } from '../utils/caches.js';
import * as filters from '../utils/filters.js';
import { getHypixelPlayer } from '../utils/requests.js';
import { sendHypixelError } from '../utils/errors.js';

export async function player(req, res, next) {
// Call the Hypixel API
Expand Down
2 changes: 1 addition & 1 deletion middlewares/resources.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getHypixelResource } from '../utils/requests';
import { getHypixelResource } from '../utils/requests.js';

export async function resources(req, res, next) {
let json = null;
Expand Down
2 changes: 1 addition & 1 deletion middlewares/status.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
import { getHypixelStatus } from '../utils/requests';
import { getHypixelStatus } from '../utils/requests.js';

export async function status(req, res, next) {
const uuid = res.locals.mojang.uuid;
Expand Down
Loading