@futdevpro/nts-dynamo 1.11.35 → 1.11.37

package/.github/workflows/main.yml

@@ -19,131 +19,110 @@ env:
 jobs:
   notification0:
     name: Discord start Notification
-    runs-on: ubuntu-latest
-    #runs-on: plo-koon
+    #runs-on: ubuntu-latest
+    runs-on: plo-koon
     timeout-minutes: 20
     outputs:
       start: ${{ steps.mark_start.outputs.started }}
     steps:
-    - uses: actions/checkout@master
+    - uses: actions/checkout@v4
     - id: mark_start
       run: echo "started=$(date +%s)" >> "$GITHUB_OUTPUT"
-    - name: send custom message with args
-      uses: appleboy/discord-action@master
+    - name: Send Discord start notification
+      uses: futdevpro/fdp-github-actions/discord-start-notification@latest
       with:
-        webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}
-        webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
-        args: ":cd: Dynamo-NTS event: ${{ github.event_name }}\n\
-          - :tanabata_tree: Branch: ${{ github.ref_name }}\n\
-          - :bust_in_silhouette: Author: ${{ github.actor }}\n\
-          - :memo: Commit Message: ${{ github.event.head_commit.message }}\n\
-          - :checkered_flag: [Test and other processes are starting now... :link:](
-            https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})\n\
-          :cd: (${{ github.run_number }})"
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        APPLICATION_NAME: "Dynamo-NTS"
+        APPLICATION_EMOJI: "💽"
+        COMMIT_MESSAGE: ${{ github.event.head_commit.message }}
+        EVENT_DATETIME: ${{ github.event.head_commit.timestamp }}
+        DISCORD_WEBHOOK_ID: ${{ secrets.DISCORD_WEBHOOK_ID }}
+        DISCORD_WEBHOOK_TOKEN: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
+
+  notification0_fail_report:
+    name: Discord Start Notification Fail Report
+    runs-on: ubuntu-latest
+    #runs-on: plo-koon
+    timeout-minutes: 20
+    if: always() && needs.notification0.result == 'failure'
+    needs: [notification0]
+    steps:
+      - name: send custom message with args
+        uses: appleboy/discord-action@master
+        with:
+          webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}
+          webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
+          message: |
+            💽❌ Failed to send Discord start notification for ${{ github.repository }}! [🔗](https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})
 
   check_secrets:
-    name: Check Required Secrets
+    name: Check Required Secrets and Variables
     #runs-on: ubuntu-latest
     runs-on: plo-koon
     timeout-minutes: 20
     steps:
     - name: Check Required Secrets and Variables
-      run: |
-        # Check Secrets
-        if [ -z "${{ secrets.NPM_TOKEN }}" ]; then
-          echo "::error::NPM_TOKEN secret is missing. Please add it to the repository secrets."
-          exit 1
-        fi
-        if [ -z "${{ secrets.DISCORD_WEBHOOK_ID }}" ]; then
-          echo "::error::DISCORD_WEBHOOK_ID secret is missing. Please add it to the repository secrets."
-          exit 1
-        fi
-        if [ -z "${{ secrets.DISCORD_WEBHOOK_TOKEN }}" ]; then
-          echo "::error::DISCORD_WEBHOOK_TOKEN secret is missing. Please add it to the repository secrets."
-          exit 1
-        fi
-        if [ -z "${{ secrets.OVERSEER_SECRET_KEY }}" ]; then
-          echo "::error::OVERSEER_SECRET_KEY secret is missing. Please add it to the repository secrets."
-          exit 1
-        fi
-
-        # Check Variables
-        if [ -z "${{ vars.OVERSEER_URL }}" ]; then
-          echo "::error::OVERSEER_URL variable is missing. Please add it to the repository variables."
-          exit 1
-        fi
+      uses: futdevpro/fdp-github-actions/check-secrets-and-variables@latest
+      with:
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        ITEMS_TO_CHECK: |
+          [
+            {
+              "valueName": "NPM_TOKEN", 
+              "value": "${{ secrets.NPM_TOKEN }}", 
+              "type": "SECRET"
+            }, 
+            {
+              "valueName": "DISCORD_WEBHOOK_ID", 
+              "value": "${{ secrets.DISCORD_WEBHOOK_ID }}", 
+              "type": "SECRET"
+            }, 
+            {
+              "valueName": "DISCORD_WEBHOOK_TOKEN", 
+              "value": "${{ secrets.DISCORD_WEBHOOK_TOKEN }}", 
+              "type": "SECRET"
+            }, 
+            {
+              "valueName": "OVERSEER_SECRET_KEY", 
+              "value": "${{ secrets.OVERSEER_SECRET_KEY }}", 
+              "type": "SECRET"
+            }, 
+            
+            {
+              "valueName": "OVERSEER_URL", 
+              "value": "${{ vars.OVERSEER_URL }}", 
+              "type": "VARIABLE"
+            }
+          ]
 
   check_dev_leftovers:
     name: Check Dev leftovers
