Merge pull request #1590 from hedgedoc/chore/sort_imports

.eslintrc.js

@@ -38,7 +38,7 @@ module.exports = {
     'eslint:recommended',
     'plugin:@typescript-eslint/recommended',
     'plugin:@typescript-eslint/recommended-requiring-type-checking',
-    'prettier',
+    'plugin:prettier/recommended',
   ],
   root: true,
   env: {

.prettierrc

@@ -1,4 +1,6 @@
 {
   "singleQuote": true,
-  "trailingComma": "all"
+  "trailingComma": "all",
-}
+  "importOrder": ["^[./]"],
+  "importOrderSeparation": true
+}

package.json

@@ -66,6 +66,7 @@
     "@nestjs/cli": "8.1.1",
     "@nestjs/schematics": "8.0.3",
     "@nestjs/testing": "8.0.6",
+    "@trivago/prettier-plugin-sort-imports": "^2.0.4",
     "@tsconfig/node12": "1.0.9",
     "@types/cli-color": "2.0.1",
     "@types/express": "4.17.13",
@@ -77,6 +78,7 @@
     "eslint": "7.32.0",
     "eslint-config-prettier": "8.3.0",
     "eslint-plugin-import": "2.24.2",
+    "eslint-plugin-prettier": "^3.4.1",
     "jest": "27.1.0",
     "prettier": "2.3.2",
     "supertest": "6.1.6",

src/api/private/config/config.controller.spec.ts

@@ -3,16 +3,16 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import { Test, TestingModule } from '@nestjs/testing';
-import { ConfigController } from './config.controller';
-import { LoggerModule } from '../../../logger/logger.module';
-import { FrontendConfigModule } from '../../../frontend-config/frontend-config.module';
 import { ConfigModule } from '@nestjs/config';
+import { Test, TestingModule } from '@nestjs/testing';
+
 import appConfigMock from '../../../config/mock/app.config.mock';
 import authConfigMock from '../../../config/mock/auth.config.mock';
 import customizationConfigMock from '../../../config/mock/customization.config.mock';
 import externalConfigMock from '../../../config/mock/external-services.config.mock';
