major cleanup

This commit is contained in:
derpystuff 2023-11-04 17:29:06 +01:00
parent ddd918470e
commit a8cf49e31e
60 changed files with 537 additions and 619 deletions

View file

@ -86,15 +86,14 @@ module.exports = {
i++;
}
pages = formatPaginationEmbeds(pages)
const paging = await paginator.createPaginator({
await paginator.createPaginator({
context,
pages
pages: formatPaginationEmbeds(pages)
});
}catch(e){
console.log(e)
if(e.response?.body?.status && e.response.body.status == 2) return editOrReply(context, {embeds:[createEmbed("warning", context, e.response.body.message)]})
return editOrReply(context, {embeds:[createEmbed("error", context, `Unable to perform dictionary lookup.`)]})
if(e.response?.body?.status && e.response.body.status == 2) return editOrReply(context, createEmbed("warning", context, e.response.body.message))
return editOrReply(context, createEmbed("error", context, `Unable to perform dictionary lookup.`))
}
},
};

View file

@ -68,7 +68,7 @@ module.exports = {
data = JSON.parse(data.text)
}catch(e){
console.log(e)
return editOrReply(context, { embeds: [createEmbed("error", context, "Code execution failed.")] })
return editOrReply(context, createEmbed("error", context, "Code execution failed."))
}
const embed = createEmbed("default", context, {})

View file