+    needs: [check_secrets]
     #runs-on: ubuntu-latest
     runs-on: plo-koon
     timeout-minutes: 20
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
 
-    - name: Install Node.js
-      uses: actions/setup-node@v2
+    - name: Check Dev Leftovers
+      uses: futdevpro/fdp-github-actions/check-dev-leftovers@latest
       with:
-        node-version: '16'
-
-    - name: Set NPM RC
-      run: |
-        echo "//registry.npmjs.org/:_authToken=${{ secrets.NPM_TOKEN }}" > ~/.npmrc
-    
-    - name: Check build folder
-      run: |
-        node -e "
-          const buildFolder = './build/';
-          const fs = require('fs');
-          
-          fs.readdir(buildFolder, (err, files) => {
-            if (!files?.length) {
-              console.error(
-                'FDPError: ./build folder is MISSING!' +
-                '\nbuild the project locally before push!'
-              );
-              process.exit(1);
-            }
-
-            if (files.includes('dynamo-nts')) {
-              console.error(
-                'FDPError: ./build copntains dynamo-nts folder which means this is a local dev build!' +
-                '\nrebuild the project locally before push!'
-              );
-              process.exit(1);
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        CHECKS_TO_PERFORM: |
+          [
+            {
+              "type": "TSCONFIG_PATHS",
+              "directory": "."
+            },
+            {
+              "type": "PACKAGE_VERSIONS",
+              "directory": ".",
+              "packages": [
+                "@futdevpro/fsm-dynamo"
+              ]
             }
-          });
-        "
-
-    - name: Check tsconfig.json
-      run: |
-        node -e "
-          const fs = require('fs');
-          const tsconfigContent = fs.readFileSync('tsconfig.json', 'utf8');
-          const cleanedTsconfigContent = tsconfigContent.replace(/\/\*[\s\S]*?\*\/|\/\/.*/g, '');
-          const tsconfig = JSON.parse(cleanedTsconfigContent);
-          
-          if (
-            !tsconfig?.compilerOptions?.paths || 
-            Object.keys(tsconfig.compilerOptions.paths).length === 0
-          ) {
-            console.log('compilerOptions.paths is either empty or not defined. Which is fine.');
-          } else {
-            console.error('Error: compilerOptions.paths is not an empty object!');
-            process.exit(1);
-          }
-        "
-
-    - name: Check FSM
-      run: |
-        FSM_LATEST=$(npm view @futdevpro/fsm-dynamo version)
-        FSM_THIS=$(node -p -e "require('./package.json').peerDependencies['@futdevpro/fsm-dynamo'].replace('^', '').replace('~', '')")
-        if [ "$FSM_LATEST" != "$FSM_THIS" ]; then
-          echo "FDPError: @futdevpro/fsm-dynamo is not latest! ($FSM_THIS)";
-          echo "Latest: $FSM_LATEST";
-          exit 1;
-        fi
+          ]
 
   test:
     name: Test Build
@@ -276,155 +255,131 @@ jobs:
 
   build_report:
     name: Build Report
-    needs: [ notification0, check_dev_leftovers, test, check_version, deploy ]
-    runs-on: ubuntu-latest
-    #runs-on: plo-koon
+    needs: [ 
+      notification0, 
+      check_dev_leftovers, 
+      test, 
+      check_version, 
+      deploy 
+    ]
+    #runs-on: ubuntu-latest
+    runs-on: plo-koon
     timeout-minutes: 20
     if: always()
     steps:
+      
+    # NEW IMPLEMENTATION using futdevpro/fdp-github-actions/send-build-report@master:
     - name: Checkout code
       uses: actions/checkout@v2
-
-    - name: Get This Version
-      run: |
-        RAW_THIS_VERSION=$(node -p -e "require('./package.json').version")
-          # replace ALL: 'v0' with '', '01' with '1', '.0' with '.'
-        RAW_THIS_VERSION=$(echo $RAW_THIS_VERSION | sed 's:v0::g'  | sed 's:01:1:g' | sed -e 's:\.0:\.:g')
-        echo "THIS_VERSION=$RAW_THIS_VERSION" >> $GITHUB_ENV
-
-    - id: duration
-      run: |
-        START_TIME=${{ needs.notification0.outputs.start }}
-        END_TIME=$(date +%s)
-        DIFF=$((END_TIME - START_TIME))
-        echo "human=$(printf '%dm %ds' $((DIFF/60)) $((DIFF%60)))" >> "$GITHUB_OUTPUT"
-
-    - name: Wait for 30 seconds if overseer is not ready # to avoid sending report while builds and restarts are running
-      run: |
-        ATTEMPTS=0
-        MAX_ATTEMPTS=40
-        while true; do
-          OVERSEER_READY=$(curl -k -s -w "\n%{http_code}" -X GET ${{ vars.OVERSEER_URL }}/api/server/status --max-time 60)
-          HTTP_CODE=$(echo "$OVERSEER_READY" | tail -n1)
-          RESPONSE_BODY=$(echo "$OVERSEER_READY" | sed '$d')
-          echo "Overseer status check #$((ATTEMPTS+1)): HTTP $HTTP_CODE, response: $RESPONSE_BODY"
-          if [ "$HTTP_CODE" = "200" ]; then
-            echo "::debug::Overseer is ready"
-            break
-          fi
-          ATTEMPTS=$((ATTEMPTS+1))
-          if [ "$ATTEMPTS" -ge "$MAX_ATTEMPTS" ]; then
-            echo "::error::Overseer is not ready after 20 minutes, aborting"
-            exit 1
-          fi
-          echo "::warning::Overseer is not ready (HTTP $HTTP_CODE), waiting 1 minute before retrying..."
-          sleep 30
-        done
-
-    - name: Send Build Report to Overseer
-      run: |
-        # Calculate result based on job outcomes
-        if [ "${{ needs.check_dev_leftovers.result }}" == "success" ] && [ "${{ needs.check_dev_leftovers.result }}" == "success" ] && [ "${{ needs.test.result }}" == "success" ] && [ "${{ needs.check_version.result }}" == "success" ] && [ "${{ needs.deploy.result }}" != "failed" ]; then
-          RESULT="success"
-        else
-          RESULT="failed"
-        fi
-
-        RESPONSE=$(curl -k -s -w "\n%{http_code}" -X POST ${{ vars.OVERSEER_URL }}/api/build-report/new \
-          -H "Content-Type: application/json" \
-          -H "secret-key: ${{ secrets.OVERSEER_SECRET_KEY }}" \
-          -d '{
-            "project": "dynamo",
-            "system": "dynamo-nts",
-            "version": "${{ env.THIS_VERSION }}",
-            "environment": "prod",
-            "branch": "${{ github.ref_name }}",
-            "result": "'$RESULT'",
-            "linkToAction": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})",
-            "stepResults": [
-              {
-                "step": "Check Dev leftovers",
-                "result": "${{ needs.check_dev_leftovers.result }}",
-                "detailedResult": "${{ needs.check_dev_leftovers.outputs }}"
-              },
-              {
-                "step": "Test Build",
-                "result": "${{ needs.test.result }}",
-                "detailedResult": "${{ needs.test.outputs }}"
-              },
-              {
-                "step": "Check Version",
-                "result": "${{ needs.check_version.result }}",
-                "detailedResult": "${{ needs.check_version.outputs }}"
-              },
+      
+    - name: Send Build Report
+      uses: futdevpro/fdp-github-actions/send-build-report@master
+      with:
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        SETTINGS: |
+          {
+            "overseerUrl": "${{ vars.OVERSEER_URL }}",
+            "overseerSecret": "${{ secrets.OVERSEER_SECRET_KEY }}",
+            "branchName": "${{ github.ref_name }}",
+            "repository": "${{ github.repository }}",
+            "runId": "${{ github.run_id }}",
+            "linkToAction": "https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }}",
+            "eventDateTime": "${{ needs.notification0.outputs.start }}",
+            "projects": [
               {
-                "step": "Deploy",
-                "result": "${{ needs.deploy.result }}",
-                "detailedResult": "${{ needs.deploy.outputs }}"
+                "environment": "prod",
+                "jobResults": [
+                  {
+                    "stepName": "checkDevLeftovers",
+                    "result": "${{ needs.check_dev_leftovers.result }}",
+                    "requirement": "optional"
+                  },
+                  {
+                    "stepName": "tests",
+                    "result": "${{ needs.test.result }}",
+                    "requirement": "required"
+                  },
+                  {
+                    "stepName": "checkVersion",
+                    "result": "${{ needs.check_version.result }}",
+                    "requirement": "required"
+                  },
+                  {
+                    "stepName": "deploy",
+                    "result": "${{ needs.deploy.result }}",
+                    "requirement": "optional"
+                  }
+                ]
               }
-            ],
-            "duration": "${{ steps.duration.outputs.human }}"
-          }'
-        )
-        HTTP_CODE=$(echo "$RESPONSE" | tail -n1)
-        RESPONSE_BODY=$(echo "$RESPONSE" | sed '$d')
-        echo "Build report sent to Overseer: HTTP $HTTP_CODE, response: $RESPONSE_BODY"
-
-        if [ "$HTTP_CODE" != "200" ]; then
-          echo "::error::Failed to send build report to Overseer: HTTP $HTTP_CODE, response: $RESPONSE_BODY"
-          echo "Response body:"
-          echo "$RESPONSE_BODY"
-          exit 1
-        fi     
+            ]
+          }
 
   end:
     name: Discord Results