+import { FrontendConfigModule } from '../../../frontend-config/frontend-config.module';
+import { LoggerModule } from '../../../logger/logger.module';
+import { ConfigController } from './config.controller';
 
 describe('ConfigController', () => {
   let controller: ConfigController;

src/api/private/config/config.controller.ts

@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Controller, Get } from '@nestjs/common';
-import { ConsoleLoggerService } from '../../../logger/console-logger.service';
+
-import { FrontendConfigService } from '../../../frontend-config/frontend-config.service';
 import { FrontendConfigDto } from '../../../frontend-config/frontend-config.dto';
+import { FrontendConfigService } from '../../../frontend-config/frontend-config.service';
+import { ConsoleLoggerService } from '../../../logger/console-logger.service';
 
 @Controller('config')
 export class ConfigController {

src/api/private/me/history/history.controller.spec.ts

@@ -3,33 +3,33 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Author } from '../../../../authors/author.entity';
-import { Session } from '../../../../users/session.entity';
-import { HistoryController } from './history.controller';
-import { LoggerModule } from '../../../../logger/logger.module';
-import { UsersModule } from '../../../../users/users.module';
-import { HistoryModule } from '../../../../history/history.module';
-import { NotesModule } from '../../../../notes/notes.module';
 import {
   getConnectionToken,
   getRepositoryToken,
   TypeOrmModule,
 } from '@nestjs/typeorm';
-import { User } from '../../../../users/user.entity';
+
-import { Note } from '../../../../notes/note.entity';
 import { AuthToken } from '../../../../auth/auth-token.entity';
-import { Identity } from '../../../../users/identity.entity';
+import { Author } from '../../../../authors/author.entity';
-import { Edit } from '../../../../revisions/edit.entity';
+import appConfigMock from '../../../../config/mock/app.config.mock';
-import { Revision } from '../../../../revisions/revision.entity';
+import { Group } from '../../../../groups/group.entity';
-import { Tag } from '../../../../notes/tag.entity';
 import { HistoryEntry } from '../../../../history/history-entry.entity';
+import { HistoryModule } from '../../../../history/history.module';
+import { LoggerModule } from '../../../../logger/logger.module';
+import { Note } from '../../../../notes/note.entity';
+import { NotesModule } from '../../../../notes/notes.module';
+import { Tag } from '../../../../notes/tag.entity';
 import { NoteGroupPermission } from '../../../../permissions/note-group-permission.entity';
 import { NoteUserPermission } from '../../../../permissions/note-user-permission.entity';
-import { Group } from '../../../../groups/group.entity';
+import { Edit } from '../../../../revisions/edit.entity';
-import { ConfigModule } from '@nestjs/config';
+import { Revision } from '../../../../revisions/revision.entity';
-import appConfigMock from '../../../../config/mock/app.config.mock';
+import { Identity } from '../../../../users/identity.entity';
+import { Session } from '../../../../users/session.entity';
+import { User } from '../../../../users/user.entity';
+import { UsersModule } from '../../../../users/users.module';
+import { HistoryController } from './history.controller';
 
 describe('HistoryController', () => {
   let controller: HistoryController;

src/api/private/me/history/history.controller.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   BadRequestException,
   Body,
@@ -16,13 +15,14 @@ import {
   Put,
 } from '@nestjs/common';
 import { ApiTags } from '@nestjs/swagger';
-import { UsersService } from '../../../../users/users.service';
+
-import { HistoryEntryDto } from '../../../../history/history-entry.dto';
 import { ForbiddenIdError, NotInDBError } from '../../../../errors/errors';
 import { HistoryEntryImportDto } from '../../../../history/history-entry-import.dto';
 import { HistoryEntryUpdateDto } from '../../../../history/history-entry-update.dto';
-import { ConsoleLoggerService } from '../../../../logger/console-logger.service';
+import { HistoryEntryDto } from '../../../../history/history-entry.dto';
 import { HistoryService } from '../../../../history/history.service';
+import { ConsoleLoggerService } from '../../../../logger/console-logger.service';
+import { UsersService } from '../../../../users/users.service';
 
 @ApiTags('history')
 @Controller('/me/history')

src/api/private/me/me.controller.spec.ts

@@ -3,31 +3,31 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Author } from '../../../authors/author.entity';
-import { Session } from '../../../users/session.entity';
-import { MeController } from './me.controller';
-import { UsersModule } from '../../../users/users.module';
-import { LoggerModule } from '../../../logger/logger.module';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { User } from '../../../users/user.entity';
+
-import { Identity } from '../../../users/identity.entity';
+import { Author } from '../../../authors/author.entity';
+import appConfigMock from '../../../config/mock/app.config.mock';
+import authConfigMock from '../../../config/mock/auth.config.mock';
+import customizationConfigMock from '../../../config/mock/customization.config.mock';
+import externalServicesConfigMock from '../../../config/mock/external-services.config.mock';
+import mediaConfigMock from '../../../config/mock/media.config.mock';
+import { Group } from '../../../groups/group.entity';
+import { LoggerModule } from '../../../logger/logger.module';
+import { MediaUpload } from '../../../media/media-upload.entity';
 import { MediaModule } from '../../../media/media.module';
+import { Note } from '../../../notes/note.entity';
+import { Tag } from '../../../notes/tag.entity';
 import { NoteGroupPermission } from '../../../permissions/note-group-permission.entity';
 import { NoteUserPermission } from '../../../permissions/note-user-permission.entity';
 import { Edit } from '../../../revisions/edit.entity';
-import { ConfigModule } from '@nestjs/config';
-import appConfigMock from '../../../config/mock/app.config.mock';
-import authConfigMock from '../../../config/mock/auth.config.mock';
-import mediaConfigMock from '../../../config/mock/media.config.mock';
-import customizationConfigMock from '../../../config/mock/customization.config.mock';
-import externalServicesConfigMock from '../../../config/mock/external-services.config.mock';
-import { MediaUpload } from '../../../media/media-upload.entity';
-import { Note } from '../../../notes/note.entity';
-import { Tag } from '../../../notes/tag.entity';
 import { Revision } from '../../../revisions/revision.entity';
-import { Group } from '../../../groups/group.entity';
+import { Identity } from '../../../users/identity.entity';
+import { Session } from '../../../users/session.entity';
+import { User } from '../../../users/user.entity';
+import { UsersModule } from '../../../users/users.module';
+import { MeController } from './me.controller';
 
 describe('MeController', () => {
   let controller: MeController;

src/api/private/me/me.controller.ts

@@ -3,13 +3,13 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Body, Controller, Delete, Get, HttpCode, Post } from '@nestjs/common';
-import { UserInfoDto } from '../../../users/user-info.dto';
+
 import { ConsoleLoggerService } from '../../../logger/console-logger.service';
-import { UsersService } from '../../../users/users.service';
-import { MediaService } from '../../../media/media.service';
 import { MediaUploadDto } from '../../../media/media-upload.dto';
+import { MediaService } from '../../../media/media.service';
+import { UserInfoDto } from '../../../users/user-info.dto';
+import { UsersService } from '../../../users/users.service';
 
 @Controller('me')
 export class MeController {

src/api/private/media/media.controller.spec.ts

@@ -3,33 +3,33 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import { Test, TestingModule } from '@nestjs/testing';
-import { Author } from '../../../authors/author.entity';
-import { Session } from '../../../users/session.entity';
-import { UsersModule } from '../../../users/users.module';
-import { MediaController } from './media.controller';
-import { LoggerModule } from '../../../logger/logger.module';
 import { ConfigModule } from '@nestjs/config';
-import mediaConfigMock from '../../../config/mock/media.config.mock';
+import { Test, TestingModule } from '@nestjs/testing';
+import { getRepositoryToken } from '@nestjs/typeorm';
+
+import { AuthToken } from '../../../auth/auth-token.entity';
+import { Author } from '../../../authors/author.entity';
 import appConfigMock from '../../../config/mock/app.config.mock';
 import authConfigMock from '../../../config/mock/auth.config.mock';
 import customizationConfigMock from '../../../config/mock/customization.config.mock';
 import externalConfigMock from '../../../config/mock/external-services.config.mock';
-import { MediaModule } from '../../../media/media.module';
+import mediaConfigMock from '../../../config/mock/media.config.mock';
-import { NotesModule } from '../../../notes/notes.module';
+import { Group } from '../../../groups/group.entity';
-import { getRepositoryToken } from '@nestjs/typeorm';
+import { LoggerModule } from '../../../logger/logger.module';
-import { Edit } from '../../../revisions/edit.entity';
-import { AuthToken } from '../../../auth/auth-token.entity';
-import { Identity } from '../../../users/identity.entity';
 import { MediaUpload } from '../../../media/media-upload.entity';
+import { MediaModule } from '../../../media/media.module';
 import { Note } from '../../../notes/note.entity';
-import { Revision } from '../../../revisions/revision.entity';
+import { NotesModule } from '../../../notes/notes.module';
-import { User } from '../../../users/user.entity';
 import { Tag } from '../../../notes/tag.entity';
 import { NoteGroupPermission } from '../../../permissions/note-group-permission.entity';
 import { NoteUserPermission } from '../../../permissions/note-user-permission.entity';
-import { Group } from '../../../groups/group.entity';
+import { Edit } from '../../../revisions/edit.entity';
+import { Revision } from '../../../revisions/revision.entity';
+import { Identity } from '../../../users/identity.entity';
+import { Session } from '../../../users/session.entity';
+import { User } from '../../../users/user.entity';
+import { UsersModule } from '../../../users/users.module';
+import { MediaController } from './media.controller';
 
 describe('MediaController', () => {
   let controller: MediaController;

src/api/private/media/media.controller.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   BadRequestException,
   Controller,
@@ -14,16 +13,17 @@ import {
   UploadedFile,
   UseInterceptors,
 } from '@nestjs/common';
-import { ConsoleLoggerService } from '../../../logger/console-logger.service';
+import { FileInterceptor } from '@nestjs/platform-express';
-import { MediaService } from '../../../media/media.service';
+
-import { MulterFile } from '../../../media/multer-file.interface';
-import { MediaUploadUrlDto } from '../../../media/media-upload-url.dto';
 import {
   ClientError,
   MediaBackendError,
   NotInDBError,
 } from '../../../errors/errors';
-import { FileInterceptor } from '@nestjs/platform-express';
+import { ConsoleLoggerService } from '../../../logger/console-logger.service';
+import { MediaUploadUrlDto } from '../../../media/media-upload-url.dto';
+import { MediaService } from '../../../media/media.service';
+import { MulterFile } from '../../../media/multer-file.interface';
 
 @Controller('media')
 export class MediaController {

src/api/private/notes/notes.controller.spec.ts

@@ -3,39 +3,39 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Author } from '../../../authors/author.entity';
-import { Session } from '../../../users/session.entity';
-import { NotesController } from './notes.controller';
-import { NotesService } from '../../../notes/notes.service';
 import {
   getConnectionToken,
   getRepositoryToken,
   TypeOrmModule,
 } from '@nestjs/typeorm';
-import { Note } from '../../../notes/note.entity';
+
-import { Tag } from '../../../notes/tag.entity';
+import { AuthToken } from '../../../auth/auth-token.entity';
-import { RevisionsModule } from '../../../revisions/revisions.module';
+import { Author } from '../../../authors/author.entity';
-import { UsersModule } from '../../../users/users.module';
-import { GroupsModule } from '../../../groups/groups.module';
-import { LoggerModule } from '../../../logger/logger.module';
-import { PermissionsModule } from '../../../permissions/permissions.module';
-import { HistoryModule } from '../../../history/history.module';
-import { MediaModule } from '../../../media/media.module';
-import { ConfigModule } from '@nestjs/config';
 import appConfigMock from '../../../config/mock/app.config.mock';
 import mediaConfigMock from '../../../config/mock/media.config.mock';
-import { Revision } from '../../../revisions/revision.entity';
+import { Group } from '../../../groups/group.entity';
-import { Edit } from '../../../revisions/edit.entity';
+import { GroupsModule } from '../../../groups/groups.module';
-import { User } from '../../../users/user.entity';
-import { AuthToken } from '../../../auth/auth-token.entity';
-import { Identity } from '../../../users/identity.entity';
 import { HistoryEntry } from '../../../history/history-entry.entity';
+import { HistoryModule } from '../../../history/history.module';
+import { LoggerModule } from '../../../logger/logger.module';
+import { MediaUpload } from '../../../media/media-upload.entity';
+import { MediaModule } from '../../../media/media.module';
+import { Note } from '../../../notes/note.entity';
+import { NotesService } from '../../../notes/notes.service';
+import { Tag } from '../../../notes/tag.entity';
 import { NoteGroupPermission } from '../../../permissions/note-group-permission.entity';
 import { NoteUserPermission } from '../../../permissions/note-user-permission.entity';
-import { Group } from '../../../groups/group.entity';
+import { PermissionsModule } from '../../../permissions/permissions.module';
-import { MediaUpload } from '../../../media/media-upload.entity';
+import { Edit } from '../../../revisions/edit.entity';
+import { Revision } from '../../../revisions/revision.entity';
+import { RevisionsModule } from '../../../revisions/revisions.module';
+import { Identity } from '../../../users/identity.entity';
+import { Session } from '../../../users/session.entity';
+import { User } from '../../../users/user.entity';
+import { UsersModule } from '../../../users/users.module';
+import { NotesController } from './notes.controller';
 
 describe('NotesController', () => {
   let controller: NotesController;

src/api/private/notes/notes.controller.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   BadRequestException,
   Body,
@@ -16,25 +15,26 @@ import {
   Post,
   UnauthorizedException,
 } from '@nestjs/common';
-import { Note } from '../../../notes/note.entity';
+
 import {
   AlreadyInDBError,
   ForbiddenIdError,
   NotInDBError,
 } from '../../../errors/errors';
-import { NoteDto } from '../../../notes/note.dto';
-import { ConsoleLoggerService } from '../../../logger/console-logger.service';
-import { NotesService } from '../../../notes/notes.service';
-import { PermissionsService } from '../../../permissions/permissions.service';
 import { HistoryService } from '../../../history/history.service';
-import { UsersService } from '../../../users/users.service';
+import { ConsoleLoggerService } from '../../../logger/console-logger.service';
 import { MediaUploadDto } from '../../../media/media-upload.dto';
 import { MediaService } from '../../../media/media.service';
+import { NoteDto } from '../../../notes/note.dto';
+import { Note } from '../../../notes/note.entity';
+import { NoteMediaDeletionDto } from '../../../notes/note.media-deletion.dto';
+import { NotesService } from '../../../notes/notes.service';
+import { PermissionsService } from '../../../permissions/permissions.service';
 import { RevisionMetadataDto } from '../../../revisions/revision-metadata.dto';
 import { RevisionDto } from '../../../revisions/revision.dto';
 import { RevisionsService } from '../../../revisions/revisions.service';
+import { UsersService } from '../../../users/users.service';
 import { MarkdownBody } from '../../utils/markdownbody-decorator';
-import { NoteMediaDeletionDto } from '../../../notes/note.media-deletion.dto';
 
 @Controller('notes')
 export class NotesController {

src/api/private/private-api.module.ts

@@ -3,23 +3,23 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Module } from '@nestjs/common';
-import { TokensController } from './tokens/tokens.controller';
+
-import { LoggerModule } from '../../logger/logger.module';
-import { UsersModule } from '../../users/users.module';
 import { AuthModule } from '../../auth/auth.module';
-import { MeController } from './me/me.controller';
-import { ConfigController } from './config/config.controller';
 import { FrontendConfigModule } from '../../frontend-config/frontend-config.module';
-import { HistoryController } from './me/history/history.controller';
 import { HistoryModule } from '../../history/history.module';
-import { NotesModule } from '../../notes/notes.module';
+import { LoggerModule } from '../../logger/logger.module';
 import { MediaModule } from '../../media/media.module';
-import { MediaController } from './media/media.controller';
+import { NotesModule } from '../../notes/notes.module';
-import { NotesController } from './notes/notes.controller';
 import { PermissionsModule } from '../../permissions/permissions.module';
 import { RevisionsModule } from '../../revisions/revisions.module';
+import { UsersModule } from '../../users/users.module';
+import { ConfigController } from './config/config.controller';
+import { HistoryController } from './me/history/history.controller';
+import { MeController } from './me/me.controller';
+import { MediaController } from './media/media.controller';
+import { NotesController } from './notes/notes.controller';
+import { TokensController } from './tokens/tokens.controller';
 
 @Module({
   imports: [

src/api/private/tokens/tokens.controller.spec.ts

@@ -3,18 +3,18 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Session } from '../../../users/session.entity';
-import { TokensController } from './tokens.controller';
-import { LoggerModule } from '../../../logger/logger.module';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { Identity } from '../../../users/identity.entity';
+
-import { User } from '../../../users/user.entity';
 import { AuthToken } from '../../../auth/auth-token.entity';
 import { AuthModule } from '../../../auth/auth.module';
-import { ConfigModule } from '@nestjs/config';
 import appConfigMock from '../../../config/mock/app.config.mock';
+import { LoggerModule } from '../../../logger/logger.module';
+import { Identity } from '../../../users/identity.entity';
+import { Session } from '../../../users/session.entity';
+import { User } from '../../../users/user.entity';
+import { TokensController } from './tokens.controller';
 
 describe('TokensController', () => {
   let controller: TokensController;

src/api/private/tokens/tokens.controller.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   Body,
   Controller,
@@ -13,13 +12,14 @@ import {
   Param,
   Post,
 } from '@nestjs/common';
-import { ConsoleLoggerService } from '../../../logger/console-logger.service';
-import { AuthService } from '../../../auth/auth.service';
-import { TimestampMillis } from '../../../utils/timestamp';
-import { AuthTokenDto } from '../../../auth/auth-token.dto';
-import { AuthTokenWithSecretDto } from '../../../auth/auth-token-with-secret.dto';
 import { ApiTags } from '@nestjs/swagger';
 
+import { AuthTokenWithSecretDto } from '../../../auth/auth-token-with-secret.dto';
+import { AuthTokenDto } from '../../../auth/auth-token.dto';
+import { AuthService } from '../../../auth/auth.service';
+import { ConsoleLoggerService } from '../../../logger/console-logger.service';
+import { TimestampMillis } from '../../../utils/timestamp';
+
 @ApiTags('tokens')
 @Controller('tokens')
 export class TokensController {

src/api/public/me/me.controller.spec.ts

@@ -3,36 +3,36 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
 import {
   getConnectionToken,
   getRepositoryToken,
   TypeOrmModule,
 } from '@nestjs/typeorm';
+
+import { AuthToken } from '../../../auth/auth-token.entity';
 import { Author } from '../../../authors/author.entity';
+import appConfigMock from '../../../config/mock/app.config.mock';
+import mediaConfigMock from '../../../config/mock/media.config.mock';
+import { Group } from '../../../groups/group.entity';
+import { HistoryEntry } from '../../../history/history-entry.entity';
 import { HistoryModule } from '../../../history/history.module';
 import { LoggerModule } from '../../../logger/logger.module';
+import { MediaUpload } from '../../../media/media-upload.entity';
+import { MediaModule } from '../../../media/media.module';
 import { Note } from '../../../notes/note.entity';
 import { NotesModule } from '../../../notes/notes.module';
 import { Tag } from '../../../notes/tag.entity';
+import { NoteGroupPermission } from '../../../permissions/note-group-permission.entity';
+import { NoteUserPermission } from '../../../permissions/note-user-permission.entity';
 import { Edit } from '../../../revisions/edit.entity';
 import { Revision } from '../../../revisions/revision.entity';
-import { AuthToken } from '../../../auth/auth-token.entity';
 import { Identity } from '../../../users/identity.entity';
 import { Session } from '../../../users/session.entity';
 import { User } from '../../../users/user.entity';
 import { UsersModule } from '../../../users/users.module';
 import { MeController } from './me.controller';
-import { HistoryEntry } from '../../../history/history-entry.entity';
-import { NoteGroupPermission } from '../../../permissions/note-group-permission.entity';
-import { NoteUserPermission } from '../../../permissions/note-user-permission.entity';
-import { Group } from '../../../groups/group.entity';
-import { MediaModule } from '../../../media/media.module';
-import { MediaUpload } from '../../../media/media-upload.entity';
-import { ConfigModule } from '@nestjs/config';
-import mediaConfigMock from '../../../config/mock/media.config.mock';
-import appConfigMock from '../../../config/mock/app.config.mock';
 
 describe('Me Controller', () => {
   let controller: MeController;

src/api/public/me/me.controller.ts

@@ -3,27 +3,19 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   Body,
   Controller,
   Delete,
   Get,
   HttpCode,
+  InternalServerErrorException,
   NotFoundException,
   Param,
   Put,
-  UseGuards,
   Req,
-  InternalServerErrorException,
+  UseGuards,
 } from '@nestjs/common';
-import { HistoryEntryUpdateDto } from '../../../history/history-entry-update.dto';
-import { HistoryService } from '../../../history/history.service';
-import { ConsoleLoggerService } from '../../../logger/console-logger.service';
-import { NoteMetadataDto } from '../../../notes/note-metadata.dto';
-import { NotesService } from '../../../notes/notes.service';
-import { UsersService } from '../../../users/users.service';
-import { TokenAuthGuard } from '../../../auth/token-auth.guard';
 import {
   ApiNoContentResponse,
   ApiNotFoundResponse,
@@ -32,12 +24,20 @@ import {
   ApiTags,
   ApiUnauthorizedResponse,
 } from '@nestjs/swagger';
-import { HistoryEntryDto } from '../../../history/history-entry.dto';
-import { UserInfoDto } from '../../../users/user-info.dto';
-import { NotInDBError } from '../../../errors/errors';
 import { Request } from 'express';
-import { MediaService } from '../../../media/media.service';
+
+import { TokenAuthGuard } from '../../../auth/token-auth.guard';
+import { NotInDBError } from '../../../errors/errors';
+import { HistoryEntryUpdateDto } from '../../../history/history-entry-update.dto';
+import { HistoryEntryDto } from '../../../history/history-entry.dto';
+import { HistoryService } from '../../../history/history.service';
+import { ConsoleLoggerService } from '../../../logger/console-logger.service';
 import { MediaUploadDto } from '../../../media/media-upload.dto';
+import { MediaService } from '../../../media/media.service';
+import { NoteMetadataDto } from '../../../notes/note-metadata.dto';
+import { NotesService } from '../../../notes/notes.service';
+import { UserInfoDto } from '../../../users/user-info.dto';
+import { UsersService } from '../../../users/users.service';
 import {
   notFoundDescription,
   successfullyDeletedDescription,

src/api/public/media/media.controller.spec.ts

@@ -3,29 +3,29 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
+
+import { AuthToken } from '../../../auth/auth-token.entity';
 import { Author } from '../../../authors/author.entity';
 import appConfigMock from '../../../config/mock/app.config.mock';
 import mediaConfigMock from '../../../config/mock/media.config.mock';
+import { Group } from '../../../groups/group.entity';
 import { LoggerModule } from '../../../logger/logger.module';
 import { MediaUpload } from '../../../media/media-upload.entity';
 import { MediaModule } from '../../../media/media.module';
 import { Note } from '../../../notes/note.entity';
 import { NotesModule } from '../../../notes/notes.module';
 import { Tag } from '../../../notes/tag.entity';
+import { NoteGroupPermission } from '../../../permissions/note-group-permission.entity';
+import { NoteUserPermission } from '../../../permissions/note-user-permission.entity';
 import { Edit } from '../../../revisions/edit.entity';
 import { Revision } from '../../../revisions/revision.entity';
-import { AuthToken } from '../../../auth/auth-token.entity';
 import { Identity } from '../../../users/identity.entity';
 import { Session } from '../../../users/session.entity';
 import { User } from '../../../users/user.entity';
 import { MediaController } from './media.controller';
-import { NoteGroupPermission } from '../../../permissions/note-group-permission.entity';
-import { NoteUserPermission } from '../../../permissions/note-user-permission.entity';
-import { Group } from '../../../groups/group.entity';
 
 describe('Media Controller', () => {
   let controller: MediaController;

src/api/public/media/media.controller.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   BadRequestException,
   Controller,
@@ -21,17 +20,6 @@ import {
   UseInterceptors,
 } from '@nestjs/common';
 import { FileInterceptor } from '@nestjs/platform-express';
-import { Request } from 'express';
-import {
-  ClientError,
-  MediaBackendError,
-  NotInDBError,
-  PermissionError,
-} from '../../../errors/errors';
-import { ConsoleLoggerService } from '../../../logger/console-logger.service';
-import { MediaService } from '../../../media/media.service';
-import { MulterFile } from '../../../media/multer-file.interface';
-import { TokenAuthGuard } from '../../../auth/token-auth.guard';
 import {
   ApiBody,
   ApiConsumes,
@@ -43,7 +31,19 @@ import {
   ApiTags,
   ApiUnauthorizedResponse,
 } from '@nestjs/swagger';
+import { Request } from 'express';
+
+import { TokenAuthGuard } from '../../../auth/token-auth.guard';
+import {
+  ClientError,
+  MediaBackendError,
+  NotInDBError,
+  PermissionError,
+} from '../../../errors/errors';
+import { ConsoleLoggerService } from '../../../logger/console-logger.service';
 import { MediaUploadUrlDto } from '../../../media/media-upload-url.dto';
+import { MediaService } from '../../../media/media.service';
+import { MulterFile } from '../../../media/multer-file.interface';
 import {
   forbiddenDescription,
   successfullyDeletedDescription,

src/api/public/monitoring/monitoring.controller.spec.ts

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Test, TestingModule } from '@nestjs/testing';
+
 import { MonitoringService } from '../../../monitoring/monitoring.service';
 import { MonitoringController } from './monitoring.controller';
 

src/api/public/monitoring/monitoring.controller.ts

@@ -3,10 +3,7 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Controller, Get, UseGuards } from '@nestjs/common';
-import { MonitoringService } from '../../../monitoring/monitoring.service';
-import { TokenAuthGuard } from '../../../auth/token-auth.guard';
 import {
   ApiForbiddenResponse,
   ApiOkResponse,
@@ -15,6 +12,9 @@ import {
   ApiTags,
   ApiUnauthorizedResponse,
 } from '@nestjs/swagger';
+
+import { TokenAuthGuard } from '../../../auth/token-auth.guard';
+import { MonitoringService } from '../../../monitoring/monitoring.service';
 import { ServerStatusDto } from '../../../monitoring/server-status.dto';
 import {
   forbiddenDescription,

src/api/public/notes/notes.controller.spec.ts

@@ -3,39 +3,39 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
 import {
   getConnectionToken,
   getRepositoryToken,
   TypeOrmModule,
 } from '@nestjs/typeorm';
+
+import { AuthToken } from '../../../auth/auth-token.entity';
 import { Author } from '../../../authors/author.entity';
+import appConfigMock from '../../../config/mock/app.config.mock';
+import mediaConfigMock from '../../../config/mock/media.config.mock';
+import { Group } from '../../../groups/group.entity';
+import { GroupsModule } from '../../../groups/groups.module';
+import { HistoryEntry } from '../../../history/history-entry.entity';
+import { HistoryModule } from '../../../history/history.module';
 import { LoggerModule } from '../../../logger/logger.module';
+import { MediaUpload } from '../../../media/media-upload.entity';
+import { MediaModule } from '../../../media/media.module';
 import { Note } from '../../../notes/note.entity';
 import { NotesService } from '../../../notes/notes.service';
 import { Tag } from '../../../notes/tag.entity';
+import { NoteGroupPermission } from '../../../permissions/note-group-permission.entity';
+import { NoteUserPermission } from '../../../permissions/note-user-permission.entity';
+import { PermissionsModule } from '../../../permissions/permissions.module';
 import { Edit } from '../../../revisions/edit.entity';
 import { Revision } from '../../../revisions/revision.entity';
 import { RevisionsModule } from '../../../revisions/revisions.module';
-import { AuthToken } from '../../../auth/auth-token.entity';
 import { Identity } from '../../../users/identity.entity';
 import { Session } from '../../../users/session.entity';
 import { User } from '../../../users/user.entity';
 import { UsersModule } from '../../../users/users.module';
 import { NotesController } from './notes.controller';
-import { PermissionsModule } from '../../../permissions/permissions.module';
-import { HistoryModule } from '../../../history/history.module';
-import { HistoryEntry } from '../../../history/history-entry.entity';
-import { NoteGroupPermission } from '../../../permissions/note-group-permission.entity';
-import { NoteUserPermission } from '../../../permissions/note-user-permission.entity';
-import { Group } from '../../../groups/group.entity';
-import { GroupsModule } from '../../../groups/groups.module';
-import { ConfigModule } from '@nestjs/config';
-import { MediaModule } from '../../../media/media.module';
-import { MediaUpload } from '../../../media/media-upload.entity';
-import appConfigMock from '../../../config/mock/app.config.mock';
-import mediaConfigMock from '../../../config/mock/media.config.mock';
 
 describe('Notes Controller', () => {
   let controller: NotesController;

src/api/public/notes/notes.controller.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   BadRequestException,
   Body,
@@ -21,22 +20,6 @@ import {
   UnauthorizedException,
   UseGuards,
 } from '@nestjs/common';
-import {
-  AlreadyInDBError,
-  ForbiddenIdError,
-  NotInDBError,
-  PermissionsUpdateInconsistentError,
-} from '../../../errors/errors';
-import { ConsoleLoggerService } from '../../../logger/console-logger.service';
-import {
-  NotePermissionsDto,
-  NotePermissionsUpdateDto,
-} from '../../../notes/note-permissions.dto';
-import { NotesService } from '../../../notes/notes.service';
-import { RevisionsService } from '../../../revisions/revisions.service';
-import { FullApi } from '../../utils/fullapi-decorator';
-import { MarkdownBody } from '../../utils/markdownbody-decorator';
-import { TokenAuthGuard } from '../../../auth/token-auth.guard';
 import {
   ApiCreatedResponse,
   ApiForbiddenResponse,
@@ -47,22 +30,39 @@ import {
   ApiTags,
   ApiUnauthorizedResponse,
 } from '@nestjs/swagger';
+import { Request } from 'express';
+
+import { TokenAuthGuard } from '../../../auth/token-auth.guard';
+import {
+  AlreadyInDBError,
+  ForbiddenIdError,
+  NotInDBError,
+  PermissionsUpdateInconsistentError,
+} from '../../../errors/errors';
 import { HistoryService } from '../../../history/history.service';
-import { NoteDto } from '../../../notes/note.dto';
+import { ConsoleLoggerService } from '../../../logger/console-logger.service';
+import { MediaUploadDto } from '../../../media/media-upload.dto';
+import { MediaService } from '../../../media/media.service';
 import { NoteMetadataDto } from '../../../notes/note-metadata.dto';
+import {
+  NotePermissionsDto,
+  NotePermissionsUpdateDto,
+} from '../../../notes/note-permissions.dto';
+import { NoteDto } from '../../../notes/note.dto';
+import { Note } from '../../../notes/note.entity';
+import { NoteMediaDeletionDto } from '../../../notes/note.media-deletion.dto';
+import { NotesService } from '../../../notes/notes.service';
+import { PermissionsService } from '../../../permissions/permissions.service';
 import { RevisionMetadataDto } from '../../../revisions/revision-metadata.dto';
 import { RevisionDto } from '../../../revisions/revision.dto';
-import { PermissionsService } from '../../../permissions/permissions.service';
+import { RevisionsService } from '../../../revisions/revisions.service';
-import { Note } from '../../../notes/note.entity';
-import { Request } from 'express';
 import {
   forbiddenDescription,
   successfullyDeletedDescription,
   unauthorizedDescription,
 } from '../../utils/descriptions';
-import { MediaUploadDto } from '../../../media/media-upload.dto';
+import { FullApi } from '../../utils/fullapi-decorator';
-import { MediaService } from '../../../media/media.service';
+import { MarkdownBody } from '../../utils/markdownbody-decorator';
-import { NoteMediaDeletionDto } from '../../../notes/note.media-deletion.dto';
 
 @ApiTags('notes')
 @ApiSecurity('token')

src/api/public/public-api.module.ts

@@ -3,20 +3,20 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Module } from '@nestjs/common';
+
 import { HistoryModule } from '../../history/history.module';
 import { LoggerModule } from '../../logger/logger.module';
 import { MediaModule } from '../../media/media.module';
 import { MonitoringModule } from '../../monitoring/monitoring.module';
 import { NotesModule } from '../../notes/notes.module';
+import { PermissionsModule } from '../../permissions/permissions.module';
 import { RevisionsModule } from '../../revisions/revisions.module';
 import { UsersModule } from '../../users/users.module';
 import { MeController } from './me/me.controller';
-import { NotesController } from './notes/notes.controller';
 import { MediaController } from './media/media.controller';
 import { MonitoringController } from './monitoring/monitoring.controller';
-import { PermissionsModule } from '../../permissions/permissions.module';
+import { NotesController } from './notes/notes.controller';
 
 @Module({
   imports: [

src/api/utils/fullapi-decorator.ts

@@ -3,13 +3,13 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { applyDecorators } from '@nestjs/common';
 import {
   ApiForbiddenResponse,
   ApiNotFoundResponse,
   ApiUnauthorizedResponse,
 } from '@nestjs/swagger';
+
 import { forbiddenDescription, notFoundDescription } from './descriptions';
 
 // eslint-disable-next-line @typescript-eslint/naming-convention

src/api/utils/markdownbody-decorator.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   BadRequestException,
   createParamDecorator,

src/app.module.ts

@@ -3,12 +3,26 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
+import { ScheduleModule } from '@nestjs/schedule';
 import { TypeOrmModule } from '@nestjs/typeorm';
+import { RouterModule, Routes } from 'nest-router';
+
+import { PrivateApiModule } from './api/private/private-api.module';
 import { PublicApiModule } from './api/public/public-api.module';
+import { AuthModule } from './auth/auth.module';
 import { AuthorsModule } from './authors/authors.module';
+import appConfig from './config/app.config';
+import authConfig from './config/auth.config';
+import cspConfig from './config/csp.config';
+import customizationConfig from './config/customization.config';
+import databaseConfig from './config/database.config';
+import externalConfig from './config/external-services.config';
+import hstsConfig from './config/hsts.config';
+import mediaConfig from './config/media.config';
+import { FrontendConfigModule } from './frontend-config/frontend-config.module';
+import { FrontendConfigService } from './frontend-config/frontend-config.service';
 import { GroupsModule } from './groups/groups.module';
 import { HistoryModule } from './history/history.module';
 import { LoggerModule } from './logger/logger.module';
@@ -18,20 +32,6 @@ import { NotesModule } from './notes/notes.module';
 import { PermissionsModule } from './permissions/permissions.module';
 import { RevisionsModule } from './revisions/revisions.module';
 import { UsersModule } from './users/users.module';
-import { AuthModule } from './auth/auth.module';
-import appConfig from './config/app.config';
-import mediaConfig from './config/media.config';
-import hstsConfig from './config/hsts.config';
-import cspConfig from './config/csp.config';
-import databaseConfig from './config/database.config';
-import authConfig from './config/auth.config';
-import customizationConfig from './config/customization.config';
-import externalConfig from './config/external-services.config';
-import { PrivateApiModule } from './api/private/private-api.module';
-import { ScheduleModule } from '@nestjs/schedule';
-import { RouterModule, Routes } from 'nest-router';
-import { FrontendConfigService } from './frontend-config/frontend-config.service';
-import { FrontendConfigModule } from './frontend-config/frontend-config.module';
 
 const routes: Routes = [
   {

src/auth/auth-token-with-secret.dto.ts

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { IsString } from 'class-validator';
+
 import { AuthTokenDto } from './auth-token.dto';
 
 export class AuthTokenWithSecretDto extends AuthTokenDto {

src/auth/auth-token.dto.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { IsDate, IsOptional, IsString } from 'class-validator';
 
 export class AuthTokenDto {

src/auth/auth-token.entity.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   Column,
   CreateDateColumn,
@@ -11,6 +10,7 @@ import {
   ManyToOne,
   PrimaryGeneratedColumn,
 } from 'typeorm';
+
 import { User } from '../users/user.entity';
 
 @Entity()

src/auth/auth.module.ts

@@ -3,15 +3,15 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Module } from '@nestjs/common';
-import { AuthService } from './auth.service';
-import { UsersModule } from '../users/users.module';
 import { PassportModule } from '@nestjs/passport';
-import { TokenStrategy } from './token.strategy';
-import { LoggerModule } from '../logger/logger.module';
 import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { LoggerModule } from '../logger/logger.module';
+import { UsersModule } from '../users/users.module';
 import { AuthToken } from './auth-token.entity';
+import { AuthService } from './auth.service';
+import { TokenStrategy } from './token.strategy';
 
 @Module({
   imports: [

src/auth/auth.service.spec.ts

@@ -3,22 +3,22 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ConfigModule } from '@nestjs/config';
-import { Test, TestingModule } from '@nestjs/testing';
-import { Session } from '../users/session.entity';
-import { AuthService } from './auth.service';
 import { PassportModule } from '@nestjs/passport';
+import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
+import { randomBytes } from 'crypto';
+import { Repository } from 'typeorm';
+
+import appConfigMock from '../config/mock/app.config.mock';
+import { NotInDBError, TokenNotValidError } from '../errors/errors';
+import { LoggerModule } from '../logger/logger.module';
+import { Identity } from '../users/identity.entity';
+import { Session } from '../users/session.entity';
 import { User } from '../users/user.entity';
 import { UsersModule } from '../users/users.module';
-import { Identity } from '../users/identity.entity';
-import { LoggerModule } from '../logger/logger.module';
 import { AuthToken } from './auth-token.entity';
-import { NotInDBError, TokenNotValidError } from '../errors/errors';
+import { AuthService } from './auth.service';
-import { Repository } from 'typeorm';
-import { ConfigModule } from '@nestjs/config';
-import appConfigMock from '../config/mock/app.config.mock';
-import { randomBytes } from 'crypto';
 
 describe('AuthService', () => {
   let service: AuthService;

src/auth/auth.service.ts

@@ -3,25 +3,25 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Injectable } from '@nestjs/common';
-import { UsersService } from '../users/users.service';
+import { Cron, Timeout } from '@nestjs/schedule';
-import { User } from '../users/user.entity';
+import { InjectRepository } from '@nestjs/typeorm';
-import { AuthToken } from './auth-token.entity';
-import { AuthTokenDto } from './auth-token.dto';
-import { AuthTokenWithSecretDto } from './auth-token-with-secret.dto';
 import { compare, hash } from 'bcrypt';
+import { randomBytes } from 'crypto';
+import { Repository } from 'typeorm';
+
 import {
   NotInDBError,
   TokenNotValidError,
   TooManyTokensError,
 } from '../errors/errors';
-import { InjectRepository } from '@nestjs/typeorm';
-import { Repository } from 'typeorm';
 import { ConsoleLoggerService } from '../logger/console-logger.service';
+import { User } from '../users/user.entity';
+import { UsersService } from '../users/users.service';
 import { TimestampMillis } from '../utils/timestamp';
-import { Cron, Timeout } from '@nestjs/schedule';
+import { AuthTokenWithSecretDto } from './auth-token-with-secret.dto';
-import { randomBytes } from 'crypto';
+import { AuthTokenDto } from './auth-token.dto';
+import { AuthToken } from './auth-token.entity';
 
 @Injectable()
 export class AuthService {

src/auth/mock-auth.guard.ts

@@ -3,15 +3,16 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { ExecutionContext, Injectable } from '@nestjs/common';
-import { UsersService } from '../users/users.service';
-import { User } from '../users/user.entity';
 import { Request } from 'express';
 
+import { User } from '../users/user.entity';
+import { UsersService } from '../users/users.service';
+
 @Injectable()
 export class MockAuthGuard {
   private user: User;
+
   constructor(private usersService: UsersService) {}
 
   async canActivate(context: ExecutionContext): Promise<boolean> {

src/auth/token-auth.guard.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Injectable } from '@nestjs/common';
 import { AuthGuard } from '@nestjs/passport';
 

src/auth/token.strategy.ts

@@ -3,13 +3,13 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import { Strategy } from 'passport-http-bearer';
-import { PassportStrategy } from '@nestjs/passport';
 import { Injectable, UnauthorizedException } from '@nestjs/common';
-import { AuthService } from './auth.service';
+import { PassportStrategy } from '@nestjs/passport';
-import { User } from '../users/user.entity';
+import { Strategy } from 'passport-http-bearer';
+
 import { NotInDBError, TokenNotValidError } from '../errors/errors';
+import { User } from '../users/user.entity';
+import { AuthService } from './auth.service';
 
 @Injectable()
 export class TokenStrategy extends PassportStrategy(Strategy, 'token') {

src/authors/author.entity.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   Column,
   Entity,
@@ -11,6 +10,7 @@ import {
   OneToMany,
   PrimaryGeneratedColumn,
 } from 'typeorm';
+
 import { Edit } from '../revisions/edit.entity';
 import { Session } from '../users/session.entity';
 import { User } from '../users/user.entity';

src/authors/authors.module.ts

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
+
 import { Author } from './author.entity';
 
 @Module({

src/config/app.config.ts

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { registerAs } from '@nestjs/config';
 import * as Joi from 'joi';
+
 import { Loglevel } from './loglevel.enum';
 import { buildErrorMessage, parseOptionalInt, toArrayConfig } from './utils';
 

src/config/auth.config.ts

@@ -3,15 +3,15 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { registerAs } from '@nestjs/config';
 import * as Joi from 'joi';
+
 import { GitlabScope, GitlabVersion } from './gitlab.enum';
 import {
   buildErrorMessage,
   replaceAuthErrorsWithEnvironmentVariables,
   toArrayConfig,
 } from './utils';
-import { registerAs } from '@nestjs/config';
 
 export interface AuthConfig {
   email: {

src/config/csp.config.ts

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import * as Joi from 'joi';
 import { registerAs } from '@nestjs/config';
+import * as Joi from 'joi';
+
 import { buildErrorMessage } from './utils';
 
 export interface CspConfig {

src/config/customization.config.ts

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { registerAs } from '@nestjs/config';
 import * as Joi from 'joi';
+
 import { buildErrorMessage } from './utils';
 
 export interface CustomizationConfig {

src/config/database.config.ts

@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import * as Joi from 'joi';
-import { DatabaseDialect } from './database-dialect.enum';
 import { registerAs } from '@nestjs/config';
+import * as Joi from 'joi';
+
+import { DatabaseDialect } from './database-dialect.enum';
 import { buildErrorMessage, parseOptionalInt } from './utils';
 
 export interface DatabaseConfig {

src/config/external-services.config.ts

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { registerAs } from '@nestjs/config';
 import * as Joi from 'joi';
+
 import { buildErrorMessage } from './utils';
 
 export interface ExternalServicesConfig {

src/config/hsts.config.ts

@@ -3,9 +3,9 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import * as Joi from 'joi';
 import { registerAs } from '@nestjs/config';
+import * as Joi from 'joi';
+
 import { buildErrorMessage, parseOptionalInt } from './utils';
 
 export interface HstsConfig {

src/config/media.config.ts

@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import * as Joi from 'joi';
-import { BackendType } from '../media/backends/backend-type.enum';
 import { registerAs } from '@nestjs/config';
+import * as Joi from 'joi';
+
+import { BackendType } from '../media/backends/backend-type.enum';
 import { buildErrorMessage } from './utils';
 
 export interface MediaConfig {

src/config/mock/app.config.mock.ts

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { registerAs } from '@nestjs/config';
+
 import { Loglevel } from '../loglevel.enum';
 
 export default registerAs('appConfig', () => ({

src/config/mock/auth.config.mock.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { registerAs } from '@nestjs/config';
 
 export default registerAs('authConfig', () => ({

src/config/mock/customization.config.mock.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { registerAs } from '@nestjs/config';
 
 export default registerAs('customizationConfig', () => ({

src/config/mock/external-services.config.mock.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { registerAs } from '@nestjs/config';
 
 export default registerAs('externalServicesConfig', () => ({

src/config/mock/media.config.mock.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { registerAs } from '@nestjs/config';
 
 export default registerAs('mediaConfig', () => ({

src/config/utils.spec.ts

@@ -3,14 +3,13 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { Loglevel } from './loglevel.enum';
 import {
   needToLog,
   parseOptionalInt,
   replaceAuthErrorsWithEnvironmentVariables,
   toArrayConfig,
 } from './utils';
-import { Loglevel } from './loglevel.enum';
 
 describe('config utils', () => {
   describe('toArrayConfig', () => {

src/config/utils.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Loglevel } from './loglevel.enum';
 
 export function toArrayConfig(configValue?: string, separator = ','): string[] {

src/frontend-config/frontend-config.dto.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   IsArray,
   IsBoolean,
@@ -13,6 +12,7 @@ import {
   IsUrl,
   ValidateNested,
 } from 'class-validator';
+
 import { ServerVersion } from '../monitoring/server-status.dto';
 
 export class AuthProviders {

src/frontend-config/frontend-config.module.ts

@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Module } from '@nestjs/common';
-import { LoggerModule } from '../logger/logger.module';
 import { ConfigModule } from '@nestjs/config';
+
+import { LoggerModule } from '../logger/logger.module';
 import { FrontendConfigService } from './frontend-config.service';
 
 @Module({

src/frontend-config/frontend-config.service.spec.ts

@@ -3,18 +3,18 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import { Test, TestingModule } from '@nestjs/testing';
-import { FrontendConfigService } from './frontend-config.service';
 import { ConfigModule, registerAs } from '@nestjs/config';
-import { LoggerModule } from '../logger/logger.module';
+import { Test, TestingModule } from '@nestjs/testing';
-import { AuthConfig } from '../config/auth.config';
+
-import { GitlabScope, GitlabVersion } from '../config/gitlab.enum';
-import { getServerVersionFromPackageJson } from '../utils/serverVersion';
-import { CustomizationConfig } from '../config/customization.config';
 import { AppConfig } from '../config/app.config';
+import { AuthConfig } from '../config/auth.config';
+import { CustomizationConfig } from '../config/customization.config';
 import { ExternalServicesConfig } from '../config/external-services.config';
+import { GitlabScope, GitlabVersion } from '../config/gitlab.enum';
 import { Loglevel } from '../config/loglevel.enum';
+import { LoggerModule } from '../logger/logger.module';
+import { getServerVersionFromPackageJson } from '../utils/serverVersion';
+import { FrontendConfigService } from './frontend-config.service';
 
 /* eslint-disable
  jest/no-conditional-expect

src/frontend-config/frontend-config.service.ts

@@ -3,9 +3,18 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Inject, Injectable } from '@nestjs/common';
+
+import appConfiguration, { AppConfig } from '../config/app.config';
+import authConfiguration, { AuthConfig } from '../config/auth.config';
+import customizationConfiguration, {
+  CustomizationConfig,
+} from '../config/customization.config';
+import externalServicesConfiguration, {
+  ExternalServicesConfig,
+} from '../config/external-services.config';
 import { ConsoleLoggerService } from '../logger/console-logger.service';
+import { getServerVersionFromPackageJson } from '../utils/serverVersion';
 import {
   AuthProviders,
   BrandingDto,
@@ -14,15 +23,6 @@ import {
   IframeCommunicationDto,
   SpecialUrlsDto,
 } from './frontend-config.dto';
-import authConfiguration, { AuthConfig } from '../config/auth.config';
-import customizationConfiguration, {
-  CustomizationConfig,
-} from '../config/customization.config';
-import appConfiguration, { AppConfig } from '../config/app.config';
-import externalServicesConfiguration, {
-  ExternalServicesConfig,
-} from '../config/external-services.config';
-import { getServerVersionFromPackageJson } from '../utils/serverVersion';
 
 @Injectable()
 export class FrontendConfigService {

src/groups/group-info.dto.ts

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { IsBoolean, IsString } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
+import { IsBoolean, IsString } from 'class-validator';
 
 export class GroupInfoDto {
   /**

src/groups/group.entity.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   Column,
   Entity,
@@ -11,6 +10,7 @@ import {
   ManyToMany,
   PrimaryGeneratedColumn,
 } from 'typeorm';
+
 import { User } from '../users/user.entity';
 
 @Entity()

src/groups/groups.module.ts

@@ -3,12 +3,12 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { LoggerModule } from '../logger/logger.module';
 import { Group } from './group.entity';
 import { GroupsService } from './groups.service';
-import { LoggerModule } from '../logger/logger.module';
 
 @Module({
   imports: [TypeOrmModule.forFeature([Group]), LoggerModule],

src/groups/groups.service.spec.ts

@@ -3,16 +3,16 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
-import { GroupsService } from './groups.service';
 import { getRepositoryToken } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { Group } from './group.entity';
+
+import appConfigMock from '../config/mock/app.config.mock';
 import { NotInDBError } from '../errors/errors';
 import { LoggerModule } from '../logger/logger.module';
-import { ConfigModule } from '@nestjs/config';
+import { Group } from './group.entity';
-import appConfigMock from '../config/mock/app.config.mock';
+import { GroupsService } from './groups.service';
 
 describe('GroupsService', () => {
   let service: GroupsService;

src/groups/groups.service.ts

@@ -3,14 +3,14 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Injectable } from '@nestjs/common';
-import { ConsoleLoggerService } from '../logger/console-logger.service';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { Group } from './group.entity';
+
 import { NotInDBError } from '../errors/errors';
+import { ConsoleLoggerService } from '../logger/console-logger.service';
 import { GroupInfoDto } from './group-info.dto';
+import { Group } from './group.entity';
 
 @Injectable()
 export class GroupsService {

src/history/history-entry-import.dto.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { IsBoolean, IsDate, IsString } from 'class-validator';
 
 export class HistoryEntryImportDto {

src/history/history-entry-update.dto.ts

@@ -3,9 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import { IsBoolean } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
+import { IsBoolean } from 'class-validator';
 
 export class HistoryEntryUpdateDto {
   /**

src/history/history-entry.dto.ts

@@ -3,9 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import { IsArray, IsBoolean, IsDate, IsString } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
+import { IsArray, IsBoolean, IsDate, IsString } from 'class-validator';
 
 export class HistoryEntryDto {
   /**

src/history/history-entry.entity.ts

@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Column, Entity, ManyToOne, UpdateDateColumn } from 'typeorm';
-import { User } from '../users/user.entity';
+
 import { Note } from '../notes/note.entity';
+import { User } from '../users/user.entity';
 
 @Entity()
 export class HistoryEntry {

src/history/history.module.ts

@@ -3,15 +3,15 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Module } from '@nestjs/common';
-import { LoggerModule } from '../logger/logger.module';
-import { HistoryService } from './history.service';
-import { TypeOrmModule } from '@nestjs/typeorm';
-import { HistoryEntry } from './history-entry.entity';
-import { UsersModule } from '../users/users.module';
-import { NotesModule } from '../notes/notes.module';
 import { ConfigModule } from '@nestjs/config';
+import { TypeOrmModule } from '@nestjs/typeorm';
+
+import { LoggerModule } from '../logger/logger.module';
+import { NotesModule } from '../notes/notes.module';
+import { UsersModule } from '../users/users.module';
+import { HistoryEntry } from './history-entry.entity';
+import { HistoryService } from './history.service';
 
 @Module({
   providers: [HistoryService],

src/history/history.service.spec.ts

@@ -3,31 +3,31 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
-import { Author } from '../authors/author.entity';
-import { LoggerModule } from '../logger/logger.module';
-import { Session } from '../users/session.entity';
-import { HistoryService } from './history.service';
-import { UsersModule } from '../users/users.module';
-import { NotesModule } from '../notes/notes.module';
 import { getConnectionToken, getRepositoryToken } from '@nestjs/typeorm';
-import { Identity } from '../users/identity.entity';
-import { User } from '../users/user.entity';
-import { Edit } from '../revisions/edit.entity';
-import { HistoryEntry } from './history-entry.entity';
-import { Note } from '../notes/note.entity';
-import { Tag } from '../notes/tag.entity';
-import { AuthToken } from '../auth/auth-token.entity';
-import { Revision } from '../revisions/revision.entity';
 import { Connection, Repository } from 'typeorm';
+
+import { AuthToken } from '../auth/auth-token.entity';
+import { Author } from '../authors/author.entity';
+import appConfigMock from '../config/mock/app.config.mock';
 import { NotInDBError } from '../errors/errors';
+import { Group } from '../groups/group.entity';
+import { LoggerModule } from '../logger/logger.module';
+import { Note } from '../notes/note.entity';
+import { NotesModule } from '../notes/notes.module';
+import { Tag } from '../notes/tag.entity';
 import { NoteGroupPermission } from '../permissions/note-group-permission.entity';
 import { NoteUserPermission } from '../permissions/note-user-permission.entity';
-import { Group } from '../groups/group.entity';
+import { Edit } from '../revisions/edit.entity';
-import { ConfigModule } from '@nestjs/config';
+import { Revision } from '../revisions/revision.entity';
-import appConfigMock from '../config/mock/app.config.mock';
+import { Identity } from '../users/identity.entity';
+import { Session } from '../users/session.entity';
+import { User } from '../users/user.entity';
+import { UsersModule } from '../users/users.module';
 import { HistoryEntryImportDto } from './history-entry-import.dto';
+import { HistoryEntry } from './history-entry.entity';
+import { HistoryService } from './history.service';
 
 describe('HistoryService', () => {
   let service: HistoryService;

src/history/history.service.ts

@@ -3,20 +3,20 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Injectable } from '@nestjs/common';
-import { ConsoleLoggerService } from '../logger/console-logger.service';
-import { HistoryEntryUpdateDto } from './history-entry-update.dto';
-import { HistoryEntryDto } from './history-entry.dto';
 import { InjectConnection, InjectRepository } from '@nestjs/typeorm';
 import { Connection, Repository } from 'typeorm';
-import { HistoryEntry } from './history-entry.entity';
+
-import { UsersService } from '../users/users.service';
+import { NotInDBError } from '../errors/errors';
+import { ConsoleLoggerService } from '../logger/console-logger.service';
+import { Note } from '../notes/note.entity';
 import { NotesService } from '../notes/notes.service';
 import { User } from '../users/user.entity';
-import { Note } from '../notes/note.entity';
+import { UsersService } from '../users/users.service';
-import { NotInDBError } from '../errors/errors';
 import { HistoryEntryImportDto } from './history-entry-import.dto';
+import { HistoryEntryUpdateDto } from './history-entry-update.dto';
+import { HistoryEntryDto } from './history-entry.dto';
+import { HistoryEntry } from './history-entry.entity';
 
 @Injectable()
 export class HistoryService {

src/logger/console-logger.service.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   Inject,
   Injectable,
@@ -12,12 +11,14 @@ import {
   Scope,
 } from '@nestjs/common';
 import { isObject } from '@nestjs/common/utils/shared.utils';
-import clc = require('cli-color');
+
-import DateTimeFormatOptions = Intl.DateTimeFormatOptions;
 import appConfiguration, { AppConfig } from '../config/app.config';
 import { Loglevel } from '../config/loglevel.enum';
 import { needToLog } from '../config/utils';
 
+import clc = require('cli-color');
+import DateTimeFormatOptions = Intl.DateTimeFormatOptions;
+
 @Injectable({ scope: Scope.TRANSIENT })
 export class ConsoleLoggerService implements LoggerService {
   private classContext: string | undefined;

src/logger/logger.module.ts

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Module } from '@nestjs/common';
+
 import { ConsoleLoggerService } from './console-logger.service';
 
 @Module({

src/main.ts

@@ -3,17 +3,17 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { LogLevel, ValidationPipe } from '@nestjs/common';
 import { ConfigService } from '@nestjs/config';
 import { NestFactory } from '@nestjs/core';
 import { NestExpressApplication } from '@nestjs/platform-express';
+
 import { AppModule } from './app.module';
 import { AppConfig } from './config/app.config';
 import { MediaConfig } from './config/media.config';
-import { setupPrivateApiDocs, setupPublicApiDocs } from './utils/swagger';
-import { BackendType } from './media/backends/backend-type.enum';
 import { ConsoleLoggerService } from './logger/console-logger.service';
+import { BackendType } from './media/backends/backend-type.enum';
+import { setupPrivateApiDocs, setupPublicApiDocs } from './utils/swagger';
 
 async function bootstrap(): Promise<void> {
   const app = await NestFactory.create<NestExpressApplication>(AppModule, {

src/media/backends/azure-backend.ts

@@ -3,19 +3,19 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import { Inject, Injectable } from '@nestjs/common';
-import mediaConfiguration, { MediaConfig } from '../../config/media.config';
-import { ConsoleLoggerService } from '../../logger/console-logger.service';
-import { MediaBackend } from '../media-backend.interface';
-import { BackendData } from '../media-upload.entity';
 import {
   BlobServiceClient,
   BlockBlobClient,
   ContainerClient,
 } from '@azure/storage-blob';
-import { BackendType } from './backend-type.enum';
+import { Inject, Injectable } from '@nestjs/common';
+
+import mediaConfiguration, { MediaConfig } from '../../config/media.config';
 import { MediaBackendError } from '../../errors/errors';
+import { ConsoleLoggerService } from '../../logger/console-logger.service';
+import { MediaBackend } from '../media-backend.interface';
+import { BackendData } from '../media-upload.entity';
+import { BackendType } from './backend-type.enum';
 
 @Injectable()
 export class AzureBackend implements MediaBackend {

src/media/backends/filesystem-backend.ts

@@ -3,16 +3,15 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Inject, Injectable } from '@nestjs/common';
 import { promises as fs } from 'fs';
 import { join } from 'path';
-import mediaConfiguration from '../../config/media.config';
+
+import mediaConfiguration, { MediaConfig } from '../../config/media.config';
+import { MediaBackendError } from '../../errors/errors';
 import { ConsoleLoggerService } from '../../logger/console-logger.service';
 import { MediaBackend } from '../media-backend.interface';
 import { BackendData } from '../media-upload.entity';
-import { MediaConfig } from '../../config/media.config';
-import { MediaBackendError } from '../../errors/errors';
 
 @Injectable()
 export class FilesystemBackend implements MediaBackend {

src/media/backends/imgur-backend.ts

@@ -3,16 +3,15 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Inject, Injectable } from '@nestjs/common';
-import mediaConfiguration from '../../config/media.config';
+import fetch, { Response } from 'node-fetch';
+import { URLSearchParams } from 'url';
+
+import mediaConfiguration, { MediaConfig } from '../../config/media.config';
+import { MediaBackendError } from '../../errors/errors';
 import { ConsoleLoggerService } from '../../logger/console-logger.service';
 import { MediaBackend } from '../media-backend.interface';
 import { BackendData } from '../media-upload.entity';
-import { MediaConfig } from '../../config/media.config';
-import fetch, { Response } from 'node-fetch';
-import { URLSearchParams } from 'url';
-import { MediaBackendError } from '../../errors/errors';
 
 type UploadResult = {
   data: {

src/media/backends/s3-backend.ts

@@ -3,16 +3,15 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Inject, Injectable } from '@nestjs/common';
-import mediaConfiguration from '../../config/media.config';
+import { Client } from 'minio';
+
+import mediaConfiguration, { MediaConfig } from '../../config/media.config';
+import { MediaBackendError } from '../../errors/errors';
 import { ConsoleLoggerService } from '../../logger/console-logger.service';
 import { MediaBackend } from '../media-backend.interface';
 import { BackendData } from '../media-upload.entity';
-import { MediaConfig } from '../../config/media.config';
-import { Client } from 'minio';
 import { BackendType } from './backend-type.enum';
-import { MediaBackendError } from '../../errors/errors';
 
 @Injectable()
 export class S3Backend implements MediaBackend {

src/media/backends/webdav-backend.ts

@@ -3,16 +3,15 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Inject, Injectable } from '@nestjs/common';
-import mediaConfiguration from '../../config/media.config';
+import fetch, { Response } from 'node-fetch';
+
+import mediaConfiguration, { MediaConfig } from '../../config/media.config';
+import { MediaBackendError } from '../../errors/errors';
 import { ConsoleLoggerService } from '../../logger/console-logger.service';
 import { MediaBackend } from '../media-backend.interface';
 import { BackendData } from '../media-upload.entity';
-import { MediaConfig } from '../../config/media.config';
-import { MediaBackendError } from '../../errors/errors';
 import { BackendType } from './backend-type.enum';
-import fetch, { Response } from 'node-fetch';
 
 @Injectable()
 export class WebdavBackend implements MediaBackend {

src/media/media-backend.interface.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { BackendData } from './media-upload.entity';
 
 export interface MediaBackend {

src/media/media-upload-url.dto.ts

@@ -3,9 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import { IsString } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
+import { IsString } from 'class-validator';
 
 export class MediaUploadUrlDto {
   @IsString()

src/media/media-upload.dto.ts

@@ -3,9 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
-import { IsDate, IsOptional, IsString } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
+import { IsDate, IsOptional, IsString } from 'class-validator';
 
 export class MediaUploadDto {
   /**

src/media/media-upload.entity.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import * as crypto from 'crypto';
 import {
   Column,
@@ -12,6 +11,7 @@ import {
   ManyToOne,
   PrimaryColumn,
 } from 'typeorm';
+
 import { Note } from '../notes/note.entity';
 import { User } from '../users/user.entity';
 import { BackendType } from './backends/backend-type.enum';

src/media/media.module.ts

@@ -3,20 +3,20 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { TypeOrmModule } from '@nestjs/typeorm';
+
 import { LoggerModule } from '../logger/logger.module';
 import { NotesModule } from '../notes/notes.module';
 import { UsersModule } from '../users/users.module';
+import { AzureBackend } from './backends/azure-backend';
 import { FilesystemBackend } from './backends/filesystem-backend';
+import { ImgurBackend } from './backends/imgur-backend';
+import { S3Backend } from './backends/s3-backend';
+import { WebdavBackend } from './backends/webdav-backend';
 import { MediaUpload } from './media-upload.entity';
 import { MediaService } from './media.service';
-import { S3Backend } from './backends/s3-backend';
-import { ImgurBackend } from './backends/imgur-backend';
-import { AzureBackend } from './backends/azure-backend';
-import { WebdavBackend } from './backends/webdav-backend';
 
 @Module({
   imports: [

src/media/media.service.spec.ts

@@ -3,19 +3,26 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { ConfigModule } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
+import { promises as fs } from 'fs';
+import { Repository } from 'typeorm';
+
+import appConfigMock from '../../src/config/mock/app.config.mock';
+import { AuthToken } from '../auth/auth-token.entity';
 import { Author } from '../authors/author.entity';
 import mediaConfigMock from '../config/mock/media.config.mock';
+import { ClientError, NotInDBError } from '../errors/errors';
+import { Group } from '../groups/group.entity';
 import { LoggerModule } from '../logger/logger.module';
 import { Note } from '../notes/note.entity';
 import { NotesModule } from '../notes/notes.module';
 import { Tag } from '../notes/tag.entity';
+import { NoteGroupPermission } from '../permissions/note-group-permission.entity';
+import { NoteUserPermission } from '../permissions/note-user-permission.entity';
 import { Edit } from '../revisions/edit.entity';
 import { Revision } from '../revisions/revision.entity';
-import { AuthToken } from '../auth/auth-token.entity';
 import { Identity } from '../users/identity.entity';
 import { Session } from '../users/session.entity';
 import { User } from '../users/user.entity';
@@ -23,13 +30,6 @@ import { UsersModule } from '../users/users.module';
 import { FilesystemBackend } from './backends/filesystem-backend';
 import { BackendData, MediaUpload } from './media-upload.entity';
 import { MediaService } from './media.service';
-import { Repository } from 'typeorm';
-import { promises as fs } from 'fs';
-import { ClientError, NotInDBError } from '../errors/errors';
-import { NoteGroupPermission } from '../permissions/note-group-permission.entity';
-import { NoteUserPermission } from '../permissions/note-user-permission.entity';
-import { Group } from '../groups/group.entity';
-import appConfigMock from '../../src/config/mock/app.config.mock';
 
 describe('MediaService', () => {
   let service: MediaService;

src/media/media.service.ts

@@ -3,29 +3,29 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Inject, Injectable } from '@nestjs/common';
 import { ModuleRef } from '@nestjs/core';
 import { InjectRepository } from '@nestjs/typeorm';
 import * as FileType from 'file-type';
 import { Repository } from 'typeorm';
+
 import mediaConfiguration, { MediaConfig } from '../config/media.config';
 import { ClientError, NotInDBError } from '../errors/errors';
 import { ConsoleLoggerService } from '../logger/console-logger.service';
+import { Note } from '../notes/note.entity';
 import { NotesService } from '../notes/notes.service';
+import { User } from '../users/user.entity';
 import { UsersService } from '../users/users.service';
+import { AzureBackend } from './backends/azure-backend';
 import { BackendType } from './backends/backend-type.enum';
 import { FilesystemBackend } from './backends/filesystem-backend';
-import { MediaBackend } from './media-backend.interface';
-import { MediaUpload } from './media-upload.entity';
-import { MediaUploadUrlDto } from './media-upload-url.dto';
-import { S3Backend } from './backends/s3-backend';
-import { AzureBackend } from './backends/azure-backend';
 import { ImgurBackend } from './backends/imgur-backend';
-import { User } from '../users/user.entity';
+import { S3Backend } from './backends/s3-backend';
-import { MediaUploadDto } from './media-upload.dto';
-import { Note } from '../notes/note.entity';
 import { WebdavBackend } from './backends/webdav-backend';
+import { MediaBackend } from './media-backend.interface';
+import { MediaUploadUrlDto } from './media-upload-url.dto';
+import { MediaUploadDto } from './media-upload.dto';
+import { MediaUpload } from './media-upload.entity';
 
 @Injectable()
 export class MediaService {

src/media/multer-file.interface.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Readable } from 'stream';
 
 // Type from https://github.com/DefinitelyTyped/DefinitelyTyped/blob/master/types/multer/index.d.ts

src/monitoring/monitoring.module.ts

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Module } from '@nestjs/common';
+
 import { LoggerModule } from '../logger/logger.module';
 import { MonitoringService } from './monitoring.service';
 

src/monitoring/monitoring.service.spec.ts

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Test, TestingModule } from '@nestjs/testing';
+
 import { MonitoringService } from './monitoring.service';
 
 describe('MonitoringService', () => {

src/monitoring/monitoring.service.ts

@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Injectable } from '@nestjs/common';
-import { ServerStatusDto } from './server-status.dto';
+
 import { getServerVersionFromPackageJson } from '../utils/serverVersion';
+import { ServerStatusDto } from './server-status.dto';
 
 @Injectable()
 export class MonitoringService {

src/monitoring/server-status.dto.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { ApiProperty } from '@nestjs/swagger';
 
 export class ServerVersion {

src/notes/note-metadata.dto.ts

@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import {
   IsArray,
   IsDate,
@@ -12,9 +12,9 @@ import {
   IsString,
   ValidateNested,
 } from 'class-validator';
+
 import { UserInfoDto } from '../users/user-info.dto';
 import { NotePermissionsDto } from './note-permissions.dto';
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 
 export class NoteMetadataDto {
   /**

src/notes/note-permissions.dto.ts

@@ -3,7 +3,7 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
 import {
   IsArray,
   IsBoolean,
@@ -11,9 +11,9 @@ import {
   IsString,
   ValidateNested,
 } from 'class-validator';
-import { UserInfoDto } from '../users/user-info.dto';
+
 import { GroupInfoDto } from '../groups/group-info.dto';
-import { ApiProperty, ApiPropertyOptional } from '@nestjs/swagger';
+import { UserInfoDto } from '../users/user-info.dto';
 
 export class NoteUserPermissionEntryDto {
   /**

src/notes/note.dto.ts

@@ -3,11 +3,11 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ApiProperty } from '@nestjs/swagger';
 import { IsArray, IsString, ValidateNested } from 'class-validator';
+
 import { EditDto } from '../revisions/edit.dto';
 import { NoteMetadataDto } from './note-metadata.dto';
-import { ApiProperty } from '@nestjs/swagger';
 
 export class NoteDto {
   /**

src/notes/note.entity.ts

@@ -3,7 +3,6 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import {
   Column,
   Entity,
@@ -13,13 +12,14 @@ import {
   OneToMany,
   PrimaryGeneratedColumn,
 } from 'typeorm';
+
+import { HistoryEntry } from '../history/history-entry.entity';
+import { MediaUpload } from '../media/media-upload.entity';
 import { NoteGroupPermission } from '../permissions/note-group-permission.entity';
 import { NoteUserPermission } from '../permissions/note-user-permission.entity';
 import { Revision } from '../revisions/revision.entity';
 import { User } from '../users/user.entity';
 import { Tag } from './tag.entity';
-import { HistoryEntry } from '../history/history-entry.entity';
-import { MediaUpload } from '../media/media-upload.entity';
 import { generatePublicId } from './utils';
 
 @Entity()

src/notes/note.media-deletion.dto.ts

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-import { IsBoolean } from 'class-validator';
 import { ApiProperty } from '@nestjs/swagger';
+import { IsBoolean } from 'class-validator';
 
 export class NoteMediaDeletionDto {
   /**

src/notes/notes.module.ts

@@ -3,10 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { forwardRef, Module } from '@nestjs/common';
 import { ConfigModule } from '@nestjs/config';
 import { TypeOrmModule } from '@nestjs/typeorm';
+
 import { GroupsModule } from '../groups/groups.module';
 import { LoggerModule } from '../logger/logger.module';
 import { NoteGroupPermission } from '../permissions/note-group-permission.entity';

src/notes/notes.service.spec.ts

@@ -3,39 +3,39 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
+import { ConfigModule, ConfigService } from '@nestjs/config';
 import { Test, TestingModule } from '@nestjs/testing';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { Author } from '../authors/author.entity';
-import { LoggerModule } from '../logger/logger.module';
-import { Edit } from '../revisions/edit.entity';
-import { Revision } from '../revisions/revision.entity';
-import { RevisionsModule } from '../revisions/revisions.module';
-import { AuthToken } from '../auth/auth-token.entity';
-import { Identity } from '../users/identity.entity';
-import { Session } from '../users/session.entity';
-import { User } from '../users/user.entity';
-import { UsersModule } from '../users/users.module';
-import { Note } from './note.entity';
-import { NotesService } from './notes.service';
 import { Repository } from 'typeorm';
-import { Tag } from './tag.entity';
+
+import { AuthToken } from '../auth/auth-token.entity';
+import { Author } from '../authors/author.entity';
+import appConfigMock from '../config/mock/app.config.mock';
 import {
   AlreadyInDBError,
   ForbiddenIdError,
   NotInDBError,
   PermissionsUpdateInconsistentError,
 } from '../errors/errors';
+import { Group } from '../groups/group.entity';
+import { GroupsModule } from '../groups/groups.module';
+import { LoggerModule } from '../logger/logger.module';
+import { NoteGroupPermission } from '../permissions/note-group-permission.entity';
+import { NoteUserPermission } from '../permissions/note-user-permission.entity';
+import { Edit } from '../revisions/edit.entity';
+import { Revision } from '../revisions/revision.entity';
+import { RevisionsModule } from '../revisions/revisions.module';
+import { Identity } from '../users/identity.entity';
+import { Session } from '../users/session.entity';
+import { User } from '../users/user.entity';
+import { UsersModule } from '../users/users.module';
 import {
   NoteGroupPermissionUpdateDto,
   NoteUserPermissionUpdateDto,
 } from './note-permissions.dto';
-import { NoteGroupPermission } from '../permissions/note-group-permission.entity';
+import { Note } from './note.entity';
-import { NoteUserPermission } from '../permissions/note-user-permission.entity';
+import { NotesService } from './notes.service';
-import { GroupsModule } from '../groups/groups.module';
+import { Tag } from './tag.entity';
-import { Group } from '../groups/group.entity';
-import { ConfigModule, ConfigService } from '@nestjs/config';
-import appConfigMock from '../config/mock/app.config.mock';
 
 describe('NotesService', () => {
   let service: NotesService;

src/notes/notes.service.ts

@@ -3,21 +3,27 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { forwardRef, Inject, Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
+
+import appConfiguration, { AppConfig } from '../config/app.config';
 import {
   AlreadyInDBError,
   ForbiddenIdError,
   NotInDBError,
   PermissionsUpdateInconsistentError,
 } from '../errors/errors';
+import { GroupsService } from '../groups/groups.service';
+import { HistoryEntry } from '../history/history-entry.entity';
 import { ConsoleLoggerService } from '../logger/console-logger.service';
+import { NoteGroupPermission } from '../permissions/note-group-permission.entity';
+import { NoteUserPermission } from '../permissions/note-user-permission.entity';
 import { Revision } from '../revisions/revision.entity';
 import { RevisionsService } from '../revisions/revisions.service';
 import { User } from '../users/user.entity';
 import { UsersService } from '../users/users.service';
+import { checkArrayForDuplicates } from '../utils/arrayDuplicatCheck';
 import { NoteMetadataDto } from './note-metadata.dto';
 import {
   NotePermissionsDto,
@@ -26,14 +32,6 @@ import {
 import { NoteDto } from './note.dto';
 import { Note } from './note.entity';
 import { Tag } from './tag.entity';
-import { HistoryEntry } from '../history/history-entry.entity';
-import { NoteUserPermission } from '../permissions/note-user-permission.entity';
-import { NoteGroupPermission } from '../permissions/note-group-permission.entity';
-import { GroupsService } from '../groups/groups.service';
-import { checkArrayForDuplicates } from '../utils/arrayDuplicatCheck';
-import appConfiguration, { AppConfig } from '../config/app.config';
-import base32Encode from 'base32-encode';
-import { randomBytes } from 'crypto';
 
 @Injectable()
 export class NotesService {

src/notes/tag.entity.ts

@@ -3,8 +3,8 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { Column, Entity, ManyToMany, PrimaryGeneratedColumn } from 'typeorm';
+
 import { Note } from './note.entity';
 
 @Entity()

src/notes/utils.spec.ts

@@ -3,9 +3,10 @@
  *
  * SPDX-License-Identifier: AGPL-3.0-only
  */
-
 import { randomBytes } from 'crypto';
+
 import { generatePublicId } from './utils';
+
 jest.mock('crypto');
 
 it('generatePublicId', () => {