From 98c103c6251a4fdefb907922d3314f7fd479711f Mon Sep 17 00:00:00 2001
From: DebaucheryLibrarian <moonloop.adult@protonmail.com>
Date: Sun, 21 Nov 2021 00:31:09 +0100
Subject: [PATCH] Fixed uuid import. Changed fs rmdir to rm.

---
 src/media.js           | 4 ++--
 src/scrapers/traxxx.js | 2 +-
 src/utils/media.js     | 2 +-
 src/utils/s3.js        | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/media.js b/src/media.js
index 23e4b4e6..13c0feda 100644
--- a/src/media.js
+++ b/src/media.js
@@ -7,7 +7,7 @@ const fs = require('fs');
 const fsPromises = require('fs').promises;
 const path = require('path');
 const stream = require('stream');
-const nanoid = require('nanoid/non-secure');
+const { nanoid } = require('nanoid/non-secure');
 const mime = require('mime');
 // const fileType = require('file-type');
 const ffmpeg = require('fluent-ffmpeg');
@@ -948,7 +948,7 @@ async function flushOrphanedMedia() {
 		await deleteS3Objects(orphanedMedia.filter((media) => media.is_s3));
 	}
 
-	await fsPromises.rmdir(path.join(config.media.path, 'temp'), { recursive: true });
+	await fsPromises.rm(path.join(config.media.path, 'temp'), { recursive: true });
 
 	logger.info('Cleared temporary media directory');
 }
diff --git a/src/scrapers/traxxx.js b/src/scrapers/traxxx.js
index b6fcb489..c5e16bb6 100644
--- a/src/scrapers/traxxx.js
+++ b/src/scrapers/traxxx.js
@@ -4,7 +4,7 @@
 
 const config = require('config');
 const faker = require('faker');
-const nanoid = require('nanoid');
+const { nanoid } = require('nanoid');
 const moment = require('moment');
 
 const knex = require('../knex');
diff --git a/src/utils/media.js b/src/utils/media.js
index 2bb08888..b5355ce1 100644
--- a/src/utils/media.js
+++ b/src/utils/media.js
@@ -6,7 +6,7 @@ const fsPromises = require('fs').promises;
 const Promise = require('bluebird');
 const blake2 = require('blake2');
 const sharp = require('sharp');
-const nanoid = require('nanoid');
+const { nanoid } = require('nanoid');
 const { PassThrough } = require('stream');
 
 const http = require('./http');
diff --git a/src/utils/s3.js b/src/utils/s3.js
index 6b2690a0..e4c77a2b 100644
--- a/src/utils/s3.js
+++ b/src/utils/s3.js
@@ -3,7 +3,7 @@
 const config = require('config');
 const AWS = require('aws-sdk');
 const fs = require('fs');
-const nanoid = require('nanoid');
+const { nanoid } = require('nanoid');
 
 async function init() {
 	const filepath = './public/img/sfw/animals/j0iiByCxGfA.jpeg';