@ -19,16 +19,16 @@ module.exports = {
run: async (context) => {
context.triggerTyping();
let image = await getRecentImage(context, 50)
if (!image) return editOrReply(context, { embeds: [createEmbed("warning", context, "No images found.")] })
if (!image) return editOrReply(context, createEmbed("warning", context, "No images found."))
let ocr;
try{
ocr = await googleVisionOcr(context, image)
}catch(e){
return editOrReply(context, { embeds: [createEmbed("error", context, "Unable to retrieve Google Vision API response.")] })
return editOrReply(context, createEmbed("error", context, "Unable to retrieve Google Vision API response."))
}
if(ocr.response.body.status == 1) return editOrReply(context, { embeds: [createEmbed("warning", context, ocr.response.body.text)] })
if(ocr.response.body.status == 1) return editOrReply(context, createEmbed("warning", context, ocr.response.body.text))
return editOrReply(context, createEmbed("default", context, {
thumbnail: {

View file

@ -36,16 +36,16 @@ module.exports = {
args.from = getCodeFromAny(args.from)
let image = await getRecentImage(context, 50)
if (!image) return editOrReply(context, { embeds: [createEmbed("warning", context, "No images found.")] })
if (!image) return editOrReply(context, createEmbed("warning", context, "No images found."))
let ocr;
try{
ocr = await googleVisionOcr(context, image)
}catch(e){
return editOrReply(context, { embeds: [createEmbed("error", context, "Unable to retrieve Google Vision API response.")] })
return editOrReply(context, createEmbed("error", context, "Unable to retrieve Google Vision API response."))
}
if(ocr.response.body.status == 1) return editOrReply(context, { embeds: [createEmbed("warning", context, ocr.response.body.text)] })
if(ocr.response.body.status == 1) return editOrReply(context, createEmbed("warning", context, ocr.response.body.text))
try{
let translate = await googleTranslate(context, ocr.response.body.text, args.to, args.from)
@ -65,8 +65,8 @@ module.exports = {
}))
}catch(e){
console.log(e)
if(e.response?.body?.status && e.response.body.status == 2) return editOrReply(context, {embeds:[createEmbed("error", context, `Unable to translate text.`)]})
return editOrReply(context, {embeds:[createEmbed("error", context, `Something went wrong.`)]})
if(e.response?.body?.status && e.response.body.status == 2) return editOrReply(context, createEmbed("error", context, `Unable to translate text.`))
return editOrReply(context, createEmbed("error", context, `Something went wrong.`))
}
}
};

View file

@ -84,7 +84,7 @@ module.exports = {
}catch(e){
console.log(e)
return editOrReply(context, { embeds: [createEmbed("error", context, `Unable to scan qr codes.`)] })
return editOrReply(context, createEmbed("error", context, `Unable to scan qr codes.`))
}
}
};

View file

@ -6,12 +6,12 @@ const superagent = require('superagent')
const { Permissions } = require("detritus-client/lib/constants");
async function processJob(jobUrl){
async function processJob(jobUrl) {
let job = await superagent.get(jobUrl)
.set('User-Agent', 'labscore/1.0')
return job.body;
}
}
module.exports = {
label: "url",
@ -26,35 +26,33 @@ module.exports = {
},
permissionsClient: [Permissions.EMBED_LINKS, Permissions.SEND_MESSAGES, Permissions.ATTACH_FILES, Permissions.USE_EXTERNAL_EMOJIS, Permissions.READ_MESSAGE_HISTORY],
run: async (context, args) => {
if(!args.url) return editOrReply(context, { embeds: [createEmbed("warning", context, "No url supplied.")] })
if (!args.url) return editOrReply(context, createEmbed("warning", context, "No url supplied."))
let response = await editOrReply(context, createEmbed("loading", context, `Creating website screenshot...`))
try{
try {
const t = Date.now();
let ss = await screenshot(context, args.url, context.channel.nsfw)
if(ss.response.body.status && ss.response.body.status !== 3){
if(ss.response.body.image) return await editOrReply(context, {
embeds: [createEmbed("image", context, {
if (ss.response.body.status && ss.response.body.status !== 3) {
if (ss.response.body.image) return await editOrReply(context,
createEmbed("image", context, {
url: ss.response.body.image,
time: ((Date.now() - t) / 1000).toFixed(2)
})]
})
})
)
return await editOrReply(context, createEmbed("error", context, "Unable to create screenshot."))
}
let job = await processJob(ss.response.body.job)
if(job.status){
if(!job.image) job = await processJob(ss.response.body.job)
if(job.image) return await editOrReply(context, {
embeds: [createEmbed("image", context, {
url: job.image,
time: ((Date.now() - t) / 1000).toFixed(2)
})]
})
if (job.status) {
if (!job.image) job = await processJob(ss.response.body.job)
if (job.image) return await editOrReply(context, createEmbed("image", context, {
url: job.image,
time: ((Date.now() - t) / 1000).toFixed(2)
}))
return await editOrReply(context, createEmbed("error", context, "Unable to create screenshot."))
}
@ -65,7 +63,7 @@ module.exports = {
})],
files: [{ filename: "screenshot.png", value: job }]
})
} catch(e){
} catch (e) {
console.log(e)
return await editOrReply(context, createEmbed("image", context, {
url: "https://bignutty.gitlab.io/webstorage4/v2/assets/screenshot/screenshot_error.png"

View file

@ -65,8 +65,8 @@ module.exports = {
}))
}catch(e){
console.log(e)
if(e.response?.body?.status && e.response.body.status == 2) return editOrReply(context, {embeds:[createEmbed("error", context, `Unable to translate text.`)]})
return editOrReply(context, {embeds:[createEmbed("error", context, `Something went wrong.`)]})
if(e.response?.body?.status && e.response.body.status == 2) return editOrReply(context, createEmbed("error", context, `Unable to translate text.`))
return editOrReply(context, createEmbed("error", context, `Something went wrong.`))
}
}
};

View file

@ -2,7 +2,7 @@ const { createEmbed } = require('../../../labscore/utils/embed')
const { editOrReply } = require('../../../labscore/utils/message')
const { darksky } = require('../../../labscore/api');
const { pill, iconPill, smallIconPill, smallPill, icon, weatherIcon, timestamp } = require('../../../labscore/utils/markdown');
const { pill, iconPill, smallPill, weatherIcon, timestamp } = require('../../../labscore/utils/markdown');
const { Permissions } = require("detritus-client/lib/constants");
const { STATICS } = require('../../../labscore/utils/statics');
@ -21,7 +21,7 @@ module.exports = {
permissionsClient: [Permissions.EMBED_LINKS, Permissions.SEND_MESSAGES, Permissions.USE_EXTERNAL_EMOJIS, Permissions.READ_MESSAGE_HISTORY],
run: async (context, args) => {
context.triggerTyping();
if(!args.query) return editOrReply(context, {embeds:[createEmbed("warning", context, `Missing Parameter (location).`)]})
if(!args.query) return editOrReply(context, createEmbed("warning", context, `Missing Parameter (location).`))
try{
let data = await darksky(context, args.query)
@ -60,10 +60,10 @@ module.exports = {
if(data.result.current.icon) e.thumbnail = { url: data.result.current.icon }
if(data.result.current.image) e.image = { url: data.result.current.image }
return editOrReply(context, {embeds: [e]})
return editOrReply(context, e)
}catch(e){
console.log(e)
return editOrReply(context, {embeds:[createEmbed("warning", context, `No weather data available for given location.`)]})
return editOrReply(context, createEmbed("warning", context, `No weather data available for given location.`))
}
},
};