diff --git a/core/file_base_filter.js b/core/file_base_filter.js index d72b3eea..ecf857fa 100644 --- a/core/file_base_filter.js +++ b/core/file_base_filter.js @@ -5,7 +5,7 @@ const UserProps = require('./user_property.js'); // deps const _ = require('lodash'); -const uuidV4 = require('uuid/v4'); +const { v4 : UUIDv4 } = require('uuid'); module.exports = class FileBaseFilters { constructor(client) { @@ -41,7 +41,7 @@ module.exports = class FileBaseFilters { } add(filterInfo) { - const filterUuid = uuidV4(); + const filterUuid = UUIDv4(); filterInfo.tags = this.cleanTags(filterInfo.tags); diff --git a/core/file_base_user_list_export.js b/core/file_base_user_list_export.js index 594a9ffe..c3f3b6f8 100644 --- a/core/file_base_user_list_export.js +++ b/core/file_base_user_list_export.js @@ -17,7 +17,7 @@ const fs = require('graceful-fs'); const fse = require('fs-extra'); const paths = require('path'); const moment = require('moment'); -const uuidv4 = require('uuid/v4'); +const { v4 : UUIDv4 } = require('uuid'); const yazl = require('yazl'); /* @@ -188,7 +188,7 @@ exports.getModule = class FileBaseListExport extends MenuModule { const outputFileName = paths.join( sysTempDownloadDir, - `file_list_${uuidv4().substr(-8)}_${moment().format('YYYY-MM-DD')}.txt` + `file_list_${UUIDv4().substr(-8)}_${moment().format('YYYY-MM-DD')}.txt` ); fs.writeFile(outputFileName, listBody, 'utf8', err => { diff --git a/core/message_base_qwk_export.js b/core/message_base_qwk_export.js index 53682471..2f89c1bd 100644 --- a/core/message_base_qwk_export.js +++ b/core/message_base_qwk_export.js @@ -22,7 +22,7 @@ const _ = require('lodash'); const fse = require('fs-extra'); const temptmp = require('temptmp'); const paths = require('path'); -const UUIDv4 = require('uuid/v4'); +const { v4 : UUIDv4 } = require('uuid'); const moment = require('moment'); const FormIds = { diff --git a/core/scanner_tossers/ftn_bso.js b/core/scanner_tossers/ftn_bso.js index 17cd61b8..99a537ec 100644 --- a/core/scanner_tossers/ftn_bso.js +++ b/core/scanner_tossers/ftn_bso.js @@ -36,7 +36,7 @@ const assert = require('assert'); const sane = require('sane'); const fse = require('fs-extra'); const iconv = require('iconv-lite'); -const uuidV4 = require('uuid/v4'); +const { v4 : UUIDv4 } = require('uuid'); exports.moduleInfo = { name : 'FTN BSO', @@ -1215,7 +1215,7 @@ function FTNMessageScanTossModule() { // if(true === _.get(Config(), [ 'messageNetworks', 'ftn', 'areas', config.localAreaTag, 'allowDupes' ], false)) { // just generate a UUID & therefor always allow for dupes - message.messageUuid = uuidV4(); + message.messageUuid = UUIDv4(); } return callback(null); diff --git a/package.json b/package.json index 908c48c3..efdd1d17 100644 --- a/package.json +++ b/package.json @@ -53,7 +53,7 @@ "sqlite3-trans": "^1.2.2", "ssh2": "0.8.6", "temptmp": "^1.1.0", - "uuid": "^3.3.3", + "uuid": "^8.0.0", "uuid-parse": "1.1.0", "ws": "^7.3.0", "xxhash": "^0.3.0", diff --git a/yarn.lock b/yarn.lock index 1c3624aa..f5fb93f3 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2231,10 +2231,10 @@ uuid@^3.3.2: resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131" integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA== -uuid@^3.3.3: - version "3.3.3" - resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.3.tgz#4568f0216e78760ee1dbf3a4d2cf53e224112866" - integrity sha512-pW0No1RGHgzlpHJO1nsVrHKpOEIxkGg1xB+v0ZmdNH5OAeAwzAVrCnI2/6Mtx+Uys6iaylxa+D3g4j63IKKjSQ== +uuid@^8.0.0: + version "8.0.0" + resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.0.0.tgz#bc6ccf91b5ff0ac07bbcdbf1c7c4e150db4dbb6c" + integrity sha512-jOXGuXZAWdsTH7eZLtyXMqUb9EcWMGZNbL9YcGBJl4MH4nrxHmZJhEHvyLFrkxo+28uLb/NYRcStH48fnD0Vzw== verror@1.10.0: version "1.10.0"