Mirror/filesafe
1
0
Fork 0
mirror of https://github.com/BobbyWibowo/lolisafe.git synced 2025-02-07 13:59:01 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

feat: if sort uploads by album id, sort null last

Browse Source 
also improved indenting on some lines of codes
This commit is contained in:
Bobby Wibowo 2022-08-01 15:20:14 +07:00
parent d833ec26e7
commit ac38b6f06e
No known key found for this signature in database
GPG Key ID: 51C3A1E1E22D26CF
1 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
controllers/uploadController.js
View File

@ -1216,7 +1216,7 @@ self.list = async (req, res) => {
const albumid = req.path_parameters && Number(req.path_parameters.albumid) const albumid = req.path_parameters && Number(req.path_parameters.albumid)
const basedomain = utils.conf.domain const basedomain = utils.conf.domain
// Thresholds for regular users // Thresholds for regular users (usergroups lower than moderator)
const MAX_WILDCARDS_IN_KEY = 2 const MAX_WILDCARDS_IN_KEY = 2
const MAX_TEXT_QUERIES = 3 // non-keyed keywords const MAX_TEXT_QUERIES = 3 // non-keyed keywords
const MAX_SORT_KEYS = 1 const MAX_SORT_KEYS = 1
@ -1250,6 +1250,7 @@ self.list = async (req, res) => {
// Columns with which to use SQLite's NULLS LAST option // Columns with which to use SQLite's NULLS LAST option
nullsLast: [ nullsLast: [
'userid', 'userid',
'albumid',
'expirydate', 'expirydate',
'ip' 'ip'
], ],
@ -1624,7 +1625,10 @@ self.list = async (req, res) => {
// Then, refine using the supplied 'date' ranges // Then, refine using the supplied 'date' ranges
this.andWhere(function () { this.andWhere(function () {
if (!filterObj.queries.date || (!filterObj.queries.date.from && !filterObj.queries.date.to)) return if (!filterObj.queries.date ||
(!filterObj.queries.date.from && !filterObj.queries.date.to)) {
return
}
if (typeof filterObj.queries.date.from === 'number') { if (typeof filterObj.queries.date.from === 'number') {
if (typeof filterObj.queries.date.to === 'number') { if (typeof filterObj.queries.date.to === 'number') {
this.andWhereBetween('timestamp', [filterObj.queries.date.from, filterObj.queries.date.to]) this.andWhereBetween('timestamp', [filterObj.queries.date.from, filterObj.queries.date.to])
@ -1638,7 +1642,10 @@ self.list = async (req, res) => {
// Then, refine using the supplied 'expiry' ranges // Then, refine using the supplied 'expiry' ranges
this.andWhere(function () { this.andWhere(function () {
if (!filterObj.queries.expiry || (!filterObj.queries.expiry.from && !filterObj.queries.expiry.to)) return if (!filterObj.queries.expiry ||
(!filterObj.queries.expiry.from && !filterObj.queries.expiry.to)) {
return
}
if (typeof filterObj.queries.expiry.from === 'number') { if (typeof filterObj.queries.expiry.from === 'number') {
if (typeof filterObj.queries.expiry.to === 'number') { if (typeof filterObj.queries.expiry.to === 'number') {
this.andWhereBetween('expirydate', [filterObj.queries.expiry.from, filterObj.queries.expiry.to]) this.andWhereBetween('expirydate', [filterObj.queries.expiry.from, filterObj.queries.expiry.to])
@ -1710,14 +1717,20 @@ self.list = async (req, res) => {
} }
const columns = ['id', 'name', 'original', 'userid', 'size', 'timestamp'] const columns = ['id', 'name', 'original', 'userid', 'size', 'timestamp']
if (utils.retentions.enabled) columns.push('expirydate') if (utils.retentions.enabled) {
columns.push('expirydate')
}
if (!all || if (!all ||
filterObj.queries.albumid || filterObj.queries.albumid ||
filterObj.queries.exclude.albumid || filterObj.queries.exclude.albumid ||
filterObj.flags.albumidNull !== undefined) columns.push('albumid') filterObj.flags.albumidNull !== undefined) {
columns.push('albumid')
}
// Only select IPs if we are listing all uploads // Only select IPs if we are listing all uploads
if (all) columns.push('ip') if (all) {
columns.push('ip')
}
// Build raw query for order by (sorting) operation // Build raw query for order by (sorting) operation
let orderByRaw let orderByRaw