#309 and some cleanups

This commit is contained in:
syuilo
2017-03-22 16:19:32 +09:00
parent 5306bb518d
commit b646877e8b
49 changed files with 44 additions and 1859 deletions

View File

@ -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);