-    needs: [ notification0, check_secrets, check_dev_leftovers, test, check_version, deploy, build_report ]
-    runs-on: ubuntu-latest
-    #runs-on: plo-koon
+    needs: [ 
+      notification0, 
+      check_secrets, 
+      check_dev_leftovers, 
+      test, 
+      check_version, 
+      deploy, 
+      build_report 
+    ]
+    #runs-on: ubuntu-latest
+    runs-on: plo-koon
     timeout-minutes: 20
     if: always()
     steps:
     - name: Checkout code
-      uses: actions/checkout@v2
-
-    - name: Get This Version
-      run: |
-        RAW_THIS_VERSION=$(node -p -e "require('./package.json').version")
-          # replace ALL: 'v0' with '', '01' with '1', '.0' with '.'
-        RAW_THIS_VERSION=$(echo $RAW_THIS_VERSION | sed 's:v0::g'  | sed 's:01:1:g' | sed -e 's:\.0:\.:g')
-        echo "THIS_VERSION=$RAW_THIS_VERSION" >> $GITHUB_ENV
-  
-    - uses: actions/checkout@master
-    - id: duration
-      run: |
-        START_TIME=${{ needs.notification0.outputs.start }}
-        END_TIME=$(date +%s)
-        DIFF=$((END_TIME - START_TIME))
-        echo "human=$(printf '%dm %ds' $((DIFF/60)) $((DIFF%60)))" >> "$GITHUB_OUTPUT"
-    - name: send custom message with args
-      uses: appleboy/discord-action@master
+      uses: actions/checkout@v4
+      
+    - name: Send Discord result notification
+      uses: futdevpro/fdp-github-actions/discord-result-notification@latest
       with:
