Skip to content

Commit

Permalink
fix double error in identify
Browse files Browse the repository at this point in the history
  • Loading branch information
jue131 committed Nov 26, 2023
1 parent a74fe40 commit 53ccbc7
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 13 deletions.
1 change: 1 addition & 0 deletions src/commands/Dev/prune.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ module.exports = {
desc: 'Purges messages in a channel',
aliases: ['purge', 'clear'],
permissions: 'MANAGE_MESSAGES',
usage: '<amount of messages between 1 and 100>',
ignore_dms: true,
async execute(message, args) {
const amount = parseInt(args[0]) + 1
Expand Down
4 changes: 1 addition & 3 deletions src/commands/Main/about.js
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ module.exports = {
ownersInfo.push(`<@${ownersArray[i]}> (@${message.client.users.cache.get(ownersArray[i]).username})`)
}
let prefix = message.guild ? await db.get(`prefix_${message.guild.id}`) : ''
if (prefix === null || prefix === undefined) prefix = message.client.config.DEFAULT_PREFIX
if (!prefix) prefix = message.client.config.DEFAULT_PREFIX

const embed = new MessageEmbed()
.setColor('#3131BB')
Expand All @@ -22,8 +22,6 @@ module.exports = {
.addField('Support', 'Use the feedback command', true)
.addField('Prefix', '@mention or ' + prefix)

//.addField('Running since', uptime(), true)

.setTitle('About Uselit')

// .setAuthor(message.author.tag, message.author.displayAvatarURL())
Expand Down
17 changes: 11 additions & 6 deletions src/commands/Main/identify.js
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
const axios = require('axios').default
const { emote, errorParse, validateUrl } = require('../../util/util')
const { repliedMessageObject, findImageUrlInMessage, findImageUrlInAttachment, findImageUrlInMessageHistory, findImageUrlInEmbed } = require('../../util/message')
const { repliedMessageObject, findImageUrlInMessage, findImageUrlInMessageHistory } = require('../../util/message')

module.exports = {
name: 'identify',
aliases: ['analyze'],
description: 'Identifies an image',
aliases: ['analyze', 'ident'],
description: 'Identifies an image.\nPut -tags as the last argument to return a list of tags.',
desc: 'Identify an image',
permissions: '',
usage: '<image url/attachment/user mention>',
cooldown: 10,
cooldown: 9,
async execute(message, args) {
async function mentionCheck(input, message) {
input = input.join('')
Expand Down Expand Up @@ -43,6 +43,7 @@ module.exports = {
let url
let mess = ''
let messUrl = ''
let errorText = 'Please provide an attachment, image URL, user ID or mention'

async function findUrl(args, message) {

Expand All @@ -64,7 +65,11 @@ module.exports = {
if (mentioned) return mentioned

if (!args || !args.length || args == '') {
return await findImageUrlInMessageHistory(message, true).catch((e) => errorParse(e, message))
let result = await findImageUrlInMessageHistory(message, true).catch((e) => {
errorText = e
return null
})
return result
}
return null
}
Expand All @@ -80,7 +85,7 @@ module.exports = {
}
} else if (validateUrl(args)) {
url = args[0]
} else return errorParse('Please provide an attachment, image URL, user id or mention', message)
} else return errorParse(errorText, message)

let msg
if (mess) {
Expand Down
11 changes: 8 additions & 3 deletions src/commands/Main/image.js
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
const Discord = require('discord.js')
const { errorParse, validateUrl } = require('../../util/util')
const { repliedMessageObject, findImageUrlInMessage, findImageUrlInAttachment, findImageUrlInMessageHistory, findImageUrlInEmbed } = require('../../util/message')
const { repliedMessageObject, findImageUrlInMessage, findImageUrlInMessageHistory } = require('../../util/message')

module.exports = {
name: 'image',
Expand Down Expand Up @@ -37,6 +37,7 @@ module.exports = {
let url
let mess = ''
let messUrl = ''
let errorText = 'Please provide an attachment, image URL, user ID or mention'

async function findUrl(args, message) {

Expand All @@ -58,7 +59,11 @@ module.exports = {
if (mentioned) return mentioned

if (!args || !args.length || args == '') {
return await findImageUrlInMessageHistory(message, true).catch((e) => errorParse(e, message))
let result = await findImageUrlInMessageHistory(message, true).catch((e) => {
errorText = e
return null
})
return result
}
return null
}
Expand All @@ -74,7 +79,7 @@ module.exports = {
}
} else if (validateUrl(args)) {
url = args[0]
} else return errorParse('Please provide an attachment, image URL, user id or mention', message)
} else return errorParse(errorText, message)

let msg
const attachment = new Discord.MessageAttachment(url, 'attachment.png')
Expand Down
2 changes: 1 addition & 1 deletion src/util/message.js
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ async function findImageUrlInMessageHistory(message, retObj = false) {

})
}


module.exports = {
isInvalid,
repliedMessageObject,
Expand Down

0 comments on commit 53ccbc7

Please sign in to comment.