ReVanced/revanced-bots
1
0
Fork 0
mirror of https://github.com/ReVanced/revanced-bots.git synced 2026-01-18 16:53:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(bots/discord): fix get response logic

Browse Source
This commit is contained in:
PalmDevs
2024-09-22 04:01:09 +07:00
parent f035994f9e
commit 3261294822
1 changed files with 75 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

125
bots/discord/src/utils/discord/messageScan.ts
View File

@@ -1,6 +1,7 @@
import { type Response, responses } from '$/database/schemas' import { type Response, responses } from '$/database/schemas'
import type { Config, ConfigMessageScanResponse, ConfigMessageScanResponseLabelConfig } from 'config.schema' import type { Config, ConfigMessageScanResponse, ConfigMessageScanResponseLabelConfig } from 'config.schema'
import type { Message, PartialUser, User } from 'discord.js' import { ButtonStyle, ComponentType } from 'discord.js'
import type { APIActionRowComponent, APIButtonComponent, Message, PartialUser, User } from 'discord.js'
import { eq } from 'drizzle-orm' import { eq } from 'drizzle-orm'
import { createMessageScanResponseEmbed } from './embeds' import { createMessageScanResponseEmbed } from './embeds'
@@ -54,59 +55,56 @@ export const getResponseFromText = async (
break break
} }
} }
}
}
// If none of the regexes match, we can search for labels immediately // If none of the regexes match, we can search for labels immediately
if (!responseConfig.triggers && !flags.textRegexesOnly) { if (!responseConfig.triggers && !flags.textRegexesOnly) {
logger.debug('No match from before regexes, doing NLP') logger.debug('No match from before regexes, doing NLP')
const scan = await api.client.parseText(content) const scan = await api.client.parseText(content)
if (scan.labels.length) { if (scan.labels.length) {
const matchedLabel = scan.labels[0]! const matchedLabel = scan.labels[0]!
logger.debug( logger.debug(`Message matched label with confidence: ${matchedLabel.name}, ${matchedLabel.confidence}`)
`Message matched label with confidence: ${matchedLabel.name}, ${matchedLabel.confidence}`,
)
let trigger: ConfigMessageScanResponseLabelConfig | undefined let trigger: ConfigMessageScanResponseLabelConfig | undefined
const response = responses.find(x => { const response = responses.find(x => {
const config = x.triggers.text!.find( const config = x.triggers.text!.find(
(x): x is ConfigMessageScanResponseLabelConfig => (x): x is ConfigMessageScanResponseLabelConfig => 'label' in x && x.label === matchedLabel.name,
'label' in x && x.label === matchedLabel.name, )
) if (config) trigger = config
if (config) trigger = config return config
return config })
})
if (!response) { if (!response) {
logger.warn(`No response config found for label ${matchedLabel.name}`) logger.warn(`No response config found for label ${matchedLabel.name}`)
// This returns the default value set in line 17, which means no response matched // This returns the default value set in line 17, which means no response matched
return responseConfig return responseConfig
}
if (matchedLabel.confidence >= trigger!.threshold) {
logger.debug('Label confidence is enough')
responseConfig = { ...responseConfig, ...response, label: trigger!.label }
}
}
} }
// If we still don't have a response config, we can match all regexes after the initial label trigger if (matchedLabel.confidence >= trigger!.threshold) {
if (!responseConfig.triggers && !flags.imageTriggersOnly) { logger.debug('Label confidence is enough')
logger.debug('No match from NLP, doing after regexes') responseConfig = { ...responseConfig, ...response, label: trigger!.label }
for (let i = 0; i < responses.length; i++) { }
const { }
triggers: { text: textTriggers }, }
} = responses[i]!
const firstLabelIndex = firstLabelIndexes[i] ?? -1
for (let j = firstLabelIndex + 1; j < textTriggers!.length; j++) { // If we still don't have a response config, we can match all regexes after the initial label trigger
const trigger = textTriggers![j]! if (!responseConfig.triggers && !flags.imageTriggersOnly) {
logger.debug('No match from NLP, doing after regexes')
for (let i = 0; i < responses.length; i++) {
const {
triggers: { text: textTriggers },
} = responses[i]!
const firstLabelIndex = firstLabelIndexes[i] ?? -1
if (trigger instanceof RegExp) { for (let j = firstLabelIndex + 1; j < textTriggers!.length; j++) {
if (trigger.test(content)) { const trigger = textTriggers![j]!
logger.debug(`Message matched regex (after mode): ${trigger.source}`)
responseConfig = responses[i]! if (trigger instanceof RegExp) {
break if (trigger.test(content)) {
} logger.debug(`Message matched regex (after mode): ${trigger.source}`)
} responseConfig = responses[i]!
break
} }
} }
} }
@@ -163,14 +161,41 @@ export const handleUserResponseCorrection = async (
}) })
.where(eq(responses.replyId, response.replyId)) .where(eq(responses.replyId, response.replyId))
await reply.edit({ return void (await reply.edit({
...correctLabelResponse.response, ...correctLabelResponse.response,
embeds: correctLabelResponse.response.embeds?.map(createMessageScanResponseEmbed), embeds: correctLabelResponse.response.embeds?.map(createMessageScanResponseEmbed),
}) components: [],
}))
} }
await api.client.trainMessage(response.content, label) await api.client.trainMessage(response.content, label)
logger.debug(`User ${user.id} trained message ${response.replyId} as ${label} (positive)`) logger.debug(`User ${user.id} trained message ${response.replyId} as ${label} (positive)`)
await reply.reactions.removeAll() await reply.edit({
components: [],
})
} }
export const createMessageScanResponseComponents = (reply: Message<true>) => [
{
type: ComponentType.ActionRow,
components: [
{
type: ComponentType.Button,
style: ButtonStyle.Secondary,
emoji: {
id: '👍',
},
custom_id: `train:${reply.id}`,
},
{
type: ComponentType.Button,
style: ButtonStyle.Secondary,
emoji: {
id: '🔧',
},
custom_id: `edit:${reply.id}`,
},
],
} as APIActionRowComponent<APIButtonComponent>,
]