From da1f08a07029bbefcb4e71357d72fd0b1a1a612a Mon Sep 17 00:00:00 2001
From: Kevin Dang <77701718+kevinthedang@users.noreply.github.com>
Date: Sun, 7 Apr 2024 16:09:27 -0700
Subject: [PATCH] Message Blocks for Normal Message Style (#37)

* add: if check for message length

* update: version increment

* update: readme
---
 README.md                  |  2 +-
 docker-compose.yml         |  2 +-
 package-lock.json          |  4 ++--
 package.json               |  2 +-
 src/utils/messageNormal.ts | 12 ++++++++----
 5 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/README.md b/README.md
index dadb5a7..4d72513 100644
--- a/README.md
+++ b/README.md
@@ -15,7 +15,7 @@ The project aims to:
   * [ ] Message Persistance on Channels and Threads
   * [x] Containerization with Docker
   * [x] Slash Commands Compatible
-  * [ ] Generated Token Length Handling for >2000 or >6000 characters
+  * [x] Generated Token Length Handling for >2000 ~~or >6000 characters~~
   * [ ] External WebUI Integration
   * [ ] Administrator Role Compatible
 * [ ] Allow others to create their own models personalized for their own servers!
diff --git a/docker-compose.yml b/docker-compose.yml
index 0df8cdc..68f707c 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,7 +8,7 @@ services:
     build: ./                     # find docker file in designated path
     container_name: discord
     restart: always               # rebuild container always
-    image: discord/bot:0.3.6
+    image: discord/bot:0.4.0
     environment:
       CLIENT_TOKEN: ${CLIENT_TOKEN}
       GUILD_ID: ${GUILD_ID}
diff --git a/package-lock.json b/package-lock.json
index 9640abf..5fbe33a 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "discord-ollama",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "discord-ollama",
-      "version": "0.3.6",
+      "version": "0.4.0",
       "license": "ISC",
       "dependencies": {
         "axios": "^1.6.2",
diff --git a/package.json b/package.json
index 8881638..0774ae6 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "discord-ollama",
-  "version": "0.3.6",
+  "version": "0.4.0",
   "description": "Ollama Integration into discord",
   "main": "build/index.js",
   "exports": "./build/index.js",
diff --git a/src/utils/messageNormal.ts b/src/utils/messageNormal.ts
index 0a34e25..29bbdfe 100644
--- a/src/utils/messageNormal.ts
+++ b/src/utils/messageNormal.ts
@@ -21,7 +21,7 @@ export async function normalMessage(
     // bot's respnse
     let response: ChatResponse
 
-    await message.reply('Generating Response . . .').then(async sentMessage => {
+    await message.channel.send('Generating Response . . .').then(async sentMessage => {
         try {
             // Attempt to query model for message
             response = await ollama.chat({
@@ -35,9 +35,13 @@ export async function normalMessage(
                 },
                 stream: false
             })
-            
-            // edit the 'generic' response to new message
-            sentMessage.edit(response.message.content)
+
+            // check if message length > discord max for normal messages
+            if (response.message.content.length > 2000) {
+                sentMessage.edit(response.message.content.slice(0, 2000))
+                message.channel.send(response.message.content.slice(2000))
+            } else // edit the 'generic' response to new message
+                sentMessage.edit(response.message.content)            
         } catch(error: any) {
             console.log(`[Util: messageNormal] Error creating message: ${error.message}`)
             sentMessage.edit(`**Response generation failed.**\n\nReason: ${error.message}`)