Mirror/filesafe
1
0
Fork 0
mirror of https://github.com/BobbyWibowo/lolisafe.git synced 2024-12-14 08:26:22 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: better null domain fallback logic

Browse Source
This commit is contained in:
Bobby Wibowo 2022-06-22 11:22:35 +07:00
parent 4488f9ae8a
commit 954df13aa2
No known key found for this signature in database
GPG Key ID: 51C3A1E1E22D26CF
3 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
controllers/uploadController.js
View File

@ -938,7 +938,7 @@ self.sendUploadResponse = async (req, res, user, result) => {
files: result.map(file => { files: result.map(file => {
const map = { const map = {
name: file.name, name: file.name,
url: `${config.domain}/${file.name}` url: `${config.domain ? `${config.domain}/` : ''}${file.name}`
} }
// If a temporary upload, add expiry date // If a temporary upload, add expiry date

6
src/js/dashboard.js
View File

@ -678,9 +678,9 @@ page.getUploads = (params = {}) => {
for (let i = 0; i < files.length; i++) { for (let i = 0; i < files.length; i++) {
// Build full URLs // Build full URLs
files[i].file = `${basedomain}/${files[i].name}` files[i].file = `${basedomain || window.location.origin}/${files[i].name}`
if (files[i].thumb) { if (files[i].thumb) {
files[i].thumb = `${basedomain}/${files[i].thumb}` files[i].thumb = `${basedomain ? `${basedomain}/` : ''}${files[i].thumb}`
} }
// Determine types // Determine types
@ -1621,7 +1621,7 @@ page.getAlbums = (params = {}) => {
page.cache = {} page.cache = {}
const users = response.data.users const users = response.data.users
const homeDomain = response.data.homeDomain const homeDomain = response.data.homeDomain || window.location.origin
if (params.pageNum < 0) params.pageNum = Math.max(0, pages + params.pageNum) if (params.pageNum < 0) params.pageNum = Math.max(0, pages + params.pageNum)
const pagination = page.paginate(response.data.count, 25, params.pageNum) const pagination = page.paginate(response.data.count, 25, params.pageNum)

6
src/js/home.js
View File

@ -692,7 +692,11 @@ page.updateTemplate = (file, response) => {
const link = file.previewElement.querySelector('.link') const link = file.previewElement.querySelector('.link')
const a = link.querySelector('a') const a = link.querySelector('a')
const clipboard = file.previewElement.querySelector('.clipboard-mobile > .clipboard-js') const clipboard = file.previewElement.querySelector('.clipboard-mobile > .clipboard-js')
a.href = a.innerHTML = clipboard.dataset.clipboardText = response.url let url = response.url
if (!/^https?:\/\//i.test(url)) {
url = `${window.location.origin}/${url}`
}
a.href = a.innerHTML = clipboard.dataset.clipboardText = url
link.classList.remove('is-hidden') link.classList.remove('is-hidden')
clipboard.parentElement.classList.remove('is-hidden') clipboard.parentElement.classList.remove('is-hidden')