From e05191eeedb7bd2150e45b18d01633384bce762c Mon Sep 17 00:00:00 2001
From: David Mehren <dmehren1@gmail.com>
Date: Fri, 12 Jun 2020 22:15:04 +0200
Subject: [PATCH] Move src/lib/utils.ts to src/lib/utils/functions.ts

We probably don't want a utils directory and a utils file.

Signed-off-by: David Mehren <dmehren1@gmail.com>
---
 src/lib/app.ts                           | 2 +-
 src/lib/models/note.ts                   | 2 +-
 src/lib/models/revision.ts               | 2 +-
 src/lib/realtime.ts                      | 2 +-
 src/lib/{utils.ts => utils/functions.ts} | 8 ++++----
 src/lib/web/imageRouter/minio.ts         | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)
 rename src/lib/{utils.ts => utils/functions.ts} (93%)

diff --git a/src/lib/app.ts b/src/lib/app.ts
index fbe1c0738..d4eaa8e90 100644
--- a/src/lib/app.ts
+++ b/src/lib/app.ts
@@ -25,7 +25,7 @@ import { errors } from './errors'
 import { logger } from './logger'
 import { Revision, sequelize } from './models'
 import { realtime } from './realtime'
-import { handleTermSignals } from './utils'
+import { handleTermSignals } from './utils/functions'
 import { AuthRouter, BaseRouter, HistoryRouter, ImageRouter, NoteRouter, StatusRouter, UserRouter } from './web/'
 import { tooBusy, checkURI, redirectWithoutTrailingSlashes, codiMDVersion } from './web/middleware'
 
diff --git a/src/lib/models/note.ts b/src/lib/models/note.ts
index 2cc56711f..c186ce108 100644
--- a/src/lib/models/note.ts
+++ b/src/lib/models/note.ts
@@ -31,7 +31,7 @@ import S from 'string'
 import { config } from '../config'
 import { logger } from '../logger'
 import ot from '../ot'
-import { processData, stripNullByte } from '../utils'
+import { processData, stripNullByte } from '../utils/functions'
 import { Author, Revision, User } from './index'
 
 const md = markdownIt()
diff --git a/src/lib/models/revision.ts b/src/lib/models/revision.ts
index bf0faa83e..074d5c241 100644
--- a/src/lib/models/revision.ts
+++ b/src/lib/models/revision.ts
@@ -4,7 +4,7 @@ import Sequelize from 'sequelize'
 import { BelongsTo, Column, DataType, Default, ForeignKey, Model, PrimaryKey, Table } from 'sequelize-typescript'
 // core
 import { logger } from '../logger'
-import { processData, stripNullByte } from '../utils'
+import { processData, stripNullByte } from '../utils/functions'
 import { Note } from './note'
 import async = require('async')
 import childProcess = require('child_process')
diff --git a/src/lib/realtime.ts b/src/lib/realtime.ts
index eb87cd4fa..9ba9c2626 100644
--- a/src/lib/realtime.ts
+++ b/src/lib/realtime.ts
@@ -13,7 +13,7 @@ import { Author, Note, Revision, User } from './models'
 import { NoteAuthorship } from './models/note'
 import { PhotoProfile } from './utils/PhotoProfile'
 import { EditorSocketIOServer } from './ot/editor-socketio-server'
-import { mapToObject } from './utils'
+import { mapToObject } from './utils/functions'
 
 export type SocketWithNoteId = Socket & { noteId: string }
 
diff --git a/src/lib/utils.ts b/src/lib/utils/functions.ts
similarity index 93%
rename from src/lib/utils.ts
rename to src/lib/utils/functions.ts
index 8509a1cef..45ff70a59 100644
--- a/src/lib/utils.ts
+++ b/src/lib/utils/functions.ts
@@ -1,8 +1,8 @@
 import fs from 'fs'
-import { config } from './config'
-import { logger } from './logger'
-import { Revision } from './models'
-import { realtime } from './realtime'
+import { config } from '../config'
+import { logger } from '../logger'
+import { Revision } from '../models'
+import { realtime } from '../realtime'
 
 /*
 Converts a map from string to something into a plain JS object for transmitting via a websocket
diff --git a/src/lib/web/imageRouter/minio.ts b/src/lib/web/imageRouter/minio.ts
index d3d3a66f0..42c113fd4 100644
--- a/src/lib/web/imageRouter/minio.ts
+++ b/src/lib/web/imageRouter/minio.ts
@@ -3,7 +3,7 @@ import fs from 'fs'
 import { Client } from 'minio'
 
 import { config } from '../../config'
-import { getImageMimeType } from '../../utils'
+import { getImageMimeType } from '../../utils/functions'
 import { logger } from '../../logger'
 import { UploadProvider } from './index'