-        webhook_id: ${{ secrets.DISCORD_WEBHOOK_ID }}
-        webhook_token: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
-        args: ":cd: Dynamo-NTS workflow results:\n\
-          - :tanabata_tree: Branch: ${{ github.ref_name }}\n\
-          - ${{ needs.check_secrets.result == 'failure' && ':cross_mark:' || needs.check_secrets.result == 'success' && ':white_check_mark:' || needs.check_secrets.result == 'skipped' && ':zzz:' || ':question:' }}
-          :key: Check Secrets: ${{ needs.check_secrets.result }}\n\
-          - ${{ needs.check_dev_leftovers.result == 'failure' && ':cross_mark:' || needs.check_dev_leftovers.result == 'success' && ':white_check_mark:' || needs.check_dev_leftovers.result == 'skipped' && ':zzz:' || ':question:' }}
-          :mag: Check Dev leftovers: ${{ needs.check_dev_leftovers.result }}\n\
-          - ${{ needs.test.result == 'failure' && ':cross_mark:' || needs.test.result == 'success' && ':white_check_mark:' || needs.test.result == 'skipped' && ':zzz:' || ':question:' }}
-          :test_tube: Test Build: ${{ needs.test.result }}\n\
-          - ${{ needs.check_version.result == 'failure' && ':cross_mark:' || needs.check_version.result == 'success' && ':white_check_mark:' || needs.check_version.result == 'skipped' && ':zzz:' || ':question:' }}
-          :mag: Check Version: ${{ needs.check_version.result }}\n\
-          - ${{ needs.deploy.result == 'failure' && ':cross_mark:' || needs.deploy.result == 'success' && ':white_check_mark:' || needs.deploy.result == 'skipped' && ':zzz:' || ':question:' }}
-          :package: Deploy: ${{ needs.deploy.result }} (${{ env.THIS_VERSION }}) 
-          ${{ needs.deploy.result == 'success' && '🚀🚀🚀' || '' }}\n\
-          - ${{ needs.build_report.result == 'failure' && ':cross_mark:' || needs.build_report.result == 'success' && ':white_check_mark:' || needs.build_report.result == 'skipped' && ':zzz:' || ':question:' }}
-          :bar_chart: Build Report: ${{ needs.build_report.result }}\n\
-          - :stopwatch: Duration: ${{ steps.duration.outputs.human }}\n\
-          :cd: (${{ github.run_number }}) [:link:](
-            https://github.com/${{ github.repository }}/actions/runs/${{ github.run_id }})"
+        NPM_TOKEN: ${{ secrets.NPM_TOKEN }}
+        APPLICATION_NAME: "Dynamo-NTS"
+        APPLICATION_EMOJI: "💽"
+        BRANCH: ${{ github.ref_name }}
+        RUN_NUMBER: ${{ github.run_number }}
+        RUN_ID: ${{ github.run_id }}
+        REPOSITORY: ${{ github.repository }}
+        START_TIME: ${{ needs.notification0.outputs.start }}
+        STEPS_CONFIG: |
+          [
+            {
+              "stepName": "Secrets Check",
+              "emoji": "🔑",
+              "result": "${{ needs.check_secrets.result }}"
+            },
+            {
+              "stepName": "Dev Leftovers Check",
+              "emoji": "🔍",
+              "result": "${{ needs.check_dev_leftovers.result }}"
+            },
+            {
+              "stepName": "Test Build",
+              "emoji": "🧪",
+              "result": "${{ needs.test.result }}"
+            },
+            {
+              "stepName": "Check Version",
+              "emoji": "🔍",
+              "result": "${{ needs.check_version.result }}"
+            },
+            {
+              "stepName": "Deploy",
+              "emoji": "📦",
+              "result": "${{ needs.deploy.result }}",
+              "specialSuccessEmoji": "🚀🚀🚀"
+            },
+            {
+              "stepName": "Build Report",
+              "emoji": "📊",
+              "result": "${{ needs.build_report.result }}"
+            }
+          ]
+        DISCORD_WEBHOOK_ID: ${{ secrets.DISCORD_WEBHOOK_ID }}
+        DISCORD_WEBHOOK_TOKEN: ${{ secrets.DISCORD_WEBHOOK_TOKEN }}
 
 
 

package/build/_modules/discord-assistant/_services/dias.service-base.d.ts

@@ -11,7 +11,9 @@ export declare abstract class DyNTS_DiAs_ServiceBase extends DyNTS_DiBo_Main_Con
     defaultSystemPrompt: string;
     protected constructor(setupAutomatically?: boolean);
     gatherDiscordMessagesForMessage(message: Message, limit?: number): Promise<Message[]>;
-    gatherDiscordMessagesForChannel(channel: TextChannel, userId: string, limit?: number): Promise<Message[]>;
+    gatherDiscordMessagesForChannel(channel: TextChannel, userId: string, limit?: number, 
+    /** If this is true, then we will add the sender's name to each message */
+    addSourceInfo?: boolean): Promise<Message[]>;
     gatherMessagesAsOAIConversation(message: Message, issuer: string): Promise<DyNTS_OAI_GPT_Message[]>;
 }
 //# sourceMappingURL=dias.service-base.d.ts.map

