#309 and some cleanups

4 files changed, 6 insertions, 6 deletions

diff --git a/src/file/resources/avatar.jpg b/src/file/assets/avatar.jpg
index 3c803f568e..3c803f568e 100644
--- a/src/file/resources/avatar.jpg
+++ b/src/file/assets/avatar.jpg
diff --git a/src/file/resources/bad-egg.png b/src/file/assets/bad-egg.png
index a7c5930bd4..a7c5930bd4 100644
--- a/src/file/resources/bad-egg.png
+++ b/src/file/assets/bad-egg.png
diff --git a/src/file/resources/dummy.png b/src/file/assets/dummy.png
index 39332b0c1b..39332b0c1b 100644
--- a/src/file/resources/dummy.png
+++ b/src/file/assets/dummy.png
diff --git a/src/file/server.ts b/src/file/server.ts
index 21447b596b..8ab638aa69 100644
--- a/src/file/server.ts
+++ b/src/file/server.ts
@@ -24,7 +24,7 @@ app.use(cors());
 /**
  * Statics
  */
-app.use('/resources', express.static(__dirname + '/resources', {
+app.use('/assets', express.static(__dirname + '/assets', {
 	maxAge: 1000 * 60 * 60 * 24 * 365 // 一年
 }));
 
@@ -33,12 +33,12 @@ app.get('/', (req, res) => {
 });
 
 app.get('/default-avatar.jpg', (req, res) => {
-	const file = fs.readFileSync(__dirname + '/resources/avatar.jpg');
+	const file = fs.readFileSync(__dirname + '/assets/avatar.jpg');
 	send(file, 'image/jpeg', req, res);
 });
 
 app.get('/app-default.jpg', (req, res) => {
-	const file = fs.readFileSync(__dirname + '/resources/dummy.png');
+	const file = fs.readFileSync(__dirname + '/assets/dummy.png');
 	send(file, 'image/png', req, res);
 });
 
@@ -54,7 +54,7 @@ async function raw(data: Buffer, type: string, download: boolean, res: express.R
 
 async function thumbnail(data: Buffer, type: string, resize: number, res: express.Response): Promise<any> {
 	if (!/^image\/.*$/.test(type)) {
-		data = fs.readFileSync(__dirname + '/resources/dummy.png');
+		data = fs.readFileSync(__dirname + '/assets/dummy.png');
 	}
 
 	let g = gm(data);
@@ -100,7 +100,7 @@ app.get('/:id', async (req, res) => {
 	const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)});
 
 	if (file == null) {
-		res.status(404).sendFile(__dirname + '/resources/dummy.png');
+		res.status(404).sendFile(__dirname + '/assets/dummy.png');
 		return;
 	} else if (file.data == null) {
 		res.sendStatus(400);
@@ -120,7 +120,7 @@ app.get('/:id/:name', async (req, res) => {
 	const file = await File.findOne({_id: new mongodb.ObjectID(req.params.id)});
 
 	if (file == null) {
-		res.status(404).sendFile(__dirname + '/resources/dummy.png');
+		res.status(404).sendFile(__dirname + '/assets/dummy.png');
 		return;
 	} else if (file.data == null) {
 		res.sendStatus(400);