Peps
/
v3.0.0
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Forced resolve, updated config.sample.js

This commit is contained in:
Pitu 2017-01-21 17:21:29 -03:00
parent e9b3ecbd05
commit cd123b4c11
2 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
config.sample.js
View File

@ -12,14 +12,16 @@ module.exports = {
// The registered domain where you will be serving the app. Use IP if none.
domains: [
/*
You need to specify the base domain where loli-self is running
and how should it resolve the URL for uploaded files. For example:
*/
// Files will be served at http(s)://i.kanacchi.moe/Fxt0.png
{ host: 'i.kanacchi.moe' },
{ host: 'kanacchi.moe', resolve: 'https://i.kanacchi.moe'},
// Files will be served at http(s)://my.kanacchi.moe/loli-self/files/Fxt0.png
{ host: 'my.kanacchi.moe', resolve: 'https://my.kanacchi.moe/loli-self/files' },
// Files will be served at http://localhost:9999/Fxt0.png
{ domain: 'localhost:9999' }
// Files will be served at https://my.kanacchi.moe/loli-self/files/Fxt0.png
{ host: 'kanacchi.moe', resolve: 'https://my.kanacchi.moe/loli-self/files' }
],

9
controllers/uploadController.js
View File

@ -98,12 +98,13 @@ uploadsController.upload = function(req, res, next){
uploadsController.processFilesForDisplay = function(req, res, files, existingFiles){
let basedomain = req.get('host')
for(let domain of config.domains)
if(domain.host === req.get('host'))
if(domain.hasOwnProperty('resolve'))
basedomain = domain.resolve
if(files.length === 0){
return res.json({
success: true,
@ -111,7 +112,7 @@ uploadsController.processFilesForDisplay = function(req, res, files, existingFil
return {
name: file.name,
size: file.size,
url: 'http://' + basedomain + '/' + file.name
url: basedomain + '/' + file.name
}
})
})
@ -127,7 +128,7 @@ uploadsController.processFilesForDisplay = function(req, res, files, existingFil
return {
name: file.name,
size: file.size,
url: 'http://' + basedomain + '/' + file.name
url: basedomain + '/' + file.name
}
})
})
@ -200,7 +201,7 @@ uploadsController.list = function(req, res){
basedomain = domain.resolve
for(let file of files){
file.file = 'http://' + basedomain + '/' + file.name
file.file = basedomain + '/' + file.name
file.date = new Date(file.timestamp * 1000)
file.date = file.date.getFullYear() + '-' + (file.date.getMonth() + 1) + '-' + file.date.getDate() + ' ' + (file.date.getHours() < 10 ? '0' : '') + file.date.getHours() + ':' + (file.date.getMinutes() < 10 ? '0' : '') + file.date.getMinutes() + ':' + (file.date.getSeconds() < 10 ? '0' : '') + file.date.getSeconds()