package/build/_modules/discord-assistant/_services/dias.service-base.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dias.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias.service-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAE,8BAA8B,EAAE,MAAM,uDAAuD,CAAC;AACvG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAGlG,OAAO,EAAE,qBAAqB,EAAE,MAAM,4DAA4D,CAAC;AAGnG,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAGzE,8BAAsB,sBAAuB,SAAQ,8BAA8B;IAEjF,wBAAwB,IAAI,6BAA6B;IAGzD,QAAQ,CAAC,UAAU,EAAE,6BAA6B,CAAmC;IAErF,mBAA4B,QAAQ,EAAE,4BAA4B,CAAC;uBACvC,sBAAsB,IAAI,4BAA4B;IAElF,mBAAmB,EAAE,MAAM,CAAkD;IAE7E,SAAS,aACP,kBAAkB,CAAC,EAAE,OAAO;IASxB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,GAAE,MAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAI1F,+BAA+B,CAAC,OAAO,EAAE,WAAW,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,GAAE,MAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAoB9G,+BAA+B,CACnC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,qBAAqB,EAAE,CAAC;CAUpC"}
+{"version":3,"file":"dias.service-base.d.ts","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias.service-base.ts"],"names":[],"mappings":"AACA,OAAO,EAAiB,OAAO,EAAE,WAAW,EAAE,MAAM,YAAY,CAAC;AAEjE,OAAO,EAAE,8BAA8B,EAAE,MAAM,uDAAuD,CAAC;AACvG,OAAO,EAAE,6BAA6B,EAAE,MAAM,mDAAmD,CAAC;AAGlG,OAAO,EAAE,qBAAqB,EAAE,MAAM,4DAA4D,CAAC;AAGnG,OAAO,EAAE,4BAA4B,EAAE,MAAM,2BAA2B,CAAC;AAGzE,8BAAsB,sBAAuB,SAAQ,8BAA8B;IAEjF,wBAAwB,IAAI,6BAA6B;IAGzD,QAAQ,CAAC,UAAU,EAAE,6BAA6B,CAAmC;IAErF,mBAA4B,QAAQ,EAAE,4BAA4B,CAAC;uBACvC,sBAAsB,IAAI,4BAA4B;IAElF,mBAAmB,EAAE,MAAM,CAAkD;IAE7E,SAAS,aACP,kBAAkB,CAAC,EAAE,OAAO;IASxB,+BAA+B,CAAC,OAAO,EAAE,OAAO,EAAE,KAAK,GAAE,MAAY,GAAG,OAAO,CAAC,OAAO,EAAE,CAAC;IAI1F,+BAA+B,CACnC,OAAO,EAAE,WAAW,EACpB,MAAM,EAAE,MAAM,EACd,KAAK,GAAE,MAAY;IACnB,0EAA0E;IAC1E,aAAa,CAAC,EAAE,OAAO,GACtB,OAAO,CAAC,OAAO,EAAE,CAAC;IAoBf,+BAA+B,CACnC,OAAO,EAAE,OAAO,EAChB,MAAM,EAAE,MAAM,GACb,OAAO,CAAC,qBAAqB,EAAE,CAAC;CAUpC"}

