From 8fec21d6bccfa778c14c1714d6444312e36fc3f1 Mon Sep 17 00:00:00 2001
From: MCMXC <16797721+mcmxcdev@users.noreply.github.com>
Date: Sun, 11 Feb 2024 19:15:20 +0530
Subject: more updates

---
 .../Http/Api/Static/AnnouncementsController.ts     |  2 +-
 app/Controllers/Http/RecipeController.ts           |  2 +-
 app/Controllers/Http/ServiceController.ts          |  2 +-
 app/Exceptions/Handler.ts                          | 23 ----------------------
 app/Middleware/Auth.ts                             |  3 ++-
 app/Middleware/Dashboard.ts                        |  4 ++--
 app/Models/User.ts                                 |  2 +-
 7 files changed, 8 insertions(+), 30 deletions(-)
 delete mode 100644 app/Exceptions/Handler.ts

(limited to 'app')

diff --git a/app/Controllers/Http/Api/Static/AnnouncementsController.ts b/app/Controllers/Http/Api/Static/AnnouncementsController.ts
index 090ee1c..565df5e 100644
--- a/app/Controllers/Http/Api/Static/AnnouncementsController.ts
+++ b/app/Controllers/Http/Api/Static/AnnouncementsController.ts
@@ -1,5 +1,5 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import { app } from '@adonisjs/core/services/app';
+import app from '@adonisjs/core/services/app';
 import path from 'node:path';
 import fs from 'fs-extra';
 
diff --git a/app/Controllers/Http/RecipeController.ts b/app/Controllers/Http/RecipeController.ts
index d30c59f..4d01a02 100644
--- a/app/Controllers/Http/RecipeController.ts
+++ b/app/Controllers/Http/RecipeController.ts
@@ -1,6 +1,6 @@
 import type { HttpContext } from '@adonisjs/core/http';
 import fs from 'fs-extra';
-import { app } from '@adonisjs/core/services/app';
+import app from '@adonisjs/core/services/app';
 import path from 'node:path';
 import Recipe from '#app/Models/Recipe';
 import { isCreationEnabled } from '#config/app';
diff --git a/app/Controllers/Http/ServiceController.ts b/app/Controllers/Http/ServiceController.ts
index 8fec844..df5f623 100644
--- a/app/Controllers/Http/ServiceController.ts
+++ b/app/Controllers/Http/ServiceController.ts
@@ -5,7 +5,7 @@ import { url } from '#config/app';
 import { v4 as uuid } from 'uuid';
 import * as fs from 'fs-extra';
 import path from 'node:path';
-import { app } from '@adonisjs/core/services/app';
+import app from '@adonisjs/core/services/app';
 import sanitize from 'sanitize-filename';
 
 const createSchema = schema.create({
diff --git a/app/Exceptions/Handler.ts b/app/Exceptions/Handler.ts
deleted file mode 100644
index 51764bc..0000000
--- a/app/Exceptions/Handler.ts
+++ /dev/null
@@ -1,23 +0,0 @@
-/*
-|--------------------------------------------------------------------------
-| Http Exception Handler
-|--------------------------------------------------------------------------
-|
-| AdonisJs will forward all exceptions occurred during an HTTP request to
-| the following class. You can learn more about exception handling by
-| reading docs.
-|
-| The exception handler extends a base `HttpExceptionHandler` which is not
-| mandatory, however it can do lot of heavy lifting to handle the errors
-| properly.
-|
-*/
-
-import logger from '@adonisjs/core/services/logger';
-import { ExceptionHandler as AdonisExceptionHandler } from '@adonisjs/core/http';
-
-export default class ExceptionHandler extends AdonisExceptionHandler {
-  constructor() {
-    super(logger);
-  }
-}
diff --git a/app/Middleware/Auth.ts b/app/Middleware/Auth.ts
index b6ff446..58d5b76 100644
--- a/app/Middleware/Auth.ts
+++ b/app/Middleware/Auth.ts
@@ -3,7 +3,7 @@ import { HttpContext } from '@adonisjs/core/http';
 import { AuthenticationException } from '@adonisjs/auth/build/standalone';
 import * as jose from 'jose';
 import { appKey } from '#config/app';
-import User from '#app/Models/User';
+import User from '#models/User';
 
 /**
  * Auth middleware is meant to restrict un-authenticated access to a given route
@@ -94,6 +94,7 @@ export default class AuthMiddleware {
   /**
    * Handle request
    */
+  // eslint-disable-next-line consistent-return
   public async handle(
     { request, auth, response }: HttpContext,
     next: () => Promise<void>,
diff --git a/app/Middleware/Dashboard.ts b/app/Middleware/Dashboard.ts
index 19c8cfc..20113b7 100644
--- a/app/Middleware/Dashboard.ts
+++ b/app/Middleware/Dashboard.ts
@@ -1,9 +1,9 @@
 import type { HttpContext } from '@adonisjs/core/http';
-import { Config } from '@adonisjs/core/config';
+import config from '@adonisjs/core/services/config';
 
 export default class Dashboard {
   public async handle({ response }: HttpContext, next: () => Promise<void>) {
-    if (Config.get('dashboard.enabled') === false) {
+    if (config.get('dashboard.enabled') === false) {
       response.send(
         'The user dashboard is disabled on this server\n\nIf you are the server owner, please set IS_DASHBOARD_ENABLED to true to enable the dashboard.',
       );
diff --git a/app/Models/User.ts b/app/Models/User.ts
index d292b3a..f744588 100644
--- a/app/Models/User.ts
+++ b/app/Models/User.ts
@@ -3,7 +3,7 @@ import { BaseModel, beforeSave, column, hasMany } from '@adonisjs/lucid/orm';
 import hash from '@adonisjs/core/services/hash';
 import emitter from '@adonisjs/core/services/emitter';
 import moment from 'moment';
-import Encryption from '@ioc:Adonis/Core/Encryption';
+import { Encryption } from '@adonisjs/core/encryption';
 import randtoken from 'rand-token';
 import Token from './Token.js';
 import Workspace from './Workspace.js';
-- 
cgit v1.2.3-70-g09d2