From eb8f87978ee93fc0e7e7b0a56cc0703e8e014f50 Mon Sep 17 00:00:00 2001
From: fatchan <tom@69420.me>
Date: Thu, 12 Sep 2019 18:37:20 +0000
Subject: [PATCH] move some schedule files

---
 schedules.js                                     |  6 +++---
 {helpers/captcha => schedules}/deletecaptchas.js |  4 ++--
 {helpers/files => schedules}/prune.js            |  4 ++--
 webring.js => schedules/webring.js               | 12 ++++++------
 4 files changed, 13 insertions(+), 13 deletions(-)
 rename {helpers/captcha => schedules}/deletecaptchas.js (79%)
 rename {helpers/files => schedules}/prune.js (82%)
 rename webring.js => schedules/webring.js (82%)

diff --git a/schedules.js b/schedules.js
index 3394261b..b99a1bfc 100644
--- a/schedules.js
+++ b/schedules.js
@@ -26,7 +26,7 @@ const msTime = require(__dirname+'/helpers/mstime.js')
 	});
 
 	//delete files for expired captchas
-	const deleteCaptchas = require(__dirname+'/helpers/captcha/deletecaptchas.js');
+	const deleteCaptchas = require(__dirname+'/schedules/deletecaptchas.js');
 	deleteCaptchas().catch(e => console.error);
 	setInterval(async () => {
 		try {
@@ -38,7 +38,7 @@ const msTime = require(__dirname+'/helpers/mstime.js')
 
 	//update webring
 	if (enableWebring) {
-		const updateWebring = require(__dirname+'/webring.js');
+		const updateWebring = require(__dirname+'/schedules/webring.js');
 		updateWebring().catch(e => console.error);
 		setInterval(async () => {
 			try {
@@ -50,7 +50,7 @@ const msTime = require(__dirname+'/helpers/mstime.js')
 	}
 
 	//file pruning
-	const pruneFiles = require(__dirname+'/helpers/files/prune.js');
+	const pruneFiles = require(__dirname+'/schedules/prune.js');
 	pruneFiles().catch(e => console.error);
 	setInterval(async () => {
 		try {
diff --git a/helpers/captcha/deletecaptchas.js b/schedules/deletecaptchas.js
similarity index 79%
rename from helpers/captcha/deletecaptchas.js
rename to schedules/deletecaptchas.js
index a39fde3a..46238003 100644
--- a/helpers/captcha/deletecaptchas.js
+++ b/schedules/deletecaptchas.js
@@ -1,8 +1,8 @@
 'use strict';
 
 const { stat, remove, readdir } = require('fs-extra')
-    , uploadDirectory = require(__dirname+'/../files/uploadDirectory.js')
-    , msTime = require(__dirname+'/../mstime.js')
+    , uploadDirectory = require(__dirname+'/../helpers/files/uploadDirectory.js')
+    , msTime = require(__dirname+'/../helpers/mstime.js')
 
 module.exports = async () => {
 	const files = await readdir(`${uploadDirectory}captcha/`);
diff --git a/helpers/files/prune.js b/schedules/prune.js
similarity index 82%
rename from helpers/files/prune.js
rename to schedules/prune.js
index 2e850182..2dab1b16 100644
--- a/helpers/files/prune.js
+++ b/schedules/prune.js
@@ -1,8 +1,8 @@
 'use strict';
 
-const Files = require(__dirname+'/../../db/files.js')
+const Files = require(__dirname+'/../db/files.js')
 	, { remove } = require('fs-extra')
-	, uploadDirectory = require(__dirname+'/uploadDirectory.js');
+	, uploadDirectory = require(__dirname+'/../helpers/files/uploadDirectory.js');
 
 module.exports = async() => {
 	//todo: make this not a race condition, but it only happens daily so ¯\_(ツ)_/¯
diff --git a/webring.js b/schedules/webring.js
similarity index 82%
rename from webring.js
rename to schedules/webring.js
index f28e9329..178ee52f 100644
--- a/webring.js
+++ b/schedules/webring.js
@@ -1,18 +1,18 @@
 'use strict';
 
 const fetch = require('node-fetch')
-	, { meta } = require(__dirname+'/configs/main.json')
-	, { following, blacklist } = require(__dirname+'/configs/webring.json')
-	, { Boards } = require(__dirname+'/db/')
+	, { meta } = require(__dirname+'/../configs/main.json')
+	, { following, blacklist } = require(__dirname+'/../configs/webring.json')
+	, { Boards } = require(__dirname+'/../db/')
 	, { outputFile } = require('fs-extra')
-	, cache = require(__dirname+'/redis.js')
-	, uploadDirectory = require(__dirname+'/helpers/files/uploadDirectory.js');
+	, cache = require(__dirname+'/../redis.js')
+	, uploadDirectory = require(__dirname+'/../helpers/files/uploadDirectory.js');
 
 module.exports = async () => {
 	//fetch stuff from others
 	const fetchWebring = [...new Set((await cache.get('webring:sites') || []).concat(following))]
 	let rings = await Promise.all(fetchWebring.map(url => {
-		return fetch(url).then(res => res.json());
+		return fetch(url).then(res => res.json()).catch(e => console.error);
 	}));
 	let found = [];
 	let webringBoards = [];