package/build/_modules/discord-assistant/_services/dias.service-base.js

@@ -20,10 +20,12 @@ class DyNTS_DiAs_ServiceBase extends dibo_main_control_service_1.DyNTS_DiBo_Main
     async gatherDiscordMessagesForMessage(message, limit = 100) {
         return this.gatherDiscordMessagesForChannel(message.channel, message.author.id, limit);
     }
-    async gatherDiscordMessagesForChannel(channel, userId, limit = 100) {
+    async gatherDiscordMessagesForChannel(channel, userId, limit = 100, 
+    /** If this is true, then we will add the sender's name to each message */
+    addSourceInfo) {
         const messages = await channel.messages.fetch({ limit: limit }).then(messages => messages.filter(msg => !dias_global_settings_const_1.DyNTS_DiAs_global_settings.skipConversationMessagesFlags.some(flag => msg.content.includes(flag))).map(msg => msg) // this last part creates simple array from Discord Collection
         );
-        if (messages.some(msg => ![this.botClientId, userId].includes(msg.author.id))) {
+        if (addSourceInfo && messages.some(msg => ![this.botClientId, userId].includes(msg.author.id))) {
             messages.forEach(msg => {
                 msg.content = `**${msg.author.displayName}**: ${msg.content}`;
             });

package/build/_modules/discord-assistant/_services/dias.service-base.js.map

@@ -1 +1 @@
-{"version":3,"file":"dias.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias.service-base.ts"],"names":[],"mappings":";;;AAGA,qGAAuG;AACvG,iGAAkG;AAClG,2FAAwF;AACxF,uFAAoF;AAGpF,yDAA4D;AAI5D,MAAsB,sBAAuB,SAAQ,0DAA8B;IAEjF,wBAAwB;QACtB,OAAO,IAAI,yDAA6B,EAAE,CAAC;IAC7C,CAAC;IACQ,UAAU,GAAkC,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAKrF,mBAAmB,GAAW,uDAA0B,CAAC,mBAAmB,CAAC;IAE7E,YACE,kBAA4B;QAE5B,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAE1B,6CAAqB,CAAC,aAAa,KAAK,uDAA0B,CAAC;QAEnE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,OAAgB,EAAE,QAAgB,GAAG;QACzE,OAAO,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,OAAsB,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IACxG,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,OAAoB,EAAE,MAAc,EAAE,QAAgB,GAAG;QAC7F,MAAM,QAAQ,GAAc,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAC7E,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CACzB,GAAG,CAAC,EAAE,CAAC,CAAC,uDAA0B,CAAC,6BAA6B,CAAC,IAAI,CACnE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CACnC,CACF,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,8DAA8D;SACjF,CAAC;QAEF,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YAChF,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACrB,GAAG,CAAC,OAAO,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,WAAW,OAAO,GAAG,CAAC,OAAO,EAAE,CAAC;YAChE,CAAC,CAAC,CAAC;QACL,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,GAAG,CAAC,CAAC,gBAAgB,CAAC,CAAC;QAEjE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,+BAA+B,CACnC,OAAgB,EAChB,MAAc;QAEd,MAAM,QAAQ,GAAc,MAAM,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,CAAC;QAEhF,OAAO,2BAAe,CAAC,uCAAuC,CAAC;YAC7D,QAAQ,EAAE,QAAQ;YAClB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;IACL,CAAC;CACF;AA3DD,wDA2DC"}
+{"version":3,"file":"dias.service-base.js","sourceRoot":"","sources":["../../../../src/_modules/discord-assistant/_services/dias.service-base.ts"],"names":[],"mappings":";;;AAGA,qGAAuG;AACvG,iGAAkG;AAClG,2FAAwF;AACxF,uFAAoF;AAGpF,yDAA4D;AAI5D,MAAsB,sBAAuB,SAAQ,0DAA8B;IAEjF,wBAAwB;QACtB,OAAO,IAAI,yDAA6B,EAAE,CAAC;IAC7C,CAAC;IACQ,UAAU,GAAkC,IAAI,CAAC,wBAAwB,EAAE,CAAC;IAKrF,mBAAmB,GAAW,uDAA0B,CAAC,mBAAmB,CAAC;IAE7E,YACE,kBAA4B;QAE5B,KAAK,CAAC,kBAAkB,CAAC,CAAC;QAE1B,6CAAqB,CAAC,aAAa,KAAK,uDAA0B,CAAC;QAEnE,IAAI,CAAC,UAAU,CAAC,eAAe,CAAC,YAAY,GAAG,IAAI,CAAC,mBAAmB,CAAC;IAC1E,CAAC;IAED,KAAK,CAAC,+BAA+B,CAAC,OAAgB,EAAE,QAAgB,GAAG;QACzE,OAAO,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,OAAsB,EAAE,OAAO,CAAC,MAAM,CAAC,EAAE,EAAE,KAAK,CAAC,CAAC;IACxG,CAAC;IAED,KAAK,CAAC,+BAA+B,CACnC,OAAoB,EACpB,MAAc,EACd,QAAgB,GAAG;IACnB,0EAA0E;IAC1E,aAAuB;QAEvB,MAAM,QAAQ,GAAc,MAAM,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,KAAK,EAAE,KAAK,EAAE,CAAC,CAAC,IAAI,CAC7E,QAAQ,CAAC,EAAE,CAAC,QAAQ,CAAC,MAAM,CACzB,GAAG,CAAC,EAAE,CAAC,CAAC,uDAA0B,CAAC,6BAA6B,CAAC,IAAI,CACnE,IAAI,CAAC,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,CACnC,CACF,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,CAAC,8DAA8D;SACjF,CAAC;QAEF,IAAI,aAAa,IAAI,QAAQ,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAE,IAAI,CAAC,WAAW,EAAE,MAAM,CAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE,CAAC,CAAC,EAAE,CAAC;YACjG,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,EAAE;gBACrB,GAAG,CAAC,OAAO,GAAG,KAAK,GAAG,CAAC,MAAM,CAAC,WAAW,OAAO,GAAG,CAAC,OAAO,EAAE,CAAC;YAChE,CAAC,CAAC,CAAC;QACL,CAAC;QAED,QAAQ,CAAC,IAAI,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,EAAE,CAAC,CAAC,CAAC,gBAAgB,GAAG,CAAC,CAAC,gBAAgB,CAAC,CAAC;QAEjE,OAAO,QAAQ,CAAC;IAClB,CAAC;IAED,KAAK,CAAC,+BAA+B,CACnC,OAAgB,EAChB,MAAc;QAEd,MAAM,QAAQ,GAAc,MAAM,IAAI,CAAC,+BAA+B,CAAC,OAAO,CAAC,CAAC;QAEhF,OAAO,2BAAe,CAAC,uCAAuC,CAAC;YAC7D,QAAQ,EAAE,QAAQ;YAClB,WAAW,EAAE,IAAI,CAAC,WAAW;YAC7B,cAAc,EAAE,IAAI,CAAC,cAAc;YACnC,MAAM,EAAE,MAAM;SACf,CAAC,CAAC;IACL,CAAC;CACF;AAjED,wDAiEC"}

package/build/_modules/discord-assistant-voiced/index.js

@@ -1,18 +1,21 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
-const tslib_1 = require("tslib");
-try {
-    require.resolve('@discordjs/opus');
-}
-catch (error) {
-    console.log('❌ @discordjs/opus package not found, please install it with: pnpm add @discordjs/opus');
+/* try {
+  require.resolve('@discordjs/opus');
+} catch (error) {
+  console.log(
+    '❌ @discordjs/opus package not found, please install it with: pnpm add @discordjs/opus'
+  );
 }
+
 try {
-    require.resolve('@discordjs/voice');
-}
-catch (error) {
-    console.log('❌ @discordjs/voice package not found, please install it with: pnpm add @discordjs/voice');
-}
+  require.resolve('@discordjs/voice');
+} catch (error) {
+  console.log(
+    '❌ @discordjs/voice package not found, please install it with: pnpm add @discordjs/voice'
+  );
+} */
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
 //
 // Discord Assistant Voiced module
 //

package/build/_modules/discord-assistant-voiced/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/_modules/discord-assistant-voiced/index.ts"],"names":[],"mappings":";;;AAAA,IAAI,CAAC;IACH,OAAO,CAAC,OAAO,CAAC,iBAAiB,CAAC,CAAC;AACrC,CAAC;AAAC,OAAO,KAAK,EAAE,CAAC;IACf,OAAO,CAAC,GAAG,CACT,uFAAuF,CACxF,CAAC;AACJ,CAAC;AAED,IAAI,CAAC;IACH,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,CAAC;AACtC,CAAC;AAAC,OAAO,KAAK,EAAE,CAAC;IACf,OAAO,CAAC,GAAG,CACT,yFAAyF,CAC1F,CAAC;AACJ,CAAC;AAGD,EAAE;AACF,kCAAkC;AAClC,EAAE;AACF,2EAA2E;AAC3E,+DAA+D;AAC/D,EAAE;AAEF,eAAe;AACf,+DAAqC;AAGrC,WAAW;AACX,uFAA6D"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/_modules/discord-assistant-voiced/index.ts"],"names":[],"mappings":";AAAA;;;;;;;;;;;;;;IAcI;;;AAGJ,EAAE;AACF,kCAAkC;AAClC,EAAE;AACF,2EAA2E;AAC3E,+DAA+D;AAC/D,EAAE;AAEF,eAAe;AACf,+DAAqC;AAGrC,WAAW;AACX,uFAA6D"}

package/build/_modules/discord-bot/_collections/dibo-operations.util.js

@@ -35,13 +35,13 @@ class DyNTS_DiBo_Operations_Util {
                 `(v${global_settings_const_1.DyNTS_global_settings.systemVersion} ${global_settings_const_1.DyNTS_global_settings.env_settings?.environment})`;
             if (lastReportMessage?.content === reportMessage) {
                 await this.deleteMessage(lastReportMessage).catch((error) => {
-                    fsm_dynamo_1.DyFM_Log.error('Failed to delete message', error);
+                    fsm_dynamo_1.DyFM_Error.logSimple('Failed to delete message', error);
                 });
             }
             this.sendMessageToChannelByName(guild, dibo_global_settings_conts_1.DyNTS_DiBo_global_settings.channelSettings.reportChannelName, reportMessage);
         }
         catch (error) {
-            fsm_dynamo_1.DyFM_Log.error('Failed to report in', error);
+            fsm_dynamo_1.DyFM_Error.logSimple('Failed to report in', error);
         }
     }
     static sendMessageToChannelByName(guild, channelName, message) {
@@ -254,7 +254,7 @@ class DyNTS_DiBo_Operations_Util {
     }
     static async deleteMessage(message) {
         await message.delete().catch((error) => {
-            fsm_dynamo_1.DyFM_Log.error('Failed to delete message', error);
+            fsm_dynamo_1.DyFM_Error.logSimple('Failed to delete message', error);
         });
         fsm_dynamo_1.DyFM_Log.success('Message deleted:', message.content);
     }