Add: Filter out think tags in bot message (#190 )

Additional Channel Awareness (#186 )
Update Documentation with New Features (#185 )
2025-12-12 11:56:06 -05:00 · 2025-10-04 20:17:26 -07:00 · 2025-07-31 19:04:51 -07:00 · 2025-06-22 20:43:50 -07:00 · 2025-06-20 17:04:56 -07:00 · 2025-06-20 08:34:10 -07:00
46 changed files with 1169 additions and 1403 deletions
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -13,10 +13,10 @@ jobs:
      - name: Checkout Repository
        uses: actions/checkout@v4

-      - name: Set up Node Environment lts/hydrogen
+      - name: Set up Node Environment lts/jod
        uses: actions/setup-node@v4
        with:
-          node-version: lts/hydrogen
+          node-version: lts/jod
          cache: "npm"

      - name: Install Project Dependencies
@@ -33,6 +33,7 @@ jobs:
          echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env
          echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
          echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
+          echo MODEL = ${{ secrets.MODEL }} >> .env

        # set -e ensures if nohup fails, this section fails
      - name: Startup Discord Bot Client
@@ -47,10 +48,10 @@ jobs:
      - name: Checkout Repository
        uses: actions/checkout@v4

-      - name: Set up Node Environment lts/hydrogen
+      - name: Set up Node Environment lts/jod
        uses: actions/setup-node@v4
        with:
-          node-version: lts/hydrogen
+          node-version: lts/jod
          cache: "npm"

      - name: Create Environment Variables
@@ -59,6 +60,7 @@ jobs:
          echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env
          echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
          echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
+          echo MODEL = ${{ secrets.MODEL }} >> .env

      - name: Setup Docker Network and Images
        run: |
--- a/.github/workflows/coverage.yml
+++ b/.github/workflows/coverage.yml
@@ -14,10 +14,10 @@ jobs:
      - name: Checkout Repository
        uses: actions/checkout@v4

-      - name: Set up Node Environment lts/hydrogen
+      - name: Set up Node Environment lts/jod
        uses: actions/setup-node@v4
        with:
-          node-version: lts/hydrogen
+          node-version: lts/jod
          cache: "npm"

      - name: Install Project Dependencies
@@ -30,10 +30,11 @@ jobs:
          echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env
          echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
          echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
+          echo MODEL = ${{ secrets.MODEL }} >> .env

      - name: Collect Code Coverage
        run: |
-          LINE_PCT=$(npm run test:coverage | tail -2 | head -1 | awk '{print $3}')
+          LINE_PCT=$(npm run coverage | tail -2 | head -1 | awk '{print $3}')
          echo "COVERAGE=$LINE_PCT" >> $GITHUB_ENV
      
      - name: Upload Code Coverage
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -0,0 +1,109 @@
+name: Deploy
+run-name: Deploy Application Latest
+on:
+  push:
+    tags:
+      - 'v*'
+
+jobs:
+  Deploy-Application:
+    runs-on: self-hosted
+    environment: deploy
+    timeout-minutes: 5
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      # Generate Secret File for Compose case
+      - name: Create Environment Variables
+        run: |
+          touch .env
+          echo CLIENT_TOKEN = ${{ secrets.CLIENT }} >> .env
+          echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
+          echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
+          echo MODEL = ${{ secrets.MODEL }} >> .env
+          echo DISCORD_IP = ${{ secrets.DISCORD_IP }} >> .env
+          echo SUBNET_ADDRESS = ${{ secrets.SUBNET_ADDRESS }} >> .env
+      
+      - name: Check if directory exists and delete it
+        run: |
+          if [ -d "${{ secrets.PATH }}" ]; then
+            echo "Directory exists, deleting old version..."
+            rm -rf ${{ secrets.PATH }}
+          else
+            echo "Directory does not exist."
+          fi
+
+      - name: Clone Repo onto Server
+        run: |
+          git clone https://github.com/kevinthedang/discord-ollama.git ${{ secrets.PATH }}
+          cd ${{ secrets.PATH }}
+      
+      - name: Install nvm and Node.js lts/jod
+        run: |
+          curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.40.1/install.sh | bash
+          export NVM_DIR="$HOME/.nvm"
+          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+          echo "NVM installed successfully."
+          nvm install lts/jod
+          nvm alias default lts/jod
+          node -v
+          npm -v
+
+      - name: Build Application
+        run: |
+          export NVM_DIR="$HOME/.nvm"
+          [ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh"
+          npm install
+
+          IMAGE="kevinthedang/discord-ollama"
+          OLLAMA="ollama/ollama"
+
+          if docker images | grep -q $IMAGE; then
+            IMAGE_ID=$(docker images -q $IMAGE)
+            CONTAINER_IDS=$(docker ps -q --filter "ancestor=$IMAGE_ID")
+
+            if [ ! -z "$CONTAINER_IDS" ]; then
+              # Stop and remove the running containers
+              docker stop $CONTAINER_IDS
+              echo "Stopped and removed the containers using the image $IMAGE"
+            fi
+            docker rmi $IMAGE_ID
+            echo "Old $IMAGE Image Removed"
+          fi
+
+          if docker images | grep -q $OLLAMA; then
+            IMAGE_ID=$(docker images -q $OLLAMA)
+            CONTAINER_IDS=$(docker ps -q --filter "ancestor=$IMAGE_ID")
+
+            if [ ! -z "$CONTAINER_IDS" ]; then
+              # Stop and remove the running containers
+              docker stop $CONTAINER_IDS
+              echo "Stopped and removed the containers using the image $OLLAMA"
+            fi
+            docker rmi $IMAGE_ID
+            echo "Old $OLLAMA Image Removed"
+          fi
+
+          docker network prune -f
+          docker system prune -a -f
+
+          npm run docker:build-latest
+
+      - name: Start Application
+        run: |
+          docker network create --subnet=${{ secrets.SUBNET_ADDRESS }}/16 ollama-net || true
+          docker run --rm -d \
+            -v ollama:/root/.ollama \
+            -p ${{ secrets.OLLAMA_PORT }}:${{ secrets.OLLAMA_PORT }} \
+            --name ollama \
+            --network ollama-net \
+            --ip ${{ secrets.OLLAMA_IP }} \
+            ollama/ollama:latest
+
+          docker run --rm -d \
+            -v discord:/src/app \
+            --name discord \
+            --network ollama-net \
+            --ip ${{ secrets.DISCORD_IP }} \
+            kevinthedang/discord-ollama
--- a/.github/workflows/release.yml
+++ b/.github/workflows/release.yml
@@ -1,48 +0,0 @@
-name: Deploy
-run-name: Release Docker Image
-on:
-  push:
-    tags:
-      - 'v*'
-
-jobs:
-  Release-Docker-Image:
-    runs-on: ubuntu-latest
-    environment: release
-    timeout-minutes: 3
-    steps:
-      - name: Checkout Repository
-        uses: actions/checkout@v4
-
-      - name: Set up Node Environment lts/hydrogen
-        uses: actions/setup-node@v4
-        with:
-          node-version: lts/hydrogen
-          cache: "npm"
-
-      - name: Create Environment Variables
-        run: |
-          touch .env
-          echo CLIENT_TOKEN = NOT_REAL_TOKEN >> .env
-          echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
-          echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
-
-      - name: Get Version from package.json
-        run: echo "VERSION=$(jq -r '.version' package.json)" >> $GITHUB_ENV
-      
-      - name: Build Image
-        run: |
-          npm run docker:build
-
-      - name: Build Image as Latest
-        run: |
-          npm run docker:build-latest
-      
-      - name: Log into Docker
-        run: |
-          docker login --username ${{ vars.DOCKER_USER }} --password ${{ secrets.DOCKER_PASS }}
-
-      - name: Release Docker Image
-        run: |
-          docker push ${{ vars.DOCKER_USER }}/discord-ollama:${{ env.VERSION }}
-          docker push ${{ vars.DOCKER_USER }}/discord-ollama:latest
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -25,10 +25,10 @@ jobs:
      - name: Checkout Repository
        uses: actions/checkout@v4

-      - name: Set up Node Environment lts/hydrogen
+      - name: Set up Node Environment lts/jod
        uses: actions/setup-node@v4
        with:
-          node-version: lts/hydrogen
+          node-version: lts/jod
          cache: "npm"

      - name: Install Project Dependencies
@@ -41,7 +41,8 @@ jobs:
          echo CLIENT_TOKEN = ${{ secrets.BOT_TOKEN }} >> .env
          echo OLLAMA_IP = ${{ secrets.OLLAMA_IP }} >> .env
          echo OLLAMA_PORT = ${{ secrets.OLLAMA_PORT }} >> .env
+          echo MODEL = ${{ secrets.MODEL }} >> .env

      - name: Test Application
        run: |
-          npm run test:run
+          npm run tests
--- a/2
+++ b/2
@@ -11,7 +11,7 @@

 # Technical/Business Code Ownership
 /src/ @kevinthedang @JT2M0L3Y
-/tests/ @kevinthedang @JT2M0L3Y
+/tests/ @JT2M0L3Y
 /.github/ @kevinthedang

 # Docker Ownership
--- a/4
+++ b/4
@@ -1,5 +1,5 @@
-# use node LTS image for version 18
-FROM node:hydrogen-alpine
+# use node LTS image for version 22
+FROM node:jod-alpine

 # set working directory inside container
 WORKDIR /app
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
    <p><a href="#"></a><a href="https://creativecommons.org/licenses/by/4.0/"><img alt="License" src="https://img.shields.io/badge/License-CC_BY_4.0-darkgreen.svg" /></a>
    <a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/releases/latest"><img alt="Release" src="https://img.shields.io/github/v/release/kevinthedang/discord-ollama?logo=github" /></a>
    <a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/actions/workflows/build.yml"><img alt="Build Status" src="https://github.com/kevinthedang/discord-ollama/actions/workflows/build.yml/badge.svg" /></a>
-    <a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/actions/workflows/release.yml"><img alt="Release Status" src="https://github.com/kevinthedang/discord-ollama/actions/workflows/release.yml/badge.svg" /></a>
+    <a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/actions/workflows/deploy.yml"><img alt="Deploy Status" src="https://github.com/kevinthedang/discord-ollama/actions/workflows/deploy.yml/badge.svg" /></a>
    <a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/actions/workflows/test.yml"><img alt="Testing Status" src="https://github.com/kevinthedang/discord-ollama/actions/workflows/test.yml/badge.svg" /></a>
    <a href="#"></a><a href="https://github.com/kevinthedang/discord-ollama/actions/workflows/coverage.yml"><img alt="Code Coverage" src="https://img.shields.io/endpoint?url=https://gist.githubusercontent.com/kevinthedang/bc7b5dcfa16561ab02bb3df67a99b22d/raw/coverage.json"></a>
 </div>
@@ -14,25 +14,35 @@
 Ollama is an AI model management tool that allows users to install and use custom large language models locally.  
 The project aims to:
 * [x] Create a Discord bot that will utilize Ollama and chat to chat with users! 
-  * [x] User Preferences on Chat
-  * [x] Message Persistance on Channels and Threads
-    * [x] Threads
-    * [x] Channels
+  * [x] User and Server Preferences
+  * [x] Message Persistance
  * [x] Containerization with Docker
  * [x] Slash Commands Compatible
+    * [ ] Summary Command
+    * [ ] Model Info Command
+    * [ ] List Models Command
+    * [x] Pull Model Command
+    * [x] Switch Model Command
+    * [x] Delete Model Command
+    * [x] Create Thread Command
+    * [x] Create Private Thread Command
+    * [x] Message Stream Command
+    * [x] Change Message History Size Command
+    * [x] Clear Channel History Command (User Only)
+    * [x] Administrator Role Compatible
  * [x] Generated Token Length Handling for >2000
    * [x] Token Length Handling of any message size
-  * [x] User vs. Server Preferences
-  * [ ] Redis Caching
-  * [x] Administrator Role Compatible
-  * [x] Multi-User Chat Generation (Multiple users chatting at the same time) - This was built in from Ollama `v0.2.1+`
-  * [x] Automatic and Manual model pulling through the Discord client
-* [ ] Allow others to create their own models personalized for their own servers!
-  * [ ] Documentation on creating your own LLM
-  * [ ] Documentation on web scrapping and cleaning
+  * [x] Multi-User Chat Generation - This was built in from Ollama `v0.2.1+`
+  * [ ] Ollama Tool Support Implementation
+  * [ ] Enhanced Channel Context Awareness
+  * [ ] Improved User Replied Triggers
+
+Further, Ollama provides the functionality to utilize custom models or provide context for the top-layer of any model available through the Ollama model library.
+* [Customize a model](https://github.com/ollama/ollama#customize-a-model)
+* [Modelfile Docs](https://github.com/ollama/ollama/blob/main/docs/modelfile.md)

 ## Documentation
-These are guides to the feature set included and the events triggered in this app.
+These are guides to the features and capabilities of this app.
 * [User Slash Commands](./docs/commands-guide.md)
 * [Client Events](./docs/events-guide.md)

@@ -49,8 +59,8 @@ These are guides to the feature set included and the events triggered in this ap

 ## Resources
 * [NodeJS](https://nodejs.org/en)
-    * This project runs on `lts\hydrogen`. 
-    * This project supports any NodeJS version above `16.x.x` to only allow ESModules.
+    * This project runs on `lts\jod` and above. 
+    * This project requires the use of npm version `10.9.0` or above.
 * [Ollama](https://ollama.com/)
    * [Ollama Docker Image](https://hub.docker.com/r/ollama/ollama)
 * [Discord.js Docs](https://discord.js.org/docs/packages/discord.js/main)
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,11 +7,12 @@ services:
    build: ./                     # find docker file in designated path
    container_name: discord
    restart: always               # rebuild container always
-    image: kevinthedang/discord-ollama:0.7.4
+    image: kevinthedang/discord-ollama:0.8.7
    environment:
      CLIENT_TOKEN: ${CLIENT_TOKEN}
      OLLAMA_IP: ${OLLAMA_IP}
      OLLAMA_PORT: ${OLLAMA_PORT}
+      MODEL: ${MODEL}
    networks:
      ollama-net:
        ipv4_address: ${DISCORD_IP}
@@ -26,7 +27,6 @@ services:
    networks:
      ollama-net:
        ipv4_address: ${OLLAMA_IP}
-
    runtime: nvidia             # use Nvidia Container Toolkit for GPU support
    devices:
      - /dev/nvidia0
@@ -35,8 +35,6 @@ services:
    ports: 
      - ${OLLAMA_PORT}:${OLLAMA_PORT}

-# Put Redis Container here?
-
 # create a network that supports giving addresses withing a specific subnet
 networks:
  ollama-net:
--- a/docs/commands-guide.md
+++ b/docs/commands-guide.md
@@ -78,8 +78,7 @@ This is a guide to all of the slash commands for the app.
    ```
    /message-stream stream true
    ```
-    > [!NOTE]
-    > This is a very slow progress on Discord because "spamming" changes within 5 seconds is not allowed.
+    **This is very slow on Discord because "spamming" changes in a channel within a period of 5 seconds is not allowed.**

 3. Message Style  
    This command allows a user to select whether to embed the app's response. 
--- a/docs/events-guide.md
+++ b/docs/events-guide.md
@@ -1,7 +1,9 @@
 ## Events Guide
 This is a guide to all of the client events for the app.

-> [!NOTE] Each of these is logged to the console for a developer to track.
+> [!NOTE]
+> * Each of these is logged to the console for a developer to track.
+> * Possible interactions include commands, buttons, menus, etc.

 1. ClientReady  
    This event signifies that the Discord app is online.  
@@ -11,8 +13,6 @@ This is a guide to all of the client events for the app.
    This event signifies that a user interacted from Discord in some way.  
    Here commands are selected from a knowledge bank and executed if found.

-    > [!NOTE] Possible interactions include commands, buttons, menus, etc.
-
 3. MessageCreate  
    This event signifies that a message was sent.  
    Here user questions and comments for the LLM are processed.  
@@ -24,4 +24,4 @@ This is a guide to all of the client events for the app.

 4. ThreadDelete  
    This event signifies that a Discord Thread was deleted.  
-    Here any preferences set for interaction within the thread are cleared away.
+    Here any preferences set for interaction within the thread are cleared away.
--- a/docs/setup-docker.md
+++ b/docs/setup-docker.md
@@ -44,10 +44,10 @@ sudo systemctl restart docker

 ## To Run (with Docker and Docker Compose)
 * With the inclusion of subnets in the `docker-compose.yml`, you will need to set the `SUBNET_ADDRESS`, `OLLAMA_IP`, `OLLAMA_PORT`, and `DISCORD_IP`. Here are some default values if you don't care:
+    * `SUBNET_ADDRESS = 172.18.0.0`
    * `OLLAMA_IP = 172.18.0.2`
    * `OLLAMA_PORT = 11434`
    * `DISCORD_IP = 172.18.0.3`
-    * `SUBNET_ADDRESS = 172.18.0.0`
    * Don't understand any of this? watch a Networking video to understand subnetting.
    * You also need all environment variables shown in [`.env.sample`](../.env.sample)
 * Otherwise, there is no need to install any npm packages for this, you just need to run `npm run start` to pull the containers and spin them up.
--- a/package-lock.json
+++ b/package-lock.json
--- a/package.json
+++ b/package.json
@@ -1,12 +1,12 @@
 {
  "name": "discord-ollama",
-  "version": "0.7.4",
+  "version": "0.8.7",
  "description": "Ollama Integration into discord",
  "main": "build/index.js",
  "exports": "./build/index.js",
  "scripts": {
-    "test:run": "vitest run",
-    "test:coverage": "vitest run --coverage",
+    "tests": "vitest run",
+    "coverage": "vitest run --coverage",
    "watch": "tsx watch src",
    "build": "tsc",
    "prod": "node .",
@@ -26,20 +26,21 @@
  "author": "Kevin Dang",
  "license": "ISC",
  "dependencies": {
-    "discord.js": "^14.16.3",
-    "dotenv": "^16.4.5",
-    "ollama": "^0.5.9"
+    "discord.js": "^14.20.0",
+    "dotenv": "^16.5.0",
+    "ollama": "^0.5.15"
  },
  "devDependencies": {
-    "@types/node": "^22.9.0",
-    "@vitest/coverage-v8": "^2.1.4",
+    "@types/node": "^22.13.14",
+    "@vitest/coverage-v8": "^3.0.9",
    "ts-node": "^10.9.2",
-    "tsx": "^4.19.2",
-    "typescript": "^5.6.3",
-    "vitest": "^2.1.4"
+    "tsx": "^4.19.3",
+    "typescript": "^5.8.2",
+    "vitest": "^3.0.4"
  },
  "type": "module",
  "engines": {
-    "node": ">=16.0.0"
+    "npm": ">=10.9.0",
+    "node": ">=22.12.0"
  }
 }
--- a/src/client.ts
+++ b/src/client.ts
@@ -1,42 +1,44 @@
-import { Client, GatewayIntentBits } from 'discord.js'
-import { Ollama } from 'ollama'
-import { Queue } from './queues/queue.js'
-import { UserMessage, registerEvents } from './utils/index.js'
-import Events from './events/index.js'
-import Keys from './keys.js'
-
-
-// initialize the client with the following permissions when logging in
-const client = new Client({
-    intents: [
-        GatewayIntentBits.Guilds,
-        GatewayIntentBits.GuildMembers,
-        GatewayIntentBits.GuildMessages,
-        GatewayIntentBits.MessageContent
-    ]
-});
-
-// initialize connection to ollama container
-export const ollama = new Ollama({
-    host: `http://${Keys.ipAddress}:${Keys.portAddress}`,
-})
-
-// Create Queue managed by Events
-const messageHistory: Queue<UserMessage> = new Queue<UserMessage>
-
-// register all events
-registerEvents(client, Events, messageHistory, ollama, Keys.defaultModel)
-
-// Try to log in the client
-await client.login(Keys.clientToken)
-.catch((error) => {
-    console.error('[Login Error]', error)
-    process.exit(1)
-})
-
-// queue up bots name
-messageHistory.enqueue({
-    role: 'assistant',
-    content: `My name is ${client.user?.username}`,
-    images: []
+import { Client, GatewayIntentBits } from 'discord.js'
+import { Ollama } from 'ollama'
+import { Queue } from './queues/queue.js'
+import { UserMessage, registerEvents } from './utils/index.js'
+import Events from './events/index.js'
+import Keys from './keys.js'
+
+// initialize the client with the following permissions when logging in
+const client = new Client({
+    intents: [
+        GatewayIntentBits.Guilds,
+        GatewayIntentBits.GuildMembers,
+        GatewayIntentBits.GuildMessages,
+        GatewayIntentBits.MessageContent
+    ]
+})
+
+// initialize connection to ollama container
+export const ollama = new Ollama({
+    host: `http://${Keys.ipAddress}:${Keys.portAddress}`,
+})
+
+// Create Queue managed by Events
+const messageHistory: Queue<UserMessage> = new Queue<UserMessage>
+
+// Create Channel History Queue managed by Events
+const channelMessageHistory: Queue<UserMessage> = new Queue<UserMessage>
+
+// register all events
+registerEvents(client, Events, messageHistory, channelMessageHistory, ollama, Keys.defaultModel)
+
+// Try to log in the client
+await client.login(Keys.clientToken)
+    .catch((error) => {
+        console.error('[Login Error]', error)
+        process.exit(1)
+    })
+
+// queue up bots name
+messageHistory.enqueue({
+    role: 'assistant',
+    content: `My name is ${client.user?.username}`,
+    images: []
 })
--- a/src/commands/capacity.ts
+++ b/src/commands/capacity.ts
@@ -1,4 +1,4 @@
-import { Client, CommandInteraction, ApplicationCommandOptionType } from 'discord.js'
+import { Client, ChatInputCommandInteraction, ApplicationCommandOptionType, MessageFlags } from 'discord.js'
 import { openConfig, SlashCommand, UserCommand } from '../utils/index.js'

 export const Capacity: SlashCommand = {
@@ -16,17 +16,19 @@ export const Capacity: SlashCommand = {
    ],

    // Query for message information and set the style
-    run: async (client: Client, interaction: CommandInteraction) => {
+    run: async (client: Client, interaction: ChatInputCommandInteraction) => {
        // fetch channel and message
        const channel = await client.channels.fetch(interaction.channelId)
        if (!channel || !UserCommand.includes(channel.type)) return

        // set state of bot chat features
-        openConfig(`${interaction.user.username}-config.json`, interaction.commandName, interaction.options.get('context-capacity')?.value)
+        openConfig(`${interaction.user.username}-config.json`, interaction.commandName,
+            interaction.options.getNumber('context-capacity')
+        )

        interaction.reply({
            content: `Max message history is now set to \`${interaction.options.get('context-capacity')?.value}\``,
-            ephemeral: true
+            flags: MessageFlags.Ephemeral
        })
    }
 }
--- a/src/commands/cleanUserChannelHistory.ts
+++ b/src/commands/cleanUserChannelHistory.ts
@@ -1,4 +1,4 @@
-import { Channel, Client, CommandInteraction, TextChannel } from 'discord.js'
+import { Channel, Client, CommandInteraction, MessageFlags, TextChannel } from 'discord.js'
 import { clearChannelInfo, SlashCommand, UserCommand } from '../utils/index.js'

 export const ClearUserChannelHistory: SlashCommand = {
@@ -14,20 +14,22 @@ export const ClearUserChannelHistory: SlashCommand = {
        if (!channel || !UserCommand.includes(channel.type)) return

        // clear channel info for user
-        const successfulWipe = await clearChannelInfo(interaction.channelId, 
-            interaction.channel as TextChannel, 
-            interaction.user.username)
+        const successfulWipe = await clearChannelInfo(
+            interaction.channelId,
+            interaction.channel as TextChannel,
+            interaction.user.username
+        )

        // check result of clearing history
        if (successfulWipe)
-            interaction.reply({ 
-                content: `History cleared in **this channel** cleared for **${interaction.user.username}**.`, 
-                ephemeral: true
+            interaction.reply({
+                content: `History cleared in **this channel** cleared for **${interaction.user.username}**.`,
+                flags: MessageFlags.Ephemeral
            })
        else
-            interaction.reply({ 
-                content: `History was not be found for **${interaction.user.username}** in **this channel**.\n\nPlease chat with **${client.user?.username}** to start a chat history.`, 
-                ephemeral: true
+            interaction.reply({
+                content: `History was not be found for **${interaction.user.username}** in **this channel**.\n\nPlease chat with **${client.user?.username}** to start a chat history.`,
+                flags: MessageFlags.Ephemeral
            })
    }
 }
--- a/src/commands/deleteModel.ts
+++ b/src/commands/deleteModel.ts
@@ -0,0 +1,74 @@
+import { ApplicationCommandOptionType, ChatInputCommandInteraction, Client, CommandInteraction, MessageFlags } from 'discord.js'
+import { UserCommand, SlashCommand } from '../utils/index.js'
+import { ollama } from '../client.js'
+import { ModelResponse } from 'ollama'
+
+export const DeleteModel: SlashCommand = {
+    name: 'delete-model',
+    description: 'deletes a model from the local list of models. Administrator Only.',
+
+    // set available user options to pass to the command
+    options: [
+        {
+            name: 'model-name',
+            description: 'the name of the model to delete',
+            type: ApplicationCommandOptionType.String,
+            required: true
+        }
+    ],
+
+    // Delete Model locally stored
+    run: async (client: Client, interaction: ChatInputCommandInteraction) => {
+        // defer reply to avoid timeout
+        await interaction.deferReply()
+        const modelInput: string = interaction.options.getString('model-name') as string
+        let ollamaOffline: boolean = false
+
+        // fetch channel and message
+        const channel = await client.channels.fetch(interaction.channelId)
+        if (!channel || !UserCommand.includes(channel.type)) return
+
+        // Admin Command
+        if (!interaction.memberPermissions?.has('Administrator')) {
+            interaction.reply({
+                content: `${interaction.commandName} is an admin command.\n\nPlease contact a server admin to pull the model you want.`,
+                flags: MessageFlags.Ephemeral
+            })
+            return
+        }
+
+        // check if model exists
+        const modelExists = await ollama.list()
+            .then(response => response.models.some((model: ModelResponse) => model.name.startsWith(modelInput)))
+            .catch(error => {
+                ollamaOffline = true
+                console.error(`[Command: delete-model] Failed to connect with Ollama service. Error: ${error.message}`)
+            })
+
+        // Validate for any issue or if service is running
+        if (ollamaOffline) {
+            interaction.editReply({
+                content: `The Ollama service is not running. Please turn on/download the [service](https://ollama.com/).`
+            })
+            return
+        }
+
+            
+        try {
+            // call ollama to delete model
+            if (modelExists) {
+                await ollama.delete({ model: modelInput })
+                interaction.editReply({
+                    content: `**${modelInput}** was removed from the the library.`
+                })
+            } else
+                throw new Error()
+        } catch (error) {
+            // could not delete the model
+            interaction.reply({
+                content: `Could not delete the **${modelInput}** model. It probably doesn't exist or you spelled it incorrectly.\n\nPlease try again if this is a mistake.`,
+                flags: MessageFlags.Ephemeral
+            })
+        }
+    }
+}
--- a/src/commands/disable.ts
+++ b/src/commands/disable.ts
@@ -1,4 +1,4 @@
-import { Client, CommandInteraction, ApplicationCommandOptionType } from 'discord.js'
+import { Client, ChatInputCommandInteraction, ApplicationCommandOptionType, MessageFlags } from 'discord.js'
 import { AdminCommand, openConfig, SlashCommand } from '../utils/index.js'

 export const Disable: SlashCommand = {
@@ -16,7 +16,7 @@ export const Disable: SlashCommand = {
    ],

    // Query for message information and set the style
-    run: async (client: Client, interaction: CommandInteraction) => {
+    run: async (client: Client, interaction: ChatInputCommandInteraction) => {
        // fetch channel and message
        const channel = await client.channels.fetch(interaction.channelId)
        if (!channel || !AdminCommand.includes(channel.type)) return
@@ -25,17 +25,19 @@ export const Disable: SlashCommand = {
        if (!interaction.memberPermissions?.has('Administrator')) {
            interaction.reply({
                content: `${interaction.commandName} is an admin command.\n\nPlease contact an admin to use this command for you.`,
-                ephemeral: true
+                flags: MessageFlags.Ephemeral
            })
            return
        }

        // set state of bot chat features
-        openConfig(`${interaction.guildId}-config.json`, interaction.commandName, interaction.options.get('enabled')?.value)
+        openConfig(`${interaction.guildId}-config.json`, interaction.commandName,
+            interaction.options.getBoolean('enabled')
+        )

        interaction.reply({
-            content: `${client.user?.username} is now **${interaction.options.get('enabled')?.value ?  "enabled" : "disabled" }**.`,
-            ephemeral: true
+            content: `${client.user?.username} is now **${interaction.options.getBoolean('enabled') ? "enabled" : "disabled"}**.`,
+            flags: MessageFlags.Ephemeral
        })
    }
 }
--- a/src/commands/index.ts
+++ b/src/commands/index.ts
@@ -1,6 +1,5 @@
 import { SlashCommand } from '../utils/commands.js'
 import { ThreadCreate } from './threadCreate.js'
-import { MessageStyle } from './messageStyle.js'
 import { MessageStream } from './messageStream.js'
 import { Disable } from './disable.js'
 import { Shutoff } from './shutoff.js'
@@ -9,16 +8,17 @@ import { PrivateThreadCreate } from './threadPrivateCreate.js'
 import { ClearUserChannelHistory } from './cleanUserChannelHistory.js'
 import { PullModel } from './pullModel.js'
 import { SwitchModel } from './switchModel.js'
+import { DeleteModel } from './deleteModel.js'

 export default [
    ThreadCreate,
    PrivateThreadCreate,
-    MessageStyle,
    MessageStream,
    Disable,
    Shutoff,
    Capacity,
    ClearUserChannelHistory,
    PullModel,
-    SwitchModel
+    SwitchModel,
+    DeleteModel
 ] as SlashCommand[]
--- a/src/commands/messageStream.ts
+++ b/src/commands/messageStream.ts
@@ -1,4 +1,4 @@
-import { ApplicationCommandOptionType, Client, CommandInteraction } from 'discord.js'
+import { ApplicationCommandOptionType, Client, ChatInputCommandInteraction, MessageFlags } from 'discord.js'
 import { openConfig, SlashCommand, UserCommand } from '../utils/index.js'

 export const MessageStream: SlashCommand = {
@@ -16,17 +16,19 @@ export const MessageStream: SlashCommand = {
    ],

    // change preferences based on command
-    run: async (client: Client, interaction: CommandInteraction) => {
+    run: async (client: Client, interaction: ChatInputCommandInteraction) => {
        // verify channel
        const channel = await client.channels.fetch(interaction.channelId)
        if (!channel || !UserCommand.includes(channel.type)) return

        // save value to json and write to it
-        openConfig(`${interaction.user.username}-config.json`, interaction.commandName, interaction.options.get('stream')?.value)
+        openConfig(`${interaction.user.username}-config.json`, interaction.commandName,
+            interaction.options.getBoolean('stream')
+        )

        interaction.reply({
-            content: `Message streaming is now set to: \`${interaction.options.get('stream')?.value}\``,
-            ephemeral: true
+            content: `Message streaming is now set to: \`${interaction.options.getBoolean('stream')}\``,
+            flags: MessageFlags.Ephemeral
        })
    }
 }
--- a/src/commands/messageStyle.ts
+++ b/src/commands/messageStyle.ts
@@ -1,32 +0,0 @@
-import { Client, CommandInteraction, ApplicationCommandOptionType } from 'discord.js'
-import { openConfig, SlashCommand, UserCommand } from '../utils/index.js'
-
-export const MessageStyle: SlashCommand = {
-    name: 'message-style',
-    description: 'sets the message style to embed or normal',
-
-    // set available user options to pass to the command
-    options: [
-        {
-            name: 'embed',
-            description: 'toggle embedded or normal message',
-            type: ApplicationCommandOptionType.Boolean,
-            required: true
-        }
-    ],
-
-    // Query for message information and set the style
-    run: async (client: Client, interaction: CommandInteraction) => {
-        // fetch channel and message
-        const channel = await client.channels.fetch(interaction.channelId)
-        if (!channel || !UserCommand.includes(channel.type)) return
-
-        // set the message style
-        openConfig(`${interaction.user.username}-config.json`, interaction.commandName, interaction.options.get('embed')?.value)
-
-        interaction.reply({
-            content: `Message style preferences for embed set to: \`${interaction.options.get('embed')?.value}\``,
-            ephemeral: true
-        })
-    }
-}
--- a/src/commands/pullModel.ts
+++ b/src/commands/pullModel.ts
@@ -1,12 +1,11 @@
-import { ApplicationCommandOptionType, Client, CommandInteraction } from "discord.js";
-import { SlashCommand } from "../utils/commands.js";
-import { ollama } from "../client.js";
-import { ModelResponse } from "ollama";
-import { UserCommand } from "../utils/index.js";
+import { ApplicationCommandOptionType, Client, ChatInputCommandInteraction, MessageFlags } from "discord.js"
+import { ollama } from "../client.js"
+import { ModelResponse } from "ollama"
+import { UserCommand, SlashCommand } from "../utils/index.js"

 export const PullModel: SlashCommand = {
    name: 'pull-model',
-    description: 'pulls a model from the ollama model library. Administrator Only',
+    description: 'pulls a model from the ollama model library. Administrator Only.',

    // set available user options to pass to the command
    options: [
@@ -19,10 +18,11 @@ export const PullModel: SlashCommand = {
    ],

    // Pull for model from Ollama library
-    run: async (client: Client, interaction: CommandInteraction) => {
+    run: async (client: Client, interaction: ChatInputCommandInteraction) => {
        // defer reply to avoid timeout
        await interaction.deferReply()
-        const modelInput: string = interaction.options.get('model-to-pull')!!.value as string
+        const modelInput: string = interaction.options.getString('model-to-pull') as string
+        let ollamaOffline: boolean = false

        // fetch channel and message
        const channel = await client.channels.fetch(interaction.channelId)
@@ -32,14 +32,27 @@ export const PullModel: SlashCommand = {
        if (!interaction.memberPermissions?.has('Administrator')) {
            interaction.reply({
                content: `${interaction.commandName} is an admin command.\n\nPlease contact a server admin to pull the model you want.`,
-                ephemeral: true
+                flags: MessageFlags.Ephemeral
            })
            return
        }

-        // check if model was already pulled
-        const modelExists: boolean = await ollama.list()
+        // check if model was already pulled, if the ollama service isn't running throw error
+        const modelExists = await ollama.list()
            .then(response => response.models.some((model: ModelResponse) => model.name.startsWith(modelInput)))
+            .catch(error => {
+                ollamaOffline = true
+                console.error(`[Command: pull-model] Failed to connect with Ollama service. Error: ${error.message}`)
+            })
+       
+        // Validate for any issue or if service is running
+        if (ollamaOffline) {
+            interaction.editReply({
+                content: `The Ollama service is not running. Please turn on/download the [service](https://ollama.com/).`
+            })
+            return
+        }
+

        try {
            // call ollama to pull desired model
--- a/src/commands/shutoff.ts
+++ b/src/commands/shutoff.ts
@@ -1,6 +1,5 @@
-import { Client, CommandInteraction, ApplicationCommandOptionType } from 'discord.js'
-import { SlashCommand } from '../utils/commands.js'
-import { AdminCommand } from '../utils/index.js'
+import { Client, CommandInteraction, MessageFlags } from 'discord.js'
+import { AdminCommand, SlashCommand } from '../utils/index.js'

 export const Shutoff: SlashCommand = {
    name: 'shutoff',
@@ -19,7 +18,7 @@ export const Shutoff: SlashCommand = {
        if (!interaction.memberPermissions?.has('Administrator')) {
            interaction.reply({
                content: `**Shutdown Aborted:**\n\n${interaction.user.tag}, You do not have permission to shutoff **${client.user?.tag}**.`,
-                ephemeral: true
+                flags: MessageFlags.Ephemeral
            })
            return // stop from shutting down
        }
@@ -27,8 +26,9 @@ export const Shutoff: SlashCommand = {
        // Shutoff cleared, do it
        interaction.reply({
            content: `${client.user?.tag} is shutting down.`,
-            ephemeral: true
+            flags: MessageFlags.Ephemeral
        })
+
        console.log(`[Command: shutoff] ${client.user?.tag} is shutting down.`)

        // clean up client instance and stop
--- a/src/commands/switchModel.ts
+++ b/src/commands/switchModel.ts
@@ -1,8 +1,7 @@
-import { ApplicationCommandOptionType, Client, CommandInteraction } from "discord.js";
-import { SlashCommand } from "../utils/commands.js";
-import { ollama } from "../client.js";
-import { ModelResponse } from "ollama";
-import { openConfig, UserCommand } from "../utils/index.js";
+import { ApplicationCommandOptionType, Client, ChatInputCommandInteraction } from "discord.js"
+import { ollama } from "../client.js"
+import { ModelResponse } from "ollama"
+import { openConfig, UserCommand, SlashCommand } from "../utils/index.js"

 export const SwitchModel: SlashCommand = {
    name: 'switch-model',
@@ -19,10 +18,10 @@ export const SwitchModel: SlashCommand = {
    ],

    // Switch user preferred model if available in local library
-    run: async (client: Client, interaction: CommandInteraction) => {
+    run: async (client: Client, interaction: ChatInputCommandInteraction) => {
        await interaction.deferReply()

-        const modelInput: string = interaction.options.get('model-to-use')!!.value as string
+        const modelInput: string = interaction.options.getString('model-to-use') as string

        // fetch channel and message
        const channel = await client.channels.fetch(interaction.channelId)
@@ -32,20 +31,23 @@ export const SwitchModel: SlashCommand = {
            // Phase 1: Switch to the model
            let switchSuccess = false
            await ollama.list()
-            .then(response => {
-                for (const model in response.models) {
-                    const currentModel: ModelResponse = response.models[model]
-                    if (currentModel.name.startsWith(modelInput)) {
-                        openConfig(`${interaction.user.username}-config.json`, interaction.commandName, modelInput)
+                .then(response => {
+                    for (const model in response.models) {
+                        const currentModel: ModelResponse = response.models[model]
+                        if (currentModel.name.startsWith(modelInput)) {
+                            openConfig(`${interaction.user.username}-config.json`, interaction.commandName, modelInput)

-                        // successful switch
-                        interaction.editReply({
-                            content: `Successfully switched to **${modelInput}** as the preferred model for ${interaction.user.username}.`
-                        })
-                        switchSuccess = true
+                            // successful switch
+                            interaction.editReply({
+                                content: `Successfully switched to **${modelInput}** as the preferred model for ${interaction.user.username}.`
+                            })
+                            switchSuccess = true
+                        }
                    }
-                }
-            })
+                })
+                .catch(error => {
+                    console.error(`[Command: switch-model] Failed to connect with Ollama service. Error: ${error.message}`)
+                })
            // todo: problem can be here if async messes up
            if (switchSuccess) {
                // set model now that it exists
@@ -56,11 +58,14 @@ export const SwitchModel: SlashCommand = {
            // Phase 2: Notify user of failure to find model.
            interaction.editReply({
                content: `Could not find **${modelInput}** in local model library.\n\nPlease contact an server admin for access to this model.`
-            })  
-        } catch (error) {
+            })
+        } catch (error: any) {
            // could not resolve user model switch
+            if (error.message.includes("fetch failed") as string)
+                error.message = "The Ollama service is not running. Please turn on/download the [service](https://ollama.com/)."
+
            interaction.editReply({
-                content: `Unable to switch user preferred model to **${modelInput}**.\n\n${error}\n\nPossible solution is to request an server admin run \`/pull-model ${modelInput}\` and try again.`
+                content: `Unable to switch user preferred model to **${modelInput}**.\n\n${error.message}`
            })
            return
        }
--- a/src/commands/threadCreate.ts
+++ b/src/commands/threadCreate.ts
@@ -1,4 +1,4 @@
-import { ChannelType, Client, CommandInteraction, TextChannel, ThreadChannel } from 'discord.js'
+import { ChannelType, Client, CommandInteraction, MessageFlags, TextChannel, ThreadChannel } from 'discord.js'
 import { AdminCommand, openChannelInfo, SlashCommand } from '../utils/index.js'

 export const ThreadCreate: SlashCommand = {
@@ -21,14 +21,12 @@ export const ThreadCreate: SlashCommand = {
        thread.send(`Hello ${interaction.user} and others! \n\nIt's nice to meet you. Please talk to me by typing **@${client.user?.username}** with your message.`)

        // handle storing this chat channel
-        openChannelInfo(thread.id, 
-            thread as ThreadChannel, 
-            interaction.user.tag)
+        openChannelInfo(thread.id, thread as ThreadChannel, interaction.user.tag)

        // user only reply
        return interaction.reply({
            content: `I can help you in <#${thread.id}> below.`,
-            ephemeral: true
+            flags: MessageFlags.Ephemeral
        })
    }
 }
--- a/src/commands/threadPrivateCreate.ts
+++ b/src/commands/threadPrivateCreate.ts
@@ -1,4 +1,4 @@
-import { ChannelType, Client, CommandInteraction, TextChannel, ThreadChannel } from 'discord.js'
+import { ChannelType, Client, CommandInteraction, MessageFlags, TextChannel, ThreadChannel } from 'discord.js'
 import { AdminCommand, openChannelInfo, SlashCommand } from '../utils/index.js'

 export const PrivateThreadCreate: SlashCommand = {
@@ -22,15 +22,12 @@ export const PrivateThreadCreate: SlashCommand = {

        // handle storing this chat channel
        // store: thread.id, thread.name
-        openChannelInfo(thread.id, 
-            thread as ThreadChannel,
-            interaction.user.tag
-        )
+        openChannelInfo(thread.id, thread as ThreadChannel, interaction.user.tag)

        // user only reply
        return interaction.reply({
            content: `I can help you in <#${thread.id}>.`,
-            ephemeral: true
+            flags: MessageFlags.Ephemeral
        })
    }
 }
--- a/src/events/interactionCreate.ts
+++ b/src/events/interactionCreate.ts
@@ -7,7 +7,7 @@ import commands from '../commands/index.js'
 */
 export default event(Events.InteractionCreate, async ({ log, client }, interaction) => {
    if (!interaction.isCommand() || !interaction.isChatInputCommand()) return
-    
+
    log(`Interaction called \'${interaction.commandName}\' from ${interaction.user.tag}.`)

    // ensure command exists, otherwise kill event
--- a/src/events/messageCreate.ts
+++ b/src/events/messageCreate.ts
@@ -1,6 +1,9 @@
 import { TextChannel } from 'discord.js'
-import { embedMessage, event, Events, normalMessage, UserMessage, clean } from '../utils/index.js'
-import { getChannelInfo, getServerConfig, getUserConfig, openChannelInfo, openConfig, UserConfig, getAttachmentData } from '../utils/index.js'
+import { event, Events, normalMessage, UserMessage, clean, addToChannelContext } from '../utils/index.js'
+import {
+    getChannelInfo, getServerConfig, getUserConfig, openChannelInfo,
+    openConfig, UserConfig, getAttachmentData, getTextFileAttachmentData
+} from '../utils/index.js'

 /** 
 * Max Message length for free users is 2000 characters (bot or not).
@@ -8,14 +11,69 @@ import { getChannelInfo, getServerConfig, getUserConfig, openChannelInfo, openCo
 * 
 * @param message the message received from the channel
 */
-export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client, defaultModel }, message) => {
+export default event(Events.MessageCreate, async ({ log, msgHist, channelHistory, ollama, client, defaultModel }, message) => {
    const clientId = client.user!!.id
-    const cleanedMessage = clean(message.content, clientId)
+    let cleanedMessage = clean(message.content, clientId)
    log(`Message \"${cleanedMessage}\" from ${message.author.tag} in channel/thread ${message.channelId}.`)

    // Do not respond if bot talks in the chat
    if (message.author.username === message.client.user.username) return

+    // Save User Chat even if not for the bot
+    let channelContextHistory: UserMessage[] = await new Promise((resolve) => {
+        getChannelInfo(`${message.channelId}-context.json`, (channelInfo) => {
+            if (channelInfo?.messages)
+                resolve(channelInfo.messages)
+            else {
+                log(`Channel/Thread ${message.channel}-context does not exist. File will be created shortly...`)
+                resolve([])
+            }
+        })
+    })
+
+    if (channelContextHistory.length === 0) {
+        channelContextHistory = await new Promise((resolve) => {
+            addToChannelContext(message.channelId,
+                message.channel as TextChannel
+            )
+            getChannelInfo(`${message.channelId}-context.json`, (channelInfo) => {
+                if (channelInfo?.messages)
+                    resolve(channelInfo.messages)
+                else {
+                    log(`Channel/Thread ${message.channel}-context does not exist. File will be created shortly...`)
+                }
+            })
+        })
+    }
+
+    // Set Channel History Queue
+    channelHistory.setQueue(channelContextHistory)
+
+    // get message attachment if exists
+    const attachment = message.attachments.first()
+    let messageAttachment: string[] = []
+
+    if (attachment && attachment.name?.endsWith(".txt"))
+        cleanedMessage += ' ' + await getTextFileAttachmentData(attachment)
+    else if (attachment)
+        messageAttachment = await getAttachmentData(attachment)
+
+    while (channelHistory.size() >= channelHistory.capacity) channelHistory.dequeue()
+
+    // push user response to channel history
+    console.log
+    channelHistory.enqueue({
+        role: 'user',
+        content: cleanedMessage,
+        images: messageAttachment || []
+    })
+
+    // Store in Channel Context
+    addToChannelContext(message.channelId,
+        message.channel as TextChannel,
+        channelHistory.getItems()
+    )
+
    // Only respond if message mentions the bot
    if (!message.mentions.has(clientId)) return

@@ -25,7 +83,7 @@ export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client
    // Params for Preferences Fetching
    const maxRetries = 3
    const delay = 1000 // in millisecons
- 
+
    try {
        // Retrieve Server/Guild Preferences
        let attempt = 0
@@ -39,7 +97,7 @@ export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client
                            openConfig(`${message.guildId}-config.json`, 'toggle-chat', true)
                            reject(new Error('Failed to locate or create Server Preferences\n\nPlease try chatting again...'))
                        }
-        
+
                        // check if chat is disabled
                        else if (!config.options['toggle-chat'])
                            reject(new Error('Admin(s) have disabled chat features.\n\n Please contact your server\'s admin(s).'))
@@ -48,12 +106,12 @@ export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client
                    })
                })
                break // successful
-            } catch (error) {   
+            } catch (error) {
                ++attempt
                if (attempt < maxRetries) {
                    log(`Attempt ${attempt} failed for Server Preferences. Retrying in ${delay}ms...`)
                    await new Promise(ret => setTimeout(ret, delay))
-                } else 
+                } else
                    throw new Error(`Could not retrieve Server Preferences, please try chatting again...`)
            }
        }
@@ -68,12 +126,11 @@ export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client
                userConfig = await new Promise((resolve, reject) => {
                    getUserConfig(`${message.author.username}-config.json`, (config) => {
                        if (config === undefined) {
-                            openConfig(`${message.author.username}-config.json`, 'message-style', false)
                            openConfig(`${message.author.username}-config.json`, 'switch-model', defaultModel)
-                            reject(new Error('No User Preferences is set up.\n\nCreating preferences file with \`message-style\` set as \`false\` for regular message style.\nPlease try chatting again.'))
+                            reject(new Error(`No User Preferences is set up.\n\nCreating new preferences file for ${message.author.username}\nPlease try chatting again.`))
                            return
                        }
-            
+
                        // check if there is a set capacity in config
                        else if (typeof config.options['modify-capacity'] !== 'number')
                            log(`Capacity is undefined, using default capacity of ${msgHist.capacity}.`)
@@ -89,18 +146,18 @@ export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client

                        if (typeof config.options['switch-model'] !== 'string')
                            reject(new Error(`No Model was set. Please set a model by running \`/switch-model <model of choice>\`.\n\nIf you do not have any models. Run \`/pull-model <model name>\`.`))
-                        
+
                        resolve(config)
                    })
                })
                break // successful
-        } catch (error) {
-            ++attempt
-            if (attempt < maxRetries) {
-                log(`Attempt ${attempt} failed for User Preferences. Retrying in ${delay}ms...`)
-                await new Promise(ret => setTimeout(ret, delay))
-            } else
-                throw new Error(`Could not retrieve User Preferences, please try chatting again...`)
+            } catch (error) {
+                ++attempt
+                if (attempt < maxRetries) {
+                    log(`Attempt ${attempt} failed for User Preferences. Retrying in ${delay}ms...`)
+                    await new Promise(ret => setTimeout(ret, delay))
+                } else
+                    throw new Error(`Could not retrieve User Preferences, please try chatting again...`)
            }
        }

@@ -119,7 +176,7 @@ export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client

        if (chatMessages.length === 0) {
            chatMessages = await new Promise((resolve, reject) => {
-                openChannelInfo(message.channelId, 
+                openChannelInfo(message.channelId,
                    message.channel as TextChannel,
                    message.author.tag
                )
@@ -134,14 +191,9 @@ export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client
            })
        }

-        // response string for ollama to put its response
-        let response: string
-
        if (!userConfig)
            throw new Error(`Failed to initialize User Preference for **${message.author.username}**.\n\nIt's likely you do not have a model set. Please use the \`switch-model\` command to do that.`)

-        // get message attachment if exists
-        const messageAttachment: string[] = await getAttachmentData(message.attachments.first())
        const model: string = userConfig.options['switch-model']

        // set up new queue
@@ -156,12 +208,9 @@ export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client
            content: cleanedMessage,
            images: messageAttachment || []
        })
-        
-        // undefined or false, use normal, otherwise use embed
-        if (userConfig.options['message-style'])
-            response = await embedMessage(message, ollama, model, msgHist, shouldStream)
-        else
-            response = await normalMessage(message, ollama, model, msgHist, shouldStream)
+
+        // response string for ollama to put its response
+        const response: string = await normalMessage(message, ollama, model, msgHist, shouldStream)

        // If something bad happened, remove user query and stop
        if (response == undefined) { msgHist.pop(); return }
@@ -170,16 +219,16 @@ export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client
        while (msgHist.size() >= msgHist.capacity) msgHist.dequeue()

        // successful query, save it in context history
-        msgHist.enqueue({ 
-            role: 'assistant', 
+        msgHist.enqueue({
+            role: 'assistant',
            content: response,
            images: messageAttachment || []
        })

        // only update the json on success
-        openChannelInfo(message.channelId, 
+        openChannelInfo(message.channelId,
            message.channel as TextChannel,
-            message.author.tag, 
+            message.author.tag,
            msgHist.getItems()
        )
    } catch (error: any) {
--- a/src/events/threadDelete.ts
+++ b/src/events/threadDelete.ts
@@ -20,8 +20,8 @@ export default event(Events.ThreadDelete, async ({ log }, thread: ThreadChannel)

            // filter files by thread id being deleted
            const filesToDiscard = files.filter(
-                file => file.startsWith(`${thread.id}-`) && 
-                        file.endsWith('.json'))
+                file => file.startsWith(`${thread.id}-`) &&
+                    file.endsWith('.json'))

            // remove files by unlinking
            filesToDiscard.forEach(file => {
@@ -36,5 +36,5 @@ export default event(Events.ThreadDelete, async ({ log }, thread: ThreadChannel)
        })
    } catch (error) {
        log(`Issue deleting user history files from ${thread.id}`)
-    }  
+    }
 })
--- a/src/keys.ts
+++ b/src/keys.ts
@@ -1,10 +1,10 @@
-import { getEnvVar } from './utils/index.js'
-
-export const Keys = {
-    clientToken: getEnvVar('CLIENT_TOKEN'),
-    ipAddress: getEnvVar('OLLAMA_IP', '127.0.0.1'), // default ollama ip if none
-    portAddress: getEnvVar('OLLAMA_PORT', '11434'), // default ollama port if none
-    defaultModel: getEnvVar('MODEL', 'llama3.2')
-} as const // readonly keys
-
+import { getEnvVar } from './utils/index.js'
+
+export const Keys = {
+    clientToken: getEnvVar('CLIENT_TOKEN'),
+    ipAddress: getEnvVar('OLLAMA_IP', '127.0.0.1'), // default ollama ip if none
+    portAddress: getEnvVar('OLLAMA_PORT', '11434'), // default ollama port if none
+    defaultModel: getEnvVar('MODEL', 'llama3.2')
+} as const // readonly keys
+
 export default Keys
--- a/src/queues/queue.ts
+++ b/src/queues/queue.ts
@@ -17,7 +17,7 @@ export class Queue<T> implements IQueue<T> {
     * Set up Queue
     * @param capacity max length of queue
     */
-    constructor(public capacity: number = 5) {}
+    constructor(public capacity: number = 5) { }

    /**
     * Put item in front of queue
--- a/src/utils/commands.ts
+++ b/src/utils/commands.ts
@@ -1,4 +1,4 @@
-import { CommandInteraction, ChatInputApplicationCommandData, Client, ApplicationCommandOption } from 'discord.js'
+import { ChatInputCommandInteraction, ChatInputApplicationCommandData, Client, ApplicationCommandOption } from 'discord.js'

 /**
 * interface for how slash commands should be run
@@ -6,7 +6,7 @@ import { CommandInteraction, ChatInputApplicationCommandData, Client, Applicatio
 export interface SlashCommand extends ChatInputApplicationCommandData {
    run: (
        client: Client,
-        interaction: CommandInteraction,
+        interaction: ChatInputCommandInteraction,
        options?: ApplicationCommandOption[]
    ) => void
 }
--- a/src/utils/configInterfaces.ts
+++ b/src/utils/configInterfaces.ts
@@ -3,7 +3,6 @@ import { UserMessage } from './index.js'

 export interface UserConfiguration {
    'message-stream'?: boolean,
-    'message-style'?: boolean,
    'modify-capacity': number,
    'switch-model': string
 }
--- a/src/utils/env.ts
+++ b/src/utils/env.ts
@@ -21,14 +21,13 @@ export function getEnvVar(name: string, fallback?: string): string {
        throw new Error(`Environment variable ${name} is not set.`)

    // validate User-Generated Discord Application Tokens 
-    if (name === "CLIENT_TOKEN")
-        if (value.length < 72) throw new Error(`The "CLIENT_TOKEN" provided is not of at least length 72. 
+    if (name === "CLIENT_TOKEN" && value.length > 72)
+        throw new Error(`The "CLIENT_TOKEN" provided is not of at least length 72. 
            This is probably an invalid token unless Discord updated their token policy. Please provide a valid token.`)

    // validate IPv4 address found in environment variables
-    if (name.endsWith("_IP") || name.endsWith("_ADDRESS"))
-        if (!ipValidate.test(value))
-            throw new Error(`Environment variable ${name} does not follow IPv4 formatting.`)
+    if ((name.endsWith("_IP") || name.endsWith("_ADDRESS")) && !ipValidate.test(value))
+        throw new Error(`Environment variable ${name} does not follow IPv4 formatting.`)

    // return env variable
    return value
--- a/src/utils/events.ts
+++ b/src/utils/events.ts
@@ -15,8 +15,8 @@ export type EventKeys = keyof ClientEvents // only wants keys of ClientEvents ob
 * @param msgHist message history
 */
 export type ChatParams = {
-    model: string, 
-    ollama: Ollama, 
+    model: string,
+    ollama: Ollama,
    msgHist: UserMessage[]
 }

@@ -24,6 +24,7 @@ export type ChatParams = {
 * Format for the messages to be stored when communicating when the bot
 * @param role either assistant, user, or system
 * @param content string of the message the user or assistant provided
+ * @param images array of images that the user or assistant provided
 */
 export type UserMessage = {
    role: string,
@@ -33,12 +34,19 @@ export type UserMessage = {

 // Event properties
 export interface EventProps {
-    client: Client
-    log: LogMethod
-    msgHist: Queue<UserMessage>
+    client: Client,
+    log: LogMethod,
+    msgHist: Queue<UserMessage>,
+    channelHistory: Queue<UserMessage>,
    ollama: Ollama,
    defaultModel: String
 }
+
+/**
+ * Format for the callback function tied to an event
+ * @param props the properties of the event
+ * @param args the arguments of the event
+ */
 export type EventCallback<T extends EventKeys> = (
    props: EventProps,
    ...args: ClientEvents[T]
@@ -50,6 +58,12 @@ export interface Event<T extends EventKeys = EventKeys> {
    callback: EventCallback<T>
 }

+/**
+ * Method to create an event object
+ * @param key type of event
+ * @param callback function to run when event is triggered
+ * @returns event object
+ */
 export function event<T extends EventKeys>(key: T, callback: EventCallback<T>): Event<T> {
    return { key, callback }
 }
@@ -62,9 +76,10 @@ export function event<T extends EventKeys>(key: T, callback: EventCallback<T>):
 * @param ollama the initialized ollama instance
 */
 export function registerEvents(
-    client: Client, 
-    events: Event[], 
+    client: Client,
+    events: Event[],
    msgHist: Queue<UserMessage>,
+    channelHistory: Queue<UserMessage>,
    ollama: Ollama,
    defaultModel: String
 ): void {
@@ -75,7 +90,7 @@ export function registerEvents(

            // Handle Errors, call callback, log errors as needed
            try {
-                callback({ client, log, msgHist, ollama, defaultModel }, ...args)
+                callback({ client, log, msgHist, channelHistory, ollama, defaultModel }, ...args)
            } catch (error) {
                log('[Uncaught Error]', error)
            }
--- a/src/utils/handlers/bufferHandler.ts
+++ b/src/utils/handlers/bufferHandler.ts
@@ -54,4 +54,13 @@ export async function getAttachmentData(attachment: Attachment | undefined): Pro
    const buffer = await getAttachmentBuffer(url)
    const base64String = arrayBufferToBase64(buffer)
    return [base64String]
+}
+
+/**
+ * Method to retrieve the string data from the text file
+ * 
+ * @param attachment the text file to convert to a string
+ */
+export async function getTextFileAttachmentData(attachment: Attachment): Promise<string> {
+    return await (await fetch(attachment.url)).text()
 }
--- a/src/utils/handlers/chatHistoryHandler.ts
+++ b/src/utils/handlers/chatHistoryHandler.ts
@@ -56,6 +56,39 @@ export async function clearChannelInfo(filename: string, channel: TextChannel, u
    return cleanedHistory
 }

+export async function addToChannelContext(filename: string, channel : TextChannel | ThreadChannel, messages: UserMessage[] = []): Promise<void> {
+    const fullFileName = `data/${filename}-context.json`
+    if (fs.existsSync(fullFileName)) {
+        fs.readFile(fullFileName, 'utf8', (error, data) => {
+            if (error)
+                console.log(`[Error: addToChannelContext] Incorrect file format`)
+            else {
+                const object = JSON.parse(data)
+                if (object['messages'].length === 0)
+                    object['messages'] = messages as []
+                else if (object['messages'].length !== 0 && messages.length !== 0)
+                    object['messages'] = messages as []
+                fs.writeFileSync(fullFileName, JSON.stringify(object, null, 2))
+            }
+        })
+    } else { // channel context does not exist, create it
+        const object: Configuration = JSON.parse(
+            `{ 
+                \"id\": \"${channel?.id}\", 
+                \"name\": \"${channel?.name}\", 
+                \"messages\": []
+            }`
+        )
+
+        const directory = path.dirname(fullFileName)
+        if (!fs.existsSync(directory))
+            fs.mkdirSync(directory, { recursive: true })
+
+        fs.writeFileSync(fullFileName, JSON.stringify(object, null, 2))
+        console.log(`[Util: addToChannelContext] Created '${fullFileName}' in working directory`)
+    }
+}
+
 /**
 * Method to open the channel history
 * 
@@ -80,7 +113,14 @@ export async function openChannelInfo(filename: string, channel: TextChannel | T
            }
        })
    } else { // file doesn't exist, create it
-        const object: Configuration = JSON.parse(`{ \"id\": \"${channel?.id}\", \"name\": \"${channel?.name}\", \"user\": \"${user}\", \"messages\": []}`)
+        const object: Configuration = JSON.parse(
+            `{ 
+                \"id\": \"${channel?.id}\", 
+                \"name\": \"${channel?.name}\", 
+                \"user\": \"${user}\", 
+                \"messages\": []
+            }`
+        )

        const directory = path.dirname(fullFileName)
        if (!fs.existsSync(directory))
@@ -103,7 +143,7 @@ export async function getChannelInfo(filename: string, callback: (config: Channe
    if (fs.existsSync(fullFileName)) {
        fs.readFile(fullFileName, 'utf8', (error, data) => {
            if (error) {
-                callback(undefined) 
+                callback(undefined)
                return // something went wrong... stop
            }
            callback(JSON.parse(data))
--- a/src/utils/handlers/configHandler.ts
+++ b/src/utils/handlers/configHandler.ts
@@ -12,7 +12,7 @@ import path from 'path'
 // add type of change (server, user)
 export function openConfig(filename: string, key: string, value: any) {
    const fullFileName = `data/${filename}`
-    
+
    // check if the file exists, if not then make the config file
    if (fs.existsSync(fullFileName)) {
        fs.readFile(fullFileName, 'utf8', (error, data) => {
@@ -58,7 +58,7 @@ export async function getServerConfig(filename: string, callback: (config: Serve
    if (fs.existsSync(fullFileName)) {
        fs.readFile(fullFileName, 'utf8', (error, data) => {
            if (error) {
-                callback(undefined) 
+                callback(undefined)
                return // something went wrong... stop
            }
            callback(JSON.parse(data))
@@ -81,7 +81,7 @@ export async function getUserConfig(filename: string, callback: (config: UserCon
    if (fs.existsSync(fullFileName)) {
        fs.readFile(fullFileName, 'utf8', (error, data) => {
            if (error) {
-                callback(undefined) 
+                callback(undefined)
                return // something went wrong... stop
            }
            callback(JSON.parse(data))
--- a/src/utils/handlers/streamHandler.ts
+++ b/src/utils/handlers/streamHandler.ts
@@ -5,7 +5,7 @@ import { AbortableAsyncIterator } from "ollama/src/utils.js"
 /**
 * Method to query the Ollama client for async generation
 * @param params 
- * @returns Asyn
+ * @returns AsyncIterator<ChatResponse> generated by the Ollama client
 */
 export async function streamResponse(params: ChatParams): Promise<AbortableAsyncIterator<ChatResponse>> {
    return await params.ollama.chat({
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -1,7 +1,6 @@
 // Centralized import index
 export * from './env.js'
 export * from './events.js'
-export * from './messageEmbed.js'
 export * from './messageNormal.js'
 export * from './commands.js'
 export * from './configInterfaces.js'
--- a/src/utils/mentionClean.ts
+++ b/src/utils/mentionClean.ts
@@ -1,5 +1,3 @@
-import Keys from "../keys.js"
-
 /**
 * Clean up the bot user_id so it only has the prompt
 * 
--- a/src/utils/messageEmbed.ts
+++ b/src/utils/messageEmbed.ts
@@ -1,129 +0,0 @@
-import { EmbedBuilder, Message, SendableChannels } from 'discord.js'
-import { ChatResponse, Ollama } from 'ollama'
-import { ChatParams, UserMessage, streamResponse, blockResponse } from './index.js'
-import { Queue } from '../queues/queue.js'
-import { AbortableAsyncIterator } from 'ollama/src/utils.js'
-
-/**
- * Method to send replies as normal text on discord like any other user
- * @param message message sent by the user
- * @param model name of model to run query
- * @param msgHist message history between user and model
- */
-export async function embedMessage(
-    message: Message,
-    ollama: Ollama,
-    model: string,
-    msgHist: Queue<UserMessage>,
-    stream: boolean
-): Promise<string> {
-    // bot response
-    let response: ChatResponse | AbortableAsyncIterator<ChatResponse>
-    let result: string = ''
-
-    // initial message to client
-    const botMessage = new EmbedBuilder()
-    .setTitle(`Responding to ${message.author.tag}`)
-    .setDescription('Generating Response . . .')
-    .setColor('#00FF00')
-
-    // send the message
-    const channel = message.channel as SendableChannels
-    const sentMessage = await channel.send({ embeds: [botMessage] })
-
-    // create params
-    const params: ChatParams = {
-        model: model,
-        ollama: ollama,
-        msgHist: msgHist.getItems()
-    }
-
-    try {
-        // check if embed needs to stream
-        if (stream) {
-            response = await streamResponse(params)
-
-            for await (const portion of response) {
-                result += portion.message.content
-
-                // exceeds handled length
-                if (result.length > 5000) {
-                    const errorEmbed = new EmbedBuilder()
-                        .setTitle(`Responding to ${message.author.tag}`)
-                        .setDescription(`Response length ${result.length} has exceeded Discord maximum.\n\nLong Stream messages not supported.`)
-                        .setColor('#00FF00')
-
-                    // send error
-                    channel.send({ embeds: [errorEmbed] })
-                    break // cancel loop and stop
-                }
-
-                // new embed per token...
-                const streamEmbed = new EmbedBuilder()
-                .setTitle(`Responding to ${message.author.tag}`)
-                .setDescription(result || 'No Content Yet...')
-                .setColor('#00FF00')
-
-                // edit the message
-                sentMessage.edit({ embeds: [streamEmbed] })
-            }
-        } else {
-            response = await blockResponse(params)
-            result = response.message.content
-
-            // long message, split into different embeds sadly.
-            if (result.length > 5000) {
-                const firstEmbed = new EmbedBuilder()
-                .setTitle(`Responding to ${message.author.tag}`)
-                .setDescription(result.slice(0, 5000) || 'No Content to Provide...')
-                .setColor('#00FF00')
-
-                // replace first embed
-                sentMessage.edit({ embeds: [firstEmbed] })
-
-                // take the rest out
-                result = result.slice(5000)
-
-                // handle the rest
-                while (result.length > 5000) {
-                    const whileEmbed = new EmbedBuilder()
-                    .setTitle(`Responding to ${message.author.tag}`)
-                    .setDescription(result.slice(0, 5000) || 'No Content to Provide...')
-                    .setColor('#00FF00')
-
-                    channel.send({ embeds: [whileEmbed] })
-                    result = result.slice(5000)
-                }
-
-                const lastEmbed = new EmbedBuilder()
-                .setTitle(`Responding to ${message.author.tag}`)
-                .setDescription(result || 'No Content to Provide...')
-                .setColor('#00FF00')
-
-                // rest of the response
-                channel.send({ embeds: [lastEmbed] })
-            } else {
-                // only need to create 1 embed, handles 6000 characters
-                const newEmbed = new EmbedBuilder()
-                .setTitle(`Responding to ${message.author.tag}`)
-                .setDescription(result || 'No Content to Provide...')
-                .setColor('#00FF00')
-
-                // edit the message
-                sentMessage.edit({ embeds: [newEmbed] })
-            }
-        }
-    } catch(error: any) {
-        console.log(`[Util: messageEmbed] Error creating message: ${error.message}`)
-        const errorEmbed = new EmbedBuilder()
-            .setTitle(`Responding to ${message.author.tag}`)
-            .setDescription(`**Response generation failed.**\n\nReason: ${error.message}`)
-            .setColor('#00FF00')
-        
-        // send back error
-        sentMessage.edit({ embeds: [errorEmbed] })
-    } 
-
-    // Hope there is a response! undefined otherwie
-    return result
-}
--- a/src/utils/messageNormal.ts
+++ b/src/utils/messageNormal.ts
@@ -28,7 +28,7 @@ export async function normalMessage(
                model: model,
                ollama: ollama,
                msgHist: msgHist.getItems()
-            } 
+            }

            // run query based on stream preference, true = stream, false = block
            if (stream) {
@@ -40,14 +40,15 @@ export async function normalMessage(
                        result = portion.message.content

                        // new message block, wait for it to send and assign new block to respond.
-                        await channel.send("Creating new stream block...").then(sentMessage => { messageBlock = sentMessage })
+                        await channel.send("Creating new stream block...")
+                            .then(sentMessage => { messageBlock = sentMessage })
                    } else {
                        result += portion.message.content
-                        
+
                        // ensure block is not empty
                        if (result.length > 5)
-                            messageBlock.edit(result) 
-                    }         
+                            messageBlock.edit(result)
+                    }
                    console.log(result)
                }
            }
@@ -55,6 +56,10 @@ export async function normalMessage(
                response = await blockResponse(params)
                result = response.message.content

+                // check if there is a <think>...</think> sequence from the bot.
+                if (hasThinking(result))
+                    result = result.replace(/<think>[\s\S]*?<\/think>/g, '').trim()
+
                // check if message length > discord max for normal messages
                if (result.length > 2000) {
                    sentMessage.edit(result.slice(0, 2000))
@@ -70,16 +75,21 @@ export async function normalMessage(
                    channel.send(result)
                } else // edit the 'generic' response to new message since <2000
                    sentMessage.edit(result)
-            }            
-        } catch(error: any) {
+            }
+        } catch (error: any) {
            console.log(`[Util: messageNormal] Error creating message: ${error.message}`)
-            if (error.message.includes('try pulling it first'))
-                sentMessage.edit(`**Response generation failed.**\n\nReason: You do not have the ${model} downloaded. Ask an admin to pull it using the \`pull-model\` command.`)
-            else
-                sentMessage.edit(`**Response generation failed.**\n\nReason: ${error.message}`)
+            if (error.message.includes('fetch failed'))
+                error.message = 'Missing ollama service on machine'
+            else if (error.message.includes('try pulling it first'))
+                error.message = `You do not have the ${model} downloaded. Ask an admin to pull it using the \`pull-model\` command.`
+            sentMessage.edit(`**Response generation failed.**\n\nReason: ${error.message}`)
        }
    })

    // return the string representation of ollama query response
    return result
 }
+
+function hasThinking(message: string): boolean {
+    return /<think>[\s\S]*?<\/think>/i.test(message)
+}
--- a/tests/commands.test.ts
+++ b/tests/commands.test.ts
@@ -1,72 +1,78 @@
-// describe marks a test suite
-// expect takes a value from an expression
-// it marks a test case
-import { describe, expect, it } from 'vitest'
-import commands from '../src/commands/index.js'
-
-/**
- * Commands test suite, tests the commands object
- * Each command is to be tested elsewhere, this file
- * is to ensure that the commands object is defined.
- * 
- * @param name name of the test suite
- * @param fn function holding tests to run
- */
-describe('Commands Existence', () => {
-    // test definition of commands object
-    it('references defined object', () => {
-        // toBe compares the value to the expected value
-        expect(typeof commands).toBe('object')
-    })
-
-    // test specific commands in the object
-    it('references specific commands', () => {
-        const commandsString = commands.map(e => e.name).join(', ')
-        expect(commandsString).toBe('thread, private-thread, message-style, message-stream, toggle-chat, shutoff, modify-capacity, clear-user-channel-history, pull-model, switch-model')
-    })
-})
-
-/**
- * User Commands Test suite for testing out commands
- * that would be run by users when using the application.
- */
-describe('User Command Tests', () => {
-    // test capacity command
-    it('run modify-capacity command', () => {
-
-    })
-
-    it('run clear-user-channel-history command', () => {
-        
-    })
-
-    it('run message-stream command', () => {
-        
-    })
-
-    it('run message-style command', () => {
-        
-    })
-    
-    it('run thread command', () => {
-        
-    })
-
-    it('run private-thread command', () => {
-        
-    })
-})
-
-/**
- * Admin Commands Test suite for running administrative 
- * commands with the application.
- */
-describe('Admin Command Tests', () => {
-    it('run shutoff command', () => {
-        
-    })
-
-    it('run toggle-chat command', () => {
-        
-    })
+// describe marks a test suite
+// expect takes a value from an expression
+// it marks a test case
+import { describe, expect, it, vi } from 'vitest'
+import commands from '../src/commands/index.js'
+
+/**
+ * Mocking client.ts because of the commands
+ */
+vi.mock('../src/client.js', () => ({}))
+
+/**
+ * Commands test suite, tests the commands object
+ * Each command is to be tested elsewhere, this file
+ * is to ensure that the commands object is defined.
+ * 
+ * @param name name of the test suite
+ * @param fn function holding tests to run
+ */
+describe('Commands Existence', () => {
+    // test definition of commands object
+    it('references defined object', () => {
+        // toBe compares the value to the expected value
+        expect(typeof commands).toBe('object')
+    })
+
+    // test specific commands in the object
+    it('references specific commands', () => {
+        const commandsString = commands.map(e => e.name).join(', ')
+        const expectedCommands = ['thread', 'private-thread', 'message-stream', 'toggle-chat', 'shutoff', 'modify-capacity', 'clear-user-channel-history', 'pull-model', 'switch-model', 'delete-model']
+        expect(commandsString).toBe(expectedCommands.join(', '))
+    })
+})
+
+/**
+ * User Commands Test suite for testing out commands
+ * that would be run by users when using the application.
+ */
+describe('User Command Tests', () => {
+    // test capacity command
+    it('run modify-capacity command', () => {
+
+    })
+
+    it('run clear-user-channel-history command', () => {
+
+    })
+
+    it('run message-stream command', () => {
+
+    })
+
+    it('run message-style command', () => {
+
+    })
+
+    it('run thread command', () => {
+
+    })
+
+    it('run private-thread command', () => {
+
+    })
+})
+
+/**
+ * Admin Commands Test suite for running administrative 
+ * commands with the application.
+ */
+describe('Admin Command Tests', () => {
+    it('run shutoff command', () => {
+
+    })
+
+    it('run toggle-chat command', () => {
+
+    })
 })
--- a/tests/queue.test.ts
+++ b/tests/queue.test.ts
@@ -8,7 +8,7 @@ import { Queue } from '../src/queues/queue.js'
 * @param fn function holding tests to run
 */
 describe('Queue Structure', () => {
-    let queue= new Queue<string>()
+    let queue = new Queue<string>()

    // test for queue creation
    it('creates a new queue', () => {
Author	SHA1	Message	Date
Kevin Dang	32137dacb0	Add: Filter out think tags in bot message (#190 )	2025-10-04 20:17:26 -07:00
Kevin Dang	c00ea5de98	Additional Channel Awareness (#186 )	2025-07-31 19:04:51 -07:00
Kevin Dang	b27cdfc162	Update Documentation with New Features (#185 )	2025-06-22 20:43:50 -07:00
Jonathan Smoley	1074fe2270	Removed Redis Dependency (#184 )	2025-06-20 17:04:56 -07:00
Jonathan Smoley	4236582cf4	Upgrade discord.js from 14.18.0 to 14.20.0 (#177 ) * fix: upgrade discord.js from 14.18.0 to 14.19.3 Snyk has created this PR to upgrade discord.js from 14.18.0 to 14.19.3. See this package in npm: discord.js See this project in Snyk: https://app.snyk.io/org/jt2m0l3y/project/d8b070a3-e4a3-457a-977b-7eb6a4a48346?utm_source=github&utm_medium=referral&page=upgrade-pr * Update: discordjs to latest * Fix: Broken commands * Fix: Ollama offline failsafes trigger --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Kevin Dang <kevinthedang_1@outlook.com>	2025-06-20 08:34:10 -07:00
Kevin Dang	e07e8fbf89	Fix Missing Redis Connections and Error Messages (#182 ) * Update: simplify npm command to run tests * Fix: redis workaround for local non docker * Update: error message and config creation * Fix: Better Messages for Ollama service being offline * Update: version increment * Fix: verion typo * Update: Use built-in catch method for logging * Update: same catch method for redis	2025-06-18 07:54:53 -07:00
Jonathan Smoley	6d0a537540	Upgrade dotenv to 16.5.0 (#173 ) Snyk has created this PR to upgrade dotenv from 16.4.7 to 16.5.0. See this package in npm: dotenv See this project in Snyk: https://app.snyk.io/org/jt2m0l3y/project/d8b070a3-e4a3-457a-977b-7eb6a4a48346?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <snyk-bot@snyk.io> Co-authored-by: Kevin Dang <77701718+kevinthedang@users.noreply.github.com>	2025-05-15 07:07:06 -07:00
Jonathan Smoley	0ddd59aea1	Upgrade ollama package to 0.5.15 (#174 ) Snyk has created this PR to upgrade ollama from 0.5.14 to 0.5.15. See this package in npm: ollama See this project in Snyk: https://app.snyk.io/org/jt2m0l3y/project/d8b070a3-e4a3-457a-977b-7eb6a4a48346?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <snyk-bot@snyk.io>	2025-05-09 09:22:14 -07:00
Kevin Dang	a5faca87aa	Fix: missing model env for docker (#172 )	2025-04-18 19:42:18 -07:00
Jonathan Smoley	4c96b3863a	Upgrade Dependencies (#164 )	2025-03-28 10:00:50 -07:00
Kevin Dang	40783818b9	Upgrade Npm Packages (#159 ) * Update: upgrade packages * Update: add in all packages * Update: fix whitespace in events --------- Co-authored-by: JT2M0L3Y <jtsmoley@icloud.com>	2025-02-23 21:00:53 -07:00
Kevin Dang	ed0d8600df	Deploy Badge (#163 )	2025-02-22 15:23:01 -08:00
Kevin Dang	03939ef562	Server Deployment Scripts (#162 )	2025-02-22 14:06:14 -08:00
Jonathan Smoley	456f70b9e1	Deprecated ephemeral field (#158 ) * Update: ephemeral flag added in place of field * Update: remove unused import * Update: version increment --------- Co-authored-by: Kevin Dang <kevinthedang_1@outlook.com>	2025-02-02 15:10:58 -08:00
Jonathan Smoley	5b542aca1a	[Snyk] Upgrade discord.js from 14.16.3 to 14.17.3 (#155 )	2025-01-31 16:23:31 -08:00
Kevin Dang	2a39e20fee	Text Files As Prompts (#156 ) * Add: .txt file reading * Update: version increment	2025-01-31 14:12:11 -08:00
Jonathan Smoley	2ea77c92f0	Prepare Redis Environment (#133 ) * add redis container * Updated Guides and Goals (#134) * Update README.md * Update commands-guide.md * Update events-guide.md * Update commands-guide.md * Added: redis client * Fixed: redis mock in commands.test.ts * Updated: npm package patches * Fixed: redis ip name in keys.ts * update Node LTS version, workflow env vars * Updated: node package engine requirements * Updated: documentation * fix: upgrade dotenv from 16.4.5 to 16.4.7 (#152) Snyk has created this PR to upgrade dotenv from 16.4.5 to 16.4.7. See this package in npm: dotenv See this project in Snyk: https://app.snyk.io/org/jt2m0l3y/project/d8b070a3-e4a3-457a-977b-7eb6a4a48346?utm_source=github&utm_medium=referral&page=upgrade-pr Co-authored-by: snyk-bot <snyk-bot@snyk.io> * Update: docs patches, connection ordering --------- Co-authored-by: snyk-bot <snyk-bot@snyk.io>	2024-12-30 15:53:29 -08:00
Kevin Dang	6c7e48d369	Delete Model Command (#150 ) * Add: Delete Model Command * Update: version increment * Update: new command to tests	2024-12-14 17:06:08 -08:00
Kevin Dang	fe1f7ce5ec	Remove Message Style Command (#149 ) * Remove: Message Style Command * Update: version increment	2024-12-13 16:55:57 -08:00