feat: handle no json better

Klimatbyran · May 1, 2024 · 29e3ba3 · 29e3ba3
1 parent 877613e
commit 29e3ba3
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 22 deletions.
diff --git a/src/discord/interactions/feedback.ts b/src/discord/interactions/feedback.ts
@@ -1,5 +1,7 @@
 import {
   ActionRowBuilder,
+  CommandInteraction,
+  Interaction,
   ModalActionRowComponentBuilder,
   ModalBuilder,
   TextInputBuilder,
@@ -8,7 +10,7 @@ import {
 import { userFeedback } from '../../queues'
 
 export default {
-  async execute(interaction, job) {
+  async execute(interaction: CommandInteraction, job) {
     const input = new TextInputBuilder()
       .setCustomId('editInput')
       .setLabel(`Granska utsläppsdata`)
@@ -40,6 +42,7 @@ export default {
       const userInput = submitted.fields.getTextInputValue('editInput')
       //this.emit('edit', documentId, userInput)
 
+      interaction.channel.sendTyping()
       await submitted.reply({
         content: `Tack för din feedback: \n ${userInput}`,
       })

diff --git a/src/workers/userFeedback.ts b/src/workers/userFeedback.ts
@@ -93,31 +93,31 @@ const worker = new Worker(
 
     job.log('Response: ' + response)
 
-    let json
-    try {
-      json =
-        response
-          .match(/```json(.|\n)*```/)[0]
-          ?.replace(/```json|```/g, '')
-          .trim() || '{}'
-    } catch (error) {
-      job.log('Error: ' + error)
-      discord.sendMessage(job.data, response)
-      discord.sendMessage(job.data, `Fel vid tolkning av JSON: ${error}`)
-    }
-    discord.sendMessage(job.data, response.replace(json, '...json...'))
-    const parsedJson = JSON.parse(json) // we want to make sure it's valid JSON- otherwise we'll get an error which will trigger a new retry
+    const json =
+      response
+        .match(/```json(.|\n)*```/)?.[0]
+        ?.replace(/```json|```/g, '')
+        .trim() || '{}'
+    const parsedJson = json ? JSON.parse(json) : {} // we want to make sure it's valid JSON- otherwise we'll get an error which will trigger a new retry
 
-    job.log('Parsed JSON: ' + JSON.stringify(parsedJson, null, 2))
+    discord.sendMessage(
+      job.data,
+      json ? response.replace(json, '...json...') : response
+    )
 
-    discordReview.add(job.name, {
-      ...job.data,
-      json: JSON.stringify(parsedJson, null, 2),
-    })
+    if (Object.keys(parsedJson)) {
+      job.log('Parsed JSON: ' + JSON.stringify(parsedJson, null, 2))
 
-    if (parsedJson.reviewComment)
-      await discord.sendMessage(job.data, parsedJson.reviewComment)
+      if (parsedJson.agentResponse)
+        await discord.sendMessage(job.data, parsedJson.agentResponse)
+      if (parsedJson.reviewComment)
+        await discord.sendMessage(job.data, parsedJson.reviewComment)
 
+      discordReview.add(job.name, {
+        ...job.data,
+        json: JSON.stringify(parsedJson, null, 2),
+      })
+    }
     job.log('Sent to thread' + job.data.threadId)
 
     return json