fix: sort bots with date (#530)

This commit is contained in:
SKINMAKER 2023-01-16 13:07:01 +09:00 committed by GitHub
parent ada3d928a0
commit 5a28ac284c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -147,16 +147,18 @@ async function getUser(id: string, topLevel = true):Promise<User> {
const ownedBots = await knex('bots') const ownedBots = await knex('bots')
.select(['id']) .select(['id'])
.where('owners', 'like', `%${id}%`) .where('owners', 'like', `%${id}%`)
.orderBy('date', 'asc')
const ownedServer = await knex('servers') const ownedServer = await knex('servers')
.select(['id']) .select(['id'])
.where('owners', 'like', `%${id}%`) .where('owners', 'like', `%${id}%`)
.orderBy('date', 'asc')
const discordUser = await get.discord.user.load(id) const discordUser = await get.discord.user.load(id)
res[0].tag = discordUser?.discriminator || '0000' res[0].tag = discordUser?.discriminator || '0000'
res[0].username = discordUser?.username || 'Unknown User' res[0].username = discordUser?.username || 'Unknown User'
if (topLevel) { if (topLevel) {
res[0].bots = (await Promise.all(ownedBots.map(async b => await get._rawBot.load(b.id)))).filter((el: Bot | null) => el).map(row => ({ ...row })) res[0].bots = (await Promise.all(ownedBots.map(async b => await get._rawBot.load(b.id)))).filter((el: Bot | null) => el)
res[0].servers = (await Promise.all(ownedServer.map(async b => await get._rawServer.load(b.id)))).filter((el: Server | null) => el).map(row => ({ ...row })) res[0].servers = (await Promise.all(ownedServer.map(async b => await get._rawServer.load(b.id)))).filter((el: Server | null) => el)
} }
else { else {
res[0].bots = ownedBots.map(el => el.id) res[0].bots = ownedBots.map(el => el.id)