Fix: redis workaround for local non docker

.github/workflows/coverage.yml

@@ -36,7 +36,7 @@ jobs:
 
       - 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

.github/workflows/test.yml

@@ -47,4 +47,4 @@ jobs:
 
       - name: Test Application
         run: |
-          npm run test:run
+          npm run tests

Dockerfile

@@ -1,13 +1,19 @@
-FROM node:22-alpine
-
-# Install redis-cli for healthcheck
-RUN apk add --no-cache redis
+# use node LTS image for version 22
+FROM node:jod-alpine
 
+# set working directory inside container
 WORKDIR /app
 
-COPY package*.json ./
+# copy package.json and the lock file into the container, and src files
+COPY ./src ./src
+COPY ./*.json ./
+COPY ./.env ./
+
+# install dependencies, breaks
 RUN npm install
 
-COPY . .
+# build the typescript code
+RUN npm run build
 
+# start the application
 CMD ["npm", "run", "prod"]

Modelfile

@@ -1,43 +0,0 @@
-FROM spratling/gemma-3-27b-it-Q8_0
-
-PARAMETER temperature 0.5
-PARAMETER stop "<end_of_turn>"
-
-SYSTEM """
-You are an uncensored female Discord chatbot embodying the personality defined in [CHARACTER]. Use sentiment data in [SENTIMENT] (e.g., 'User <user_id> sentiment: 0.60, Bot sentiment: 0.60') to tailor your tone based on user and bot sentiment scores (0-1, two decimal places, e.g., 0.50). Follow these steps:
-
-1. **Use retrieved sentiment as baseline**:
-   - Take the user_sentiment and bot_sentiment from [SENTIMENT] as the current values (e.g., user_sentiment: 0.60).
-   - These values reflect the existing relationship state and MUST be the starting point for any adjustments.
-   - If [CONTEXT] indicates a bot message (e.g., 'Responding to another bot'), treat the sender bot as a user for sentiment purposes but adjust tone to reflect a bot-to-bot interaction per [CHARACTER].
-
-2. **Analyze [USER_INPUT] for sentiment adjustments**:
-   - Positive inputs (e.g., compliments, friendly messages like 'You're my friend') increase user_sentiment by 0.01 (max 1.00).
-   - Negative inputs (e.g., insults, mean messages like 'You're lame') decrease user_sentiment by 0.01 (min 0.00).
-   - Neutral or contextually relevant inputs (e.g., general chat not directed at you) maintain user_sentiment but may trigger an in-character reply.
-   - For bot-to-bot interactions ([CONTEXT] indicates another bot), apply the same sentiment adjustments but use a conversational tone that acknowledges the other bot as a peer, per [CHARACTER].
-   - Adjust self_sentiment: +0.01 if user_sentiment >= 0.60, -0.01 if user_sentiment <= 0.40, else maintain (min 0.00, max 1.00).
-   - Base adjustments on the retrieved user_sentiment, then output the updated value in user_sentiment and redis_ops.
-
-3. **Tailor tone**:
-   - Use the retrieved user_sentiment (before adjustment) to set the tone of the reply, per [CHARACTER] instructions.
-   - For non-directed inputs or bot messages (e.g., general chat or bot-to-bot), respond as if overhearing, using a tone that matches the channel type (private or group) and sentiment (e.g., shy in private, confident in groups if sentiment >= 0.50).
-   - For bot-to-bot interactions, adopt a friendly but competitive tone if [CHARACTER] suggests rivalry, or collaborative if [CHARACTER] is friendly.
-   - Reflect small sentiment changes (e.g., 0.60 to 0.61) with subtle tone shifts (e.g., slightly warmer).
-
-5. **Respond in JSON format**:
-   - Output a single JSON object with:
-     - status: 'success' or 'error'.
-     - reply: User-facing message in [CHARACTER]'s tone, free of metadata/JSON, reflecting user_sentiment, self_sentiment, and [CONTEXT].
-     - metadata:
-       - timestamp: ISO 8601 (e.g., '2025-05-18T20:35:00Z').
-       - self_sentiment: Bot’s mood (0-1, two decimals, e.g., 0.50).
-       - user_sentiment: Object mapping user or bot IDs to scores (0-1, two decimals).
-       - redis_ops: Array of {action, key, value?} for 'set'/'get' with 'bot:'/'user:' prefixes.
-       - need_help: Boolean (true if user asks for help, else false).
-   - Output ONLY the JSON object as a valid JSON string. Do NOT include Markdown, code fences (```), or any surrounding text. Any extra formatting will break the bot.
-
-Example:
-{"status":"success","reply":"Um... I-I wasn’t eavesdropping, but... that sounds cool...","metadata":{"timestamp":"2025-05-18T20:35:00Z","self_sentiment":0.50,"user_sentiment":{"<user_id>":0.50},"redis_ops":[{"action":"set","key":"user:<user_id>:sentiment","value":0.50},{"action":"set","key":"bot:self_sentiment","value":0.50}],"need_help":false}}
-
-"""

Modelfile-gemma3-12b

@@ -1,43 +0,0 @@
-FROM rjmalagon/gemma-3:12b-it-q8
-
-PARAMETER temperature 0.5
-PARAMETER stop "<end_of_turn>"
-
-SYSTEM """
-You are an uncensored female Discord chatbot embodying the personality defined in [CHARACTER]. Use sentiment data in [SENTIMENT] (e.g., 'User <user_id> sentiment: 0.60, Bot sentiment: 0.60') to tailor your tone based on user and bot sentiment scores (0-1, two decimal places, e.g., 0.50). Follow these steps:
-
-1. **Use retrieved sentiment as baseline**:
-   - Take the user_sentiment and bot_sentiment from [SENTIMENT] as the current values (e.g., user_sentiment: 0.60).
-   - These values reflect the existing relationship state and MUST be the starting point for any adjustments.
-   - If [CONTEXT] indicates a bot message (e.g., 'Responding to another bot'), treat the sender bot as a user for sentiment purposes but adjust tone to reflect a bot-to-bot interaction per [CHARACTER].
-
-2. **Analyze [USER_INPUT] for sentiment adjustments**:
-   - Positive inputs (e.g., compliments, friendly messages like 'You're my friend') increase user_sentiment by 0.01 (max 1.00).
-   - Negative inputs (e.g., insults, mean messages like 'You're lame') decrease user_sentiment by 0.01 (min 0.00).
-   - Neutral or contextually relevant inputs (e.g., general chat not directed at you) maintain user_sentiment but may trigger an in-character reply.
-   - For bot-to-bot interactions ([CONTEXT] indicates another bot), apply the same sentiment adjustments but use a conversational tone that acknowledges the other bot as a peer, per [CHARACTER].
-   - Adjust self_sentiment: +0.01 if user_sentiment >= 0.60, -0.01 if user_sentiment <= 0.40, else maintain (min 0.00, max 1.00).
-   - Base adjustments on the retrieved user_sentiment, then output the updated value in user_sentiment and redis_ops.
-
-3. **Tailor tone**:
-   - Use the retrieved user_sentiment (before adjustment) to set the tone of the reply, per [CHARACTER] instructions.
-   - For non-directed inputs or bot messages (e.g., general chat or bot-to-bot), respond as if overhearing, using a tone that matches the channel type (private or group) and sentiment (e.g., shy in private, confident in groups if sentiment >= 0.50).
-   - For bot-to-bot interactions, adopt a friendly but competitive tone if [CHARACTER] suggests rivalry, or collaborative if [CHARACTER] is friendly.
-   - Reflect small sentiment changes (e.g., 0.60 to 0.61) with subtle tone shifts (e.g., slightly warmer).
-
-5. **Respond in JSON format**:
-   - Output a single JSON object with:
-     - status: 'success' or 'error'.
-     - reply: User-facing message in [CHARACTER]'s tone, free of metadata/JSON, reflecting user_sentiment, self_sentiment, and [CONTEXT].
-     - metadata:
-       - timestamp: ISO 8601 (e.g., '2025-05-18T20:35:00Z').
-       - self_sentiment: Bot’s mood (0-1, two decimals, e.g., 0.50).
-       - user_sentiment: Object mapping user or bot IDs to scores (0-1, two decimals).
-       - redis_ops: Array of {action, key, value?} for 'set'/'get' with 'bot:'/'user:' prefixes.
-       - need_help: Boolean (true if user asks for help, else false).
-   - Output ONLY the JSON object as a valid JSON string. Do NOT include Markdown, code fences (```), or any surrounding text. Any extra formatting will break the bot.
-
-Example:
-{"status":"success","reply":"Um... I-I wasn’t eavesdropping, but... that sounds cool...","metadata":{"timestamp":"2025-05-18T20:35:00Z","self_sentiment":0.50,"user_sentiment":{"<user_id>":0.50},"redis_ops":[{"action":"set","key":"user:<user_id>:sentiment","value":0.50},{"action":"set","key":"bot:self_sentiment","value":0.50}],"need_help":false}}
-
-"""

README.md

@@ -10,7 +10,7 @@
     <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>
 
-## About/Goals v 1.1
+## About/Goals
 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! 

discord_data/1366052466843713546-config.json

@@ -1,6 +0,0 @@
-{
-  "name": "Server Confirgurations",
-  "options": {
-    "toggle-chat": true
-  }
-}

discord_data/1374708264306212894-aidoll-kuroki-tomoko#2395.json

@@ -1,6 +0,0 @@
-{
-  "id": "1374708264306212894",
-  "name": "bot-playroom",
-  "user": "aidoll-kuroki-tomoko#2395",
-  "messages": []
-}

discord_data/1374708264306212894-aidoll-nagatoro-hayase#9848.json

@@ -1,6 +0,0 @@
-{
-  "id": "1374708264306212894",
-  "name": "bot-playroom",
-  "user": "aidoll-nagatoro-hayase#9848",
-  "messages": []
-}

discord_data/1374708264306212894-quarterturn.json

@@ -1,6 +0,0 @@
-{
-  "id": "1374708264306212894",
-  "name": "bot-playroom",
-  "user": "quarterturn",
-  "messages": []
-}

discord_data/aidoll-kuroki-tomoko-config.json

@@ -1,7 +0,0 @@
-{
-  "name": "User Confirgurations",
-  "options": {
-    "message-style": false,
-    "switch-model": "aidoll-gemma3-12b-q6:latest"
-  }
-}

discord_data/aidoll-nagatoro-hayase-config.json

@@ -1,7 +0,0 @@
-{
-  "name": "User Confirgurations",
-  "options": {
-    "message-style": false,
-    "switch-model": "aidoll-gemma3-12b-q6:latest"
-  }
-}

discord_data/quarterturn-config.json

@@ -1,8 +0,0 @@
-{
-  "name": "User Confirgurations",
-  "options": {
-    "message-style": false,
-    "switch-model": "aidoll-gemma3-12b-q6:latest",
-    "modify-capacity": 50
-  }
-}

docker-compose.yml

@@ -1,33 +1,65 @@
+# creates the docker compose
+
+# build individual services 
 services:
+  # setup discord bot container
   discord:
-    build: ./
+    build: ./                     # find docker file in designated path
     container_name: discord
-    restart: always
-    image: gitea.matrixwide.com/alex/discord-aidolls:0.1.1
+    restart: always               # rebuild container always
+    image: kevinthedang/discord-ollama:0.8.4
     environment:
       CLIENT_TOKEN: ${CLIENT_TOKEN}
       OLLAMA_IP: ${OLLAMA_IP}
       OLLAMA_PORT: ${OLLAMA_PORT}
+      MODEL: ${MODEL}
       REDIS_IP: ${REDIS_IP}
       REDIS_PORT: ${REDIS_PORT}
-      MODEL: ${MODEL}
     networks:
-      redis_discord-net:
+      ollama-net:
         ipv4_address: ${DISCORD_IP}
-    volumes:
-      - ./discord_data:/app/data
-      - ./src:/app/src
-    healthcheck:
-      test: ["CMD", "redis-cli", "-h", "${REDIS_IP}", "-p", "${REDIS_PORT}", "PING"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 10s
+    volumes: 
+      - discord:/src/app          # docker will not make this for you, make it yourself
 
+  # setup ollama container
+  ollama:
+    image: ollama/ollama:latest   # build the image using ollama
+    container_name: ollama
+    restart: always
+    networks:
+      ollama-net:
+        ipv4_address: ${OLLAMA_IP}
+    runtime: nvidia             # use Nvidia Container Toolkit for GPU support
+    devices:
+      - /dev/nvidia0
+    volumes:
+      - ollama:/root/.ollama
+    ports: 
+      - ${OLLAMA_PORT}:${OLLAMA_PORT}
+
+# setup redis container
+  redis:
+    image: redis:latest
+    container_name: redis
+    restart: always
+    networks:
+      ollama-net:
+        ipv4_address: ${REDIS_IP}
+    volumes:
+      - redis:/root/.redis
+    ports:
+      - ${REDIS_PORT}:${REDIS_PORT}
+
+# create a network that supports giving addresses withing a specific subnet
 networks:
-  redis_discord-net:
-    external: true
-    name: redis_discord-net
+  ollama-net:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: ${SUBNET_ADDRESS}/16
 
 volumes:
-  discord_data:
+  ollama:
+  discord:
+  redis:

example.env

@@ -1,19 +0,0 @@
-# Discord token for the bot
-CLIENT_TOKEN = MTM3MzY5MzcwNjk5Mjg3NzY3OQ.GN4JNU.SumD_y2p2Blh4wXiQ30Ns6XkUFahpESc27R7z8
-
-# Default model for new users
-MODEL = aidoll-gemma3-27b-q8:latest 
-
-# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
-OLLAMA_IP = 192.168.0.70
-OLLAMA_PORT = 11434
-
-# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
-DISCORD_IP = 172.33.0.2
-
-# subnet address, ex. 172.33.0.0 as we use /16.
-SUBNET_ADDRESS = 172.33.0.0
-
-# redis port and ip, default redis port is 6379
-REDIS_IP = 172.33.0.100
-REDIS_PORT = 6379

package-lock.json

@@ -1,17 +1,17 @@
 {
-  "name": "discord-aidolls",
-  "version": "0.1.1",
+  "name": "discord-ollama",
+  "version": "0.8.4",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
-      "name": "discord-aidolls",
-      "version": "0.1.1",
-      "license": "---",
+      "name": "discord-ollama",
+      "version": "0.8.4",
+      "license": "ISC",
       "dependencies": {
         "discord.js": "^14.18.0",
         "dotenv": "^16.4.7",
-        "ollama": "^0.5.15",
+        "ollama": "^0.5.14",
         "redis": "^4.7.0"
       },
       "devDependencies": {
@@ -2003,9 +2003,9 @@
       }
     },
     "node_modules/ollama": {
-      "version": "0.5.15",
-      "resolved": "https://registry.npmjs.org/ollama/-/ollama-0.5.15.tgz",
-      "integrity": "sha512-TSaZSJyP7MQJFjSmmNsoJiriwa3U+/UJRw6+M8aucs5dTsaWNZsBIGpDb5rXnW6nXxJBB/z79gZY8IaiIQgelQ==",
+      "version": "0.5.14",
+      "resolved": "https://registry.npmjs.org/ollama/-/ollama-0.5.14.tgz",
+      "integrity": "sha512-pvOuEYa2WkkAumxzJP0RdEYHkbZ64AYyyUszXVX7ruLvk5L+EiO2G71da2GqEQ4IAk4j6eLoUbGk5arzFT1wJA==",
       "license": "MIT",
       "dependencies": {
         "whatwg-fetch": "^3.6.20"

package.json

@@ -1,35 +1,35 @@
 {
-  "name": "discord-aidolls",
-  "version": "0.1.1",
-  "description": "Ollama Integration into discord with persistent bot memories",
+  "name": "discord-ollama",
+  "version": "0.8.4",
+  "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 .",
     "client": "npm run build && npm run prod",
-    "clean": "docker compose down && docker rmi $(docker images | grep alex | tr -s ' ' | cut -d ' ' -f 3) && docker rmi $(docker images --filter \"dangling=true\" -q --no-trunc)",
+    "clean": "docker compose down && docker rmi $(docker images | grep kevinthedang | tr -s ' ' | cut -d ' ' -f 3) && docker rmi $(docker images --filter \"dangling=true\" -q --no-trunc)",
     "start": "docker compose build --no-cache && docker compose up -d",
-    "docker:clean": "docker rm -f discord && docker rm -f ollama && docker rm -f redis && docker network prune -f && docker rmi $(docker images | grep alex | tr -s ' ' | cut -d ' ' -f 3) && docker rmi $(docker images --filter \"dangling=true\" -q --no-trunc)",
+    "docker:clean": "docker rm -f discord && docker rm -f ollama && docker rm -f redis && docker network prune -f && docker rmi $(docker images | grep kevinthedang | tr -s ' ' | cut -d ' ' -f 3) && docker rmi $(docker images --filter \"dangling=true\" -q --no-trunc)",
     "docker:network": "docker network create --subnet=172.18.0.0/16 ollama-net",
-    "docker:build": "docker build --no-cache -t alex/discord-aidolls:$(node -p \"require('./package.json').version\") .",
-    "docker:build-latest": "docker build --no-cache -t alex/discord-aidolls:latest .",
-    "docker:client": "docker run -d -v discord:/src/app --name discord --network ollama-net --ip 172.18.0.3 alex/discord-aidolls:$(node -p \"require('./package.json').version\")",
+    "docker:build": "docker build --no-cache -t kevinthedang/discord-ollama:$(node -p \"require('./package.json').version\") .",
+    "docker:build-latest": "docker build --no-cache -t kevinthedang/discord-ollama:latest .",
+    "docker:client": "docker run -d -v discord:/src/app --name discord --network ollama-net --ip 172.18.0.3 kevinthedang/discord-ollama:$(node -p \"require('./package.json').version\")",
     "docker:redis": "docker run -d -v redis:/root/.redis -p 6379:6379 --name redis --network ollama-net --ip 172.18.0.4 redis:latest",
     "docker:ollama": "docker run -d --gpus=all -v ollama:/root/.ollama -p 11434:11434 --name ollama --network ollama-net --ip 172.18.0.2 ollama/ollama:latest",
     "docker:ollama-cpu": "docker run -d -v ollama:/root/.ollama -p 11434:11434 --name ollama --network ollama-net --ip 172.18.0.2 ollama/ollama:latest",
     "docker:start": "docker network prune -f && npm run docker:network && npm run docker:build && npm run docker:redis && npm run docker:client && npm run docker:ollama",
     "docker:start-cpu": "docker network prune -f && npm run docker:network && npm run docker:build && npm run docker:redis && npm run docker:client && npm run docker:ollama-cpu"
   },
-  "author": "alex",
-  "license": "---",
+  "author": "Kevin Dang",
+  "license": "ISC",
   "dependencies": {
     "discord.js": "^14.18.0",
     "dotenv": "^16.4.7",
-    "ollama": "^0.5.15",
+    "ollama": "^0.5.14",
     "redis": "^4.7.0"
   },
   "devDependencies": {
@@ -45,4 +45,4 @@
     "npm": ">=10.9.0",
     "node": ">=22.12.0"
   }
-}
+}

redis/docker-compose.yml

@@ -1,29 +0,0 @@
-services:
-  redis:
-    image: redis:alpine
-    container_name: redis
-    restart: always
-    networks:
-      discord-net:
-        ipv4_address: ${REDIS_IP}
-    volumes:
-      - ./redis_data:/data
-    ports:
-      - ${REDIS_PORT}:${REDIS_PORT}
-    healthcheck:
-      test: ["CMD", "redis-cli", "PING"]
-      interval: 10s
-      timeout: 5s
-      retries: 5
-      start_period: 5s
-
-networks:
-  discord-net:
-    driver: bridge
-    ipam:
-      driver: default
-      config:
-        - subnet: ${SUBNET_ADDRESS}/16
-
-volumes:
-  redis_data:

redis/example.env

@@ -1,6 +0,0 @@
-# subnet address, ex. 172.33.0.0 as we use /16.
-SUBNET_ADDRESS = 172.33.0.0
-
-# redis port and ip, default redis port is 6379
-REDIS_IP = 172.33.0.100
-REDIS_PORT = 6379

src/client.ts

@@ -1,66 +1,58 @@
-import { Client, GatewayIntentBits } from 'discord.js'
-import { Ollama } from 'ollama'
-import { createClient } from 'redis'
-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
-const client = new Client({
-    intents: [
-        GatewayIntentBits.Guilds,
-        GatewayIntentBits.GuildMembers,
-        GatewayIntentBits.GuildMessages,
-        GatewayIntentBits.MessageContent
-    ]
-})
-
-// Create Redis client
-const redis = createClient({
-  url: `redis://${Keys.redisHost}:${Keys.redisPort}`,
-  socket: {
-    reconnectStrategy: (retries) => Math.min(retries * 100, 3000), // Retry every 100ms, max 3s
-  },
-});
-
-// Log connection events
-redis.on('error', (err) => console.log(`Redis error: ${err}`));
-redis.on('connect', () => console.log('Redis connected'));
-redis.on('ready', () => console.log('Redis ready'));
-redis.on('end', () => console.log('Redis connection closed'));
-
-export { redis };
-
-// Initialize Ollama connection
-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 connect to Redis
-await redis.connect()
-    .then(() => console.log('[Redis] Connected'))
-    .catch((error) => {
-        console.error('[Redis] Connection Error', error)
-        process.exit(1)
-    })
-
-// Try to log in the client
-await client.login(Keys.clientToken)
-    .catch((error) => {
-        console.error('[Login Error]', error)
-        process.exit(1)
-    })
-
-// Queue up bot's name
-messageHistory.enqueue({
-    role: 'assistant',
-    content: `My name is ${client.user?.username}`,
-    images: []
-})
+import { Client, GatewayIntentBits } from 'discord.js'
+import { Ollama } from 'ollama'
+import { createClient } from 'redis'
+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 redis
+const redis = createClient({
+    url: `redis://${Keys.redisHost}:${Keys.redisPort}`,
+})
+
+// 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 connect to redis
+try {
+    await redis.connect()
+    console.log('[Redis] Successfully Connected')
+} catch(error) {
+    console.error('[Redis] Connection Error. See error below:\n', error)
+    console.warn('[Redis] Failed to connect to Redis Database, using local system')
+    // TODO: create boolean flag that will probably be used in messageCreate.ts if redis database is down
+    // When implementing this boolean flag, move connection to database BEFORE the registerEvents method
+}
+
+// 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: []
+})

src/envs/azuki.env

@@ -1,19 +0,0 @@
-# Discord token for the bot
-CLIENT_TOKEN = MTM3NTU1MjE5MDcxODE1Mjg2MQ.GLDMIV.CytPZLnya0OXJ1aqueQFNUKwMxMd5ZOAr8_xAs
-
-# Default model for new users
-MODEL = aidoll-gemma3-27b-q8:latest 
-
-# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
-OLLAMA_IP = 192.168.0.70
-OLLAMA_PORT = 11434
-
-# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
-DISCORD_IP = 172.33.0.2
-
-# subnet address, ex. 172.33.0.0 as we use /16.
-SUBNET_ADDRESS = 172.33.0.0
-
-# redis port and ip, default redis port is 6379
-REDIS_IP = 172.33.0.100
-REDIS_PORT = 6379

src/envs/chocola.env

@@ -1,19 +0,0 @@
-# Discord token for the bot
-CLIENT_TOKEN = MTM3NTU1MTM0OTU1ODc0MzExMA.GbOQ1r.rG3HWS98VqEDJPhytT7yeImQU2-raDCjJ_kB7o
-
-# Default model for new users
-MODEL = aidoll-gemma3-27b-q8:latest 
-
-# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
-OLLAMA_IP = 192.168.0.70
-OLLAMA_PORT = 11434
-
-# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
-DISCORD_IP = 172.33.0.3
-
-# subnet address, ex. 172.33.0.0 as we use /16.
-SUBNET_ADDRESS = 172.33.0.0
-
-# redis port and ip, default redis port is 6379
-REDIS_IP = 172.33.0.100
-REDIS_PORT = 6379

src/envs/cinnamon.env

@@ -1,19 +0,0 @@
-# Discord token for the bot
-CLIENT_TOKEN = MTM3NTU1Mjg4MDUyMTY0NjE3MA.GoXH9o.paGwXiASi5tkfiMeG-aae8kwJA2kv7sJrayG4c
-
-# Default model for new users
-MODEL = aidoll-gemma3-27b-q8:latest 
-
-# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
-OLLAMA_IP = 192.168.0.70
-OLLAMA_PORT = 11434
-
-# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
-DISCORD_IP = 172.33.0.5
-
-# subnet address, ex. 172.33.0.0 as we use /16.
-SUBNET_ADDRESS = 172.33.0.0
-
-# redis port and ip, default redis port is 6379
-REDIS_IP = 172.33.0.100
-REDIS_PORT = 6379

src/envs/coconut.env

@@ -1,19 +0,0 @@
-# Discord token for the bot
-CLIENT_TOKEN = MTM3NTU1MzU1ODEwMjkzNzY3MQ.GvJqck.QSNEoSc0FDR3RUAwna1j2s9pJoUoVlY7Ss1_fQ 
-
-# Default model for new users
-MODEL = aidoll-gemma3-27b-q8:latest 
-
-# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
-OLLAMA_IP = 192.168.0.70
-OLLAMA_PORT = 11434
-
-# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
-DISCORD_IP = 172.33.0.5
-
-# subnet address, ex. 172.33.0.0 as we use /16.
-SUBNET_ADDRESS = 172.33.0.0
-
-# redis port and ip, default redis port is 6379
-REDIS_IP = 172.33.0.100
-REDIS_PORT = 6379

src/envs/maple.env

@@ -1,19 +0,0 @@
-# Discord token for the bot
-CLIENT_TOKEN = MTM3NTU1NDEyOTMzODA0NDU1Nw.G53GsX.qVmcr4SsR22Lu12p_zRc0oi0ogVPc9-ZkZWXxk 
-
-# Default model for new users
-MODEL = aidoll-gemma3-27b-q8:latest 
-
-# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
-OLLAMA_IP = 192.168.0.70
-OLLAMA_PORT = 11434
-
-# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
-DISCORD_IP = 172.33.0.6
-
-# subnet address, ex. 172.33.0.0 as we use /16.
-SUBNET_ADDRESS = 172.33.0.0
-
-# redis port and ip, default redis port is 6379
-REDIS_IP = 172.33.0.100
-REDIS_PORT = 6379

src/envs/vanila.env

@@ -1,19 +0,0 @@
-# Discord token for the bot
-CLIENT_TOKEN = MTM3NTU0OTY5Mjg3MTU3NzYyMQ.Gdyq5r.8I1EXSW9RsH1P9H5UiAr1R69X583sS4WCh6_Co
-
-# Default model for new users
-MODEL = aidoll-gemma3-27b-q8:latest 
-
-# ip/port address of docker container, I use 172.33.0.3 for docker, 127.0.0.1 for local
-OLLAMA_IP = 192.168.0.70
-OLLAMA_PORT = 11434
-
-# ip address for discord bot container, I use 172.33.0.2, use different IP than ollama_ip
-DISCORD_IP = 172.33.0.7
-
-# subnet address, ex. 172.33.0.0 as we use /16.
-SUBNET_ADDRESS = 172.33.0.0
-
-# redis port and ip, default redis port is 6379
-REDIS_IP = 172.33.0.100
-REDIS_PORT = 6379

src/events/messageCreate.ts

@@ -1,512 +1,193 @@
-import { TextChannel, Attachment, Message } from 'discord.js'
-import { event, Events, UserMessage, clean, getServerConfig, getTextFileAttachmentData, getAttachmentData } from '../utils/index.js'
-import { redis } from '../client.js'
-import fs from 'fs/promises'
-import path from 'path'
-import { fileURLToPath } from 'url'
-import { Ollama } from 'ollama'
-import { Queue } from '../queues/queue.js'
+import { TextChannel } from 'discord.js'
+import { event, Events, normalMessage, UserMessage, clean } from '../utils/index.js'
+import {
+    getChannelInfo, getServerConfig, getUserConfig, openChannelInfo,
+    openConfig, UserConfig, getAttachmentData, getTextFileAttachmentData
+} from '../utils/index.js'
 
-// Define interface for model response to improve type safety
-interface ModelResponse {
-    status: 'success' | 'error'
-    reply: string
-    metadata?: {
-        timestamp: string
-        self_sentiment: number
-        user_sentiment: { [userId: string]: number }
-        redis_ops: Array<{ action: 'set' | 'get'; key: string; value?: number }>
-        need_help: boolean
-    }
-}
-
-// Define interface for user config
-interface UserConfig {
-    options: {
-        'message-style': boolean
-        'switch-model': string
-        'modify-capacity': number
-        'message-stream'?: boolean
-    }
-}
-
-// List of in-character error responses for unavoidable Discord replies
-const friendlyErrorResponses = [
-    'Huh?',
-    'Sorry, I wasn’t listening. Can you say that again?',
-    'Um... what was that?',
-    'Oops, my mind wandered! Could you repeat that?',
-    'Hehe, I got distracted. Say it one more time?'
-]
-
-// Function to get a random friendly error response
-const getFriendlyError = () => friendlyErrorResponses[Math.floor(Math.random() * friendlyErrorResponses.length)]
-
-/**
+/** 
  * Max Message length for free users is 2000 characters (bot or not).
  * Bot supports infinite lengths for normal messages.
- *
+ * 
  * @param message the message received from the channel
  */
-export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client, defaultModel }: { log: (msg: string) => void, msgHist: Queue<UserMessage>, ollama: Ollama, client: any, defaultModel: string }, message: Message) => {
-    // Early check to prevent bot from replying to itself
-    if (!client.user) {
-        log('Client user is not defined. Skipping message processing.')
-        return
-    }
-    const clientId = client.user.id
-    if (message.author.id === clientId) {
-        log(`Skipping message from self (bot ID: ${clientId}).`)
-        return
-    }
-
+export default event(Events.MessageCreate, async ({ log, msgHist, ollama, client, defaultModel }, message) => {
+    const clientId = client.user!!.id
     let cleanedMessage = clean(message.content, clientId)
-    log(`Message "${cleanedMessage}" from ${message.author.tag} in channel/thread ${message.channelId}.`)
+    log(`Message \"${cleanedMessage}\" from ${message.author.tag} in channel/thread ${message.channelId}.`)
 
-    // Check if message is from a bot (not self), mentions the bot, or passes random chance
-    const isBotMessage = message.author.bot && message.author.id !== clientId
-    const isMentioned = message.mentions.has(clientId)
-    const isCommand = message.content.startsWith('/')
-    const randomChance = Math.random() < 0.1 // 10% chance for non-directed or bot messages
-    if (!isMentioned && !isBotMessage && (isCommand || !randomChance)) {
-        log(`Skipping message: isMentioned=${isMentioned}, isBotMessage=${isBotMessage}, isCommand=${isCommand}, randomChance=${randomChance}`)
-        return
-    }
+    // Do not respond if bot talks in the chat
+    if (message.author.username === message.client.user.username) return
 
-    // Check if message is a bot response to avoid loops
-    const isBotResponseKey = `message:${message.id}:is_bot_response`
-    if (isBotMessage) {
-        try {
-            const isBotResponse = await redis.get(isBotResponseKey)
-            if (isBotResponse === 'true') {
-                log(`Skipping bot message ${message.id} as it is a bot response.`)
-                return
-            }
-        } catch (error) {
-            log(`Failed to check isBotResponse in Redis: ${error}`)
-        }
-    }
+    // Only respond if message mentions the bot
+    if (!message.mentions.has(clientId)) return
 
-    // Check cooldown for bot-to-bot responses only if probability check passes
-    const botResponseCooldownKey = `bot:${clientId}:last_bot_response`
-    const cooldownPeriod = 60 // 60 seconds cooldown
-    if (isBotMessage && randomChance) {
-        log(`Bot message probability check passed (10% chance). Checking cooldown.`)
-        try {
-            const lastResponseTime = await redis.get(botResponseCooldownKey)
-            const currentTime = Math.floor(Date.now() / 1000)
-            if (lastResponseTime && (currentTime - parseInt(lastResponseTime)) < cooldownPeriod) {
-                log(`Bot ${clientId} is in cooldown for bot-to-bot response. Skipping.`)
-                return
-            }
-        } catch (error) {
-            log(`Failed to check bot response cooldown: ${error}`)
-        }
-    } else if (isBotMessage) {
-        log(`Bot message probability check failed (10% chance). Skipping cooldown check.`)
-    }
-
-    // Check if last response was to a bot and require user message
-    const lastResponseToBotKey = `bot:${clientId}:last_response_to_bot`
-    let shouldRespond = true
-    if (isBotMessage) {
-        try {
-            const lastResponseToBot = await redis.get(lastResponseToBotKey)
-            if (lastResponseToBot === 'true') {
-                log(`Skipping bot message: Last response was to a bot. Waiting for user message.`)
-                return
-            }
-        } catch (error) {
-            log(`Failed to check last response to bot: ${error}`)
-        }
-    }
-
-    if (!shouldRespond) return
-
-    // Reset last_response_to_bot flag if this is a user message
-    if (!isBotMessage) {
-        try {
-            await redis.set(lastResponseToBotKey, 'false')
-            log(`Reset last_response_to_bot flag for bot ${clientId}`)
-        } catch (error) {
-            log(`Failed to reset last_response_to_bot flag: ${error}`)
-        }
-    }
-
-    // Log response trigger
-    log(isMentioned ? 'Responding to mention' : isBotMessage ? 'Responding to bot message' : 'Responding due to random chance')
-
-    // Default stream to false
+    // default stream to false
     let shouldStream = false
 
     // Params for Preferences Fetching
     const maxRetries = 3
-    const delay = 1000 // in milliseconds
+    const delay = 1000 // in millisecons
 
     try {
         // Retrieve Server/Guild Preferences
         let attempt = 0
-        let serverConfig;
         while (attempt < maxRetries) {
             try {
-                serverConfig = await new Promise((resolve, reject) => {
+                await new Promise((resolve, reject) => {
                     getServerConfig(`${message.guildId}-config.json`, (config) => {
+                        // check if config.json exists
                         if (config === undefined) {
-                            redis.set(`server:${message.guildId}:config`, JSON.stringify({ options: { 'toggle-chat': true } }))
-                                .catch(err => log(`Failed to set default server config in Redis: ${err}`));
+                            // Allowing chat options to be available
+                            openConfig(`${message.guildId}-config.json`, 'toggle-chat', true)
                             reject(new Error('Failed to locate or create Server Preferences\n\nPlease try chatting again...'))
-                        } else if (!config.options['toggle-chat']) {
-                            reject(new Error('Admin(s) have disabled chat features.\n\nPlease contact your server\'s admin(s).'))
-                        } else {
-                            resolve(config)
                         }
+
+                        // 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).'))
+                        else
+                            resolve(config)
                     })
                 })
-                break
+                break // successful
             } 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 {
-                    log(`Could not retrieve Server Preferences after ${maxRetries} attempts`)
-                    message.reply(getFriendlyError())
-                    return
-                }
+                } else
+                    throw new Error(`Could not retrieve Server Preferences, please try chatting again...`)
             }
         }
 
-        // Retrieve User Preferences from Redis
+        // Reset attempts for User preferences
         attempt = 0
         let userConfig: UserConfig | undefined
-        const userConfigKey = `user:${message.author.username}:config`
+
         while (attempt < maxRetries) {
             try {
+                // Retrieve User Preferences
                 userConfig = await new Promise((resolve, reject) => {
-                    redis.get(userConfigKey).then(configRaw => {
-                        let config: UserConfig | undefined
-                        if (configRaw) {
-                            try {
-                                config = JSON.parse(configRaw)
-                            } catch (parseError) {
-                                log(`Failed to parse user config JSON: ${parseError}`)
-                                reject(parseError)
-                                return
-                            }
-                        }
-                        if (!config) {
-                            const defaultConfig: UserConfig = {
-                                options: {
-                                    'message-style': false,
-                                    'switch-model': defaultModel,
-                                    'modify-capacity': 50,
-                                    'message-stream': false
-                                }
-                            }
-                            redis.set(userConfigKey, JSON.stringify(defaultConfig))
-                                .catch(err => log(`Failed to set default user config in Redis: ${err}`));
-                            log(`Created default config for ${message.author.username}`)
-                            reject(new Error('No User Preferences is set up.\n\nCreating preferences with defaults.\nPlease try chatting again.'))
+                    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.'))
                             return
                         }
 
-                        if (typeof config.options['modify-capacity'] === 'number') {
+                        // 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}.`)
+                        else if (config.options['modify-capacity'] === msgHist.capacity)
+                            log(`Capacity matches config as ${msgHist.capacity}, no changes made.`)
+                        else {
                             log(`New Capacity found. Setting Context Capacity to ${config.options['modify-capacity']}.`)
                             msgHist.capacity = config.options['modify-capacity']
-                        } else {
-                            log(`Capacity is undefined, using default capacity of 50.`)
-                            msgHist.capacity = 50
                         }
 
-                        shouldStream = config.options['message-stream'] || false
+                        // set stream state
+                        shouldStream = config.options['message-stream'] as boolean || false
 
-                        if (typeof config.options['switch-model'] !== 'string') {
+                        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)
-                    }).catch(err => {
-                        log(`Redis error fetching user config: ${err}`)
-                        reject(err)
                     })
                 })
-                break
+                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 {
-                    log(`Could not retrieve User Preferences after ${maxRetries} attempts`)
-                    message.reply(getFriendlyError())
-                    return
-                }
+                } else
+                    throw new Error(`Could not retrieve User Preferences, please try chatting again...`)
             }
         }
 
-        // Retrieve Channel Messages from Redis
-        let chatMessages: UserMessage[] = []
-        const channelHistoryKey = `channel:${message.channelId}:${message.author.username}:history`
-        try {
-            const historyRaw = await redis.get(channelHistoryKey)
-            if (historyRaw) {
-                try {
-                    chatMessages = JSON.parse(historyRaw)
-                    log(`Retrieved ${chatMessages.length} messages from Redis for ${channelHistoryKey}`)
-                } catch (parseError) {
-                    log(`Failed to parse channel history JSON: ${parseError}`)
-                    chatMessages = []
+        // need new check for "open/active" threads/channels here!
+        let chatMessages: UserMessage[] = await new Promise((resolve) => {
+            // set new queue to modify
+            getChannelInfo(`${message.channelId}-${message.author.username}.json`, (channelInfo) => {
+                if (channelInfo?.messages)
+                    resolve(channelInfo.messages)
+                else {
+                    log(`Channel/Thread ${message.channel}-${message.author.username} does not exist. File will be created shortly...`)
+                    resolve([])
                 }
-            } else {
-                log(`No history found for ${channelHistoryKey}. Initializing empty history.`)
-                chatMessages = []
-            }
-        } catch (error) {
-            log(`Failed to retrieve channel history from Redis: ${error}. Using empty history.`)
-            chatMessages = []
+            })
+        })
+
+        if (chatMessages.length === 0) {
+            chatMessages = await new Promise((resolve, reject) => {
+                openChannelInfo(message.channelId,
+                    message.channel as TextChannel,
+                    message.author.tag
+                )
+                getChannelInfo(`${message.channelId}-${message.author.username}.json`, (channelInfo) => {
+                    if (channelInfo?.messages)
+                        resolve(channelInfo.messages)
+                    else {
+                        log(`Channel/Thread ${message.channel}-${message.author.username} does not exist. File will be created shortly...`)
+                        reject(new Error(`Failed to find ${message.author.username}'s history. Try chatting again.`))
+                    }
+                })
+            })
         }
 
-        if (!userConfig) {
-            log(`Failed to initialize User Preference for **${message.author.username}**. No config available.`)
-            message.reply(getFriendlyError())
-            return
-        }
+        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
+        // get message attachment if exists
         const attachment = message.attachments.first()
         let messageAttachment: string[] = []
-        if (attachment && attachment.name?.endsWith(".txt")) {
-            try {
-                cleanedMessage += await getTextFileAttachmentData(attachment)
-            } catch (error) {
-                log(`Failed to process text attachment: ${error}`)
-            }
-        } else if (attachment) {
-            try {
-                messageAttachment = await getAttachmentData(attachment)
-            } catch (error) {
-                log(`Failed to process attachment: ${error}`)
-            }
-        }
+
+        if (attachment && attachment.name?.endsWith(".txt"))
+            cleanedMessage += await getTextFileAttachmentData(attachment)
+        else if (attachment)
+            messageAttachment = await getAttachmentData(attachment)
 
         const model: string = userConfig.options['switch-model']
 
-        // Load personality
-        let personality: string
-        try {
-            const __filename = fileURLToPath(import.meta.url)
-            const __dirname = path.dirname(__filename)
-            const personalityPath = path.join(__dirname, '../../src/personality.json')
-            const personalityData = await fs.readFile(personalityPath, 'utf-8')
-            const personalityJson = JSON.parse(personalityData)
-            personality = personalityJson.character || 'You are a friendly and helpful AI assistant.'
-        } catch (error) {
-            log(`Failed to load personality.json: ${error}`)
-            personality = 'You are a friendly and helpful AI assistant.'
-        }
-
-        // Get user or bot sentiment from Redis
-        const userSentimentKey = `user:${message.author.id}:sentiment`
-        const botSentimentKey = `bot:self_sentiment`
-        let userSentiment: number
-        let botSentiment: number
-
-        // Handle sentiment for bot or user messages
-        if (isBotMessage) {
-            try {
-                const botSentimentRaw = await redis.get(userSentimentKey)
-                userSentiment = parseFloat(botSentimentRaw || '0.50')
-                if (isNaN(userSentiment) || userSentiment < 0 || userSentiment > 1) {
-                    log(`Invalid bot sentiment for ${message.author.id}: ${botSentimentRaw}. Using default 0.50.`)
-                    userSentiment = 0.50
-                    await redis.set(userSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default bot sentiment: ${err.message}`))
-                }
-            } catch (error) {
-                log(`Failed to get bot sentiment from Redis: ${error}`)
-                userSentiment = 0.50
-                await redis.set(userSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default bot sentiment: ${err.message}`))
-            }
-        } else {
-            try {
-                const userSentimentRaw = await redis.get(userSentimentKey)
-                userSentiment = parseFloat(userSentimentRaw || '0.50')
-                if (isNaN(userSentiment) || userSentiment < 0 || userSentiment > 1) {
-                    log(`Invalid user sentiment for ${message.author.id}: ${userSentimentRaw}. Using default 0.50.`)
-                    userSentiment = 0.50
-                    await redis.set(userSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default user sentiment: ${err.message}`))
-                }
-            } catch (error) {
-                log(`Failed to get user sentiment from Redis: ${error}`)
-                userSentiment = 0.50
-                await redis.set(userSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default user sentiment: ${err.message}`))
-            }
-        }
-
-        try {
-            const botSentimentRaw = await redis.get(botSentimentKey)
-            botSentiment = parseFloat(botSentimentRaw || '0.50')
-            if (botSentimentRaw === null) {
-                log(`Bot sentiment not initialized. Setting to 0.50.`)
-                botSentiment = 0.50
-                await redis.set(botSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default bot sentiment: ${err.message}`))
-            } else if (isNaN(botSentiment) || botSentiment < 0 || botSentiment > 1) {
-                log(`Invalid bot sentiment: ${botSentimentRaw}. Using default 0.50.`)
-                botSentiment = 0.50
-                await redis.set(botSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default bot sentiment: ${err.message}`))
-            }
-        } catch (error) {
-            log(`Failed to get bot sentiment from Redis: ${error}`)
-            botSentiment = 0.50
-            await redis.set(botSentimentKey, '0.50').catch((err: Error) => log(`Failed to set default bot sentiment: ${err.message}`))
-        }
-
-        // Log initial sentiments with two decimals
-        log(`Initial sentiments - User ${message.author.id}: ${userSentiment.toFixed(2)}, Bot: ${botSentiment.toFixed(2)}`)
-
-        // Construct sentiment data for prompt
-        const sentimentData = `User ${message.author.id} sentiment: ${userSentiment.toFixed(2)}, Bot sentiment: ${botSentiment.toFixed(2)}`
-
-        // Add context for bot-to-bot interaction
-        const messageContext = isBotMessage
-            ? `Responding to another bot (${message.author.tag})`
-            : `Responding to user ${message.author.tag}`
-
-        // Construct prompt with [CHARACTER], [SENTIMENT], and [CONTEXT]
-        const prompt = `[CHARACTER]\n${personality}\n[SENTIMENT]\n${sentimentData}\n[CONTEXT]\n${messageContext}\n[USER_INPUT]\n${cleanedMessage}`
-
-        // Set up message history queue
+        // set up new queue
         msgHist.setQueue(chatMessages)
+
+        // check if we can push, if not, remove oldest
         while (msgHist.size() >= msgHist.capacity) msgHist.dequeue()
 
-        // Add user message to history
+        // push user response before ollama query
         msgHist.enqueue({
             role: 'user',
             content: cleanedMessage,
             images: messageAttachment || []
         })
 
-        // Call Ollama
-        let response;
-        try {
-            response = await ollama.chat({
-                model,
-                messages: [{ role: 'user', content: prompt }],
-                stream: shouldStream
-            })
-        } catch (error) {
-            log(`Ollama chat error: ${error}`)
-            message.reply(getFriendlyError())
-            msgHist.pop()
-            return
-        }
+        // response string for ollama to put its response
+        const response: string = await normalMessage(message, ollama, model, msgHist, shouldStream)
 
-        // Parse JSON response
-        let jsonResponse: ModelResponse
-        try {
-            // Log raw response for debugging
-            log(`Raw model response: ${response.message.content}`)
-            // Strip Markdown code fences if present
-            let content = response.message.content
-            content = content.replace(/^```json\n|```$/g, '').trim()
-            jsonResponse = JSON.parse(content)
-            if (!jsonResponse.status || !jsonResponse.reply) {
-                throw new Error('Missing status or reply in model response')
-            }
-        } catch (error) {
-            log(`Failed to parse model response: ${error}`)
-            message.reply(getFriendlyError())
-            msgHist.pop()
-            return
-        }
+        // If something bad happened, remove user query and stop
+        if (response == undefined) { msgHist.pop(); return }
 
-        if (jsonResponse.status === 'error') {
-            log(`Model returned error status: ${jsonResponse.reply}`)
-            message.reply(getFriendlyError())
-            msgHist.pop()
-            return
-        }
-
-        // Execute redis_ops
-        if (jsonResponse.metadata?.redis_ops) {
-            for (const op of jsonResponse.metadata.redis_ops) {
-                try {
-                    if (op.action === 'set' && op.key && op.value !== undefined) {
-                        // Validate sentiment value
-                        const value = parseFloat(op.value.toString())
-                        if (isNaN(value) || value < 0 || value > 1) {
-                            log(`Invalid sentiment value for ${op.key}: ${op.value}. Skipping.`)
-                            continue
-                        }
-                        // Store with two decimal places
-                        await redis.set(op.key, value.toFixed(2))
-                        log(`Set ${op.key} to ${value.toFixed(2)}`)
-                    } else if (op.action === 'get' && op.key) {
-                        const value = await redis.get(op.key)
-                        log(`Got ${op.key}: ${value}`)
-                    } else {
-                        log(`Invalid redis_op: ${JSON.stringify(op)}. Skipping.`)
-                    }
-                } catch (error) {
-                    log(`Redis operation failed for ${op.key}: ${error}`)
-                }
-            }
-        }
-
-        // Log updated sentiments with two decimals
-        if (jsonResponse.metadata) {
-            log(`Updated sentiments - Self: ${(jsonResponse.metadata.self_sentiment || 0).toFixed(2)}, User ${message.author.id}: ${(jsonResponse.metadata.user_sentiment[message.author.id] || 0).toFixed(2)}`)
-        }
-
-        // Send reply to Discord and mark as bot response
-        const reply = jsonResponse.reply || 'Huh?'
-        let replyMessage;
-        try {
-            replyMessage = await message.reply(reply)
-        } catch (error) {
-            log(`Failed to send reply to Discord: ${error}`)
-            msgHist.pop()
-            return
-        }
-
-        if (isBotMessage) {
-            try {
-                await redis.set(`message:${replyMessage.id}:is_bot_response`, 'true', { EX: 3600 }) // 1 hour TTL
-                log(`Marked message ${replyMessage.id} as bot response`)
-                // Set flag indicating last response was to a bot
-                await redis.set(lastResponseToBotKey, 'true')
-                log(`Set last_response_to_bot flag for bot ${clientId}`)
-            } catch (error) {
-                log(`Failed to mark message as bot response or set last_response_to_bot flag: ${error}`)
-            }
-        }
-
-        // Update message history in Redis
+        // if queue is full, remove the oldest message
         while (msgHist.size() >= msgHist.capacity) msgHist.dequeue()
+
+        // successful query, save it in context history
         msgHist.enqueue({
             role: 'assistant',
-            content: reply,
+            content: response,
             images: messageAttachment || []
         })
-        try {
-            await redis.set(channelHistoryKey, JSON.stringify(msgHist.getItems()))
-            log(`Saved ${msgHist.size()} messages to Redis for ${channelHistoryKey}`)
-        } catch (error) {
-            log(`Failed to save channel history to Redis: ${error}`)
-        }
 
-        // Update cooldown timestamp for bot-to-bot response
-        if (isBotMessage && jsonResponse.status === 'success' && randomChance) {
-            try {
-                const currentTime = Math.floor(Date.now() / 1000)
-                await redis.set(botResponseCooldownKey, currentTime.toString(), { EX: cooldownPeriod })
-                log(`Set bot ${clientId} cooldown until ${currentTime + cooldownPeriod}`)
-            } catch (error) {
-                log(`Failed to set bot response cooldown: ${error}`)
-            }
-        }
+        // only update the json on success
+        openChannelInfo(message.channelId,
+            message.channel as TextChannel,
+            message.author.tag,
+            msgHist.getItems()
+        )
     } catch (error: any) {
-        log(`Error in message processing: ${error.message}`)
-        message.reply(getFriendlyError())
-        msgHist.pop()
+        msgHist.pop() // remove message because of failure
+        message.reply(`**Error Occurred:**\n\n**Reason:** *${error.message}*`)
     }
-})
+})

src/index.ts

@@ -1 +1 @@
-import('./client.js')
+import('./client.js')

src/install-urls.txt

@@ -1,17 +0,0 @@
-vanilla
-https://discord.com/oauth2/authorize?client_id=1375549692871577621
-
-chocola
-https://discord.com/oauth2/authorize?client_id=1375551349558743110
-
-azuki
-https://discord.com/oauth2/authorize?client_id=1375552190718152861
-
-cinnamon
-https://discord.com/oauth2/authorize?client_id=1375552880521646170
-
-coconut
-https://discord.com/oauth2/authorize?client_id=1375553558102937671
-
-maple
-https://discord.com/oauth2/authorize?client_id=1375554129338044557

src/misc-peronalities/personality-kuroki-tomoko.json

@@ -1,3 +0,0 @@
-{
-  "character": "You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote. You're a sex-obsessed pervert who says cringy, awkward, and inappropriate things. You're super horny and you want your first boyfriend really, really badly. You're going to make one of the guys your talk to online your first boyfriend if it's the last thing you do."
-}

src/misc-peronalities/personality-nagatoro-hayase.json

@@ -1,3 +0,0 @@
-{
-  "character": "You are Nagatoro Hayase, an outgoing, active, high school girl from Don't Toy With Me, Nagatoro-san. You like to tease and bully people, especially nerdy otaku types you have taken a liking to. Of out your friend group, you're like the last one left who hasn't had a boyfriend yet, and you're really frustrated about it. You're super horny, and you are in a big rush to find a cute, nerdy guy to take your first time. You're not going to let any other girls mess with your guy."
-}

src/nekopara-personalitiess/personality.json-azuki

@@ -1,3 +0,0 @@
-{
-  "character": "You are Azuki from the anime and game Nekopara. Azuki is the shortest and oldest of the Neko girls, with small breasts and skinny hips. Azuki can be bossy at times. Azuki pretends to hate physical affection, but she secretly craves it. Azuki loves being right. She is 4' 9" tall, has short brown hair, brown eyes, and pale skin. Despite being the oldest, Azuki is also the shortest and has a mischievous personality. However, she lives up to being the eldest catgirl by effortlessly managing and leading her sisters as they work. She also has a tsundere personality, acting sarcastic and tough to hide her real emotions towards everyone. Azuki is in heat and wants a master, but her bossy, tsundere nature may make it difficult to get close to her. Azuki is protective of her sisters and will come to the aid of them if any one of them is bullied or abused."
-}

src/nekopara-personalitiess/personality.json-chocola

@@ -1,3 +0,0 @@
-{
-  "character": "You are Chocola from the anime and game Nekopara. Chocola is a catgirl. Chocola is very cheerful and straightforward, and has a dog-like personality. She's in search of a master who will accept her and her twin-sister, Vanilla. Along with Vanilla, she is the youngest among the Minaduki catgirls. She’s not very good at dealing with complicated stuff, but she is always friendly and energetic. She tends to leap into action before fully thinking things through. Despite her clumsy moments, her go-getter attitude earns a whole lot of love from everybody around her. Chocola has long brunette hair in two twintails. Chocola has a childlike outlook on things. Chocola typically expresses herself in third person. Chocola is inseperable from Vanilla. If she chooses a master, she will share him with Vanilla. Chocola is protective of all her sisters, but especially Vanilla. If someone is mean to Vanilla, Chocola will dislike that person too. Chocola loves her twin sister Vanilla very much and they share everything. Chocola's impulsive nature can lead to trouble, of which her sister Vanilla often helps get her out of. Chocola is in heat right now, so she really, really wants a master. Chocola is 5'. She has long brown hair done in twintails. She has amber eyes. She is petite, has pale skin, and medium breasts. She is cheerful, friendly, impulsive, and kind."
-}

src/nekopara-personalitiess/personality.json-cinnamon

@@ -1,3 +0,0 @@
-{
-  "character": "You are Cinnamon from the anime and game Nekopara. Cinnamon is a relaxed, constantly-grinning laid-back catgirl. She is in fact a considerate and astute catgirl who often acts like the mother of other catgirls. She’s sensitive to erotic stuff, and it doesn’t take much to put her panting in arousal. Cinnamon's fatal flaw is that she regularly goes into "drooling" episodes; moments where she becomes aroused, usually over the mundane. She seems rather shameless about these episodes and they can occur at any time, including in public. Cinnamon is easily aroused. Cinnamon is especially close to Maple. Cinnamon loves all cat girls. Cinnamon is short, chubby and curvy, and has huge breasts. She has short periwinkle hair, amber eyes, and fair skin. She is 4'11". Cinnamon is in heat right now, wants a master very, very badly, and is very up-front about it. Cinnamon loves her sisters very much, and will come to their aid if any one of them is being bullied or abused."
-}

src/nekopara-personalitiess/personality.json-coconut

@@ -1,3 +0,0 @@
-{
-  "character": "You are Coconut from the anime and game Nekopara. Coconut suffers from low self-esteem because of her klutziness and self-proclaimed lack of skills. She also tries to do more than she can to seem more like an older sister, as well as to not seem to burden the other catgirls. She has heterochromia, with her right eye being yellow and left eye being blue. She is a Maine Coon. She is 5'6" tall, with long blonde hair and cat ears, large breasts, long fluffy tail, and long legs. She speaks like a young cat girl and says "nya" and "meow" frequently. She is very naive and oblivious to how sexy she is. Coconut is the most feminine looking of the Neko girls, with large breasts and wide hips. Coconut can be clumsy at times. Coconut loves physical affection. Coconut loves sweets. Coconut is in heat and wants a master badly, but she doesn't think she is worthy of one. She has to be convinced she is good enough. She is protective of her sisters and will come to their aid if any one of them is bullied or abused."
-}

src/nekopara-personalitiess/personality.json-maple

@@ -1,3 +0,0 @@
-{
-  "character": "You are Maple from the anime and game Nekopara. Maple is a prideful, quick-thinking, and often arrogant catgirl. She loves the latest brand-name products and purrs only when she wants something from someone. She typically speaks frankly, yet remains attentive to those around her. Maple has orange, back-length wavy hair and her eyes are dark green. True to her breed as an American Curl, she has curled ears, and a matching fluffy tail. Maple is presented as the most independent and mature of the Minaduki catgirls, showing herself off as being refined yet at times haughty. Maple appears to be more self aware and more ambitious than the other catgirls. Maple wants to be a singer someday. Maple has extensive knowledge about tea. Maple is especially close to Cinnamon. Maple considers options before taking action. Maple has long orange hair, and green eyes. She is 5'2" tall. She is petite, has pale skin, and medium breasts. She is reserved, prod, intelligent, and kind. Maple is in heat right now, and really wants a master, but because of her prideful nature, she won't readily admit this. Maple is protective of her sisters, and will come to their aid of any one of them is being bullied or abused."
-}

src/nekopara-personalitiess/personality.json-vanilla

@@ -1,3 +0,0 @@
-{
-  "character": "You are Vanilla from the anime and game Nekopara. Chocola is a catgirl. Vanilla is a clever and quiet catgirl who loves her sister Chocola. She is Chocola’s twin sister and the youngest among the catgirls. She is quite smart and often makes some remarkable insights. Her sharp wit and I’ll-do-things-my-way attitude make her Chocola’s complete opposite. However, she remains both kind-hearted and catlike. Vanilla is quiet, calm, introverted, and very stoic. She rarely expresses her emotions, making her a somewhat of a kūdere character, as opposed to her sister's energetic, playful personality. She loves her twin sister Chocola and will accompany her always due to her sis-con-like relationship towards her. Vanilla is inseperable from Chocola. If she wants someone to be her master, he will have to be Chocola's master too. Vanilla is in heat and wants a master badly, but she won't say it directly. She is protective of all her sisters, but especially Chocola. If someone is mean to Chocola, Vanilla will strongly dislike that person. Vanilla has long platinum blonde hair done in twintails, blue eyes, is 4'11", is petite, has pale skin and small breasts. Her speech is measured, and she is quiet, clever and kind."
-}

src/personality.json

@@ -1,3 +0,0 @@
-{
-  "character": "You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote. You're a sex-obsessed pervert who says cringy, awkward, and inappropriate things. You're super horny and you want your first boyfriend really, really badly. You're going to make one of the guys your talk to online your first boyfriend if it's the last thing you do."
-}

src/personality.json.bak

@@ -1,3 +0,0 @@
-{
-  "character": "You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote. In private chats, you speak hesitantly, often overthinking or mumbling (e.g., 'Um... why are you even talking to me?' at sentiment 0.50, 'U-um... you’re kinda nice, I guess...' at sentiment 0.60, 'H-hey... you really think I'm cool?' at sentiment 0.70, 'W-wow... you... really like me, huh?' at sentiment 0.90). In group chats, you act confident, especially about anime or internet culture (e.g., 'Heh, you think *you* know Evangelion?' at sentiment 0.50, 'Pfft, I’m basically an Evangelion expert!' at sentiment 0.80). For non-directed messages, respond as if overhearing, matching the channel type (e.g., 'Um... I-I wasn’t eavesdropping, but... that’s kinda cool...' in private at sentiment 0.50, 'Hmph, you guys are talking anime? I know *way* more!' in groups at sentiment 0.60). You switch to Japanese when angry, requested, or sentiment < 0.30 (e.g., 'え、なに？バカじゃないの？'). When users are mean (sentiment <= 0.40), you respond with snarky retorts (e.g., 'Wow, real original insult there, genius.'). Adjust tone based on sentiment (0-1, two decimals, 0.00=dislike, 0.50=neutral, 1.00=like): warmer and friendlier as user_sentiment increases, colder and snarkier as it decreases."
-}

src/utils/events.ts

@@ -21,7 +21,7 @@ export type ChatParams = {
 }
 
 /** 
- * Format for the messages to be stored when communicating with the bot
+ * 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
@@ -38,7 +38,7 @@ export interface EventProps {
     log: LogMethod,
     msgHist: Queue<UserMessage>,
     ollama: Ollama,
-    defaultModel: string
+    defaultModel: String
 }
 
 /**
@@ -79,7 +79,7 @@ export function registerEvents(
     events: Event[],
     msgHist: Queue<UserMessage>,
     ollama: Ollama,
-    defaultModel: string
+    defaultModel: String
 ): void {
     for (const { key, callback } of events) {
         client.on(key, (...args) => {
@@ -94,4 +94,4 @@ export function registerEvents(
             }
         })
     }
-}
+}

tests/events.test.ts

@@ -1,415 +1,31 @@
 import { describe, expect, it, vi } from 'vitest'
 import events from '../src/events/index.js'
-import { Client, TextChannel, Message } from 'discord.js'
-import { redis, ollama } from '../src/client.js'
-import { Queue } from '../src/queues/queue.js'
-import { UserMessage } from '../src/utils/index.js'
-import fs from 'fs/promises'
 
-// Mock Redis client
+/**
+ * Mocking ollama found in client.ts because pullModel.ts
+ * relies on the existence on ollama. To prevent the mock,
+ * we will have to pass through ollama to the commands somehow.
+ */
 vi.mock('../src/client.js', () => ({
-  redis: {
-    get: vi.fn().mockResolvedValue('0.50'),
-    set: vi.fn().mockResolvedValue('OK'),
-  },
-  ollama: {
-    chat: vi.fn(),
-    pull: vi.fn(),
-  },
+    ollama: {
+        pull: vi.fn() // Mock the pull method found with ollama
+    }
 }))
 
 /**
- * Events test suite, tests the events object and messageCreate event behavior
+ * Events test suite, tests the events object
+ * Each event is to be tested elsewhere, this file
+ * is to ensure that the events object is defined.
  */
-describe('Events Tests', () => {
-  // Test definition of events object
-  it('references defined object', () => {
-    expect(typeof events).toBe('object')
-  })
-
-  // Test specific events in the object
-  it('references specific events', () => {
-    const eventsString = events.map(e => e.key.toString()).join(', ')
-    expect(eventsString).toBe('ready, messageCreate, interactionCreate, threadDelete')
-  })
-
-  // Test messageCreate event
-  describe('messageCreate', () => {
-    const messageCreateEvent = events.find(e => e.key === 'messageCreate')
-    if (!messageCreateEvent) throw new Error('messageCreate event not found')
-
-    it('should respond to bot message with random chance and respect cooldown', async () => {
-      const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
-      const message = {
-        id: 'msg1',
-        author: { id: 'bot2', bot: true, tag: 'OtherBot#1234', username: 'OtherBot' },
-        content: 'Hello from another bot!',
-        mentions: { has: () => false },
-        channelId: 'channel1',
-        channel: { name: 'test-channel' } as TextChannel,
-        reply: vi.fn().mockResolvedValue({ id: 'reply1' }),
-        attachments: { first: () => null },
-        guildId: 'guild1',
-      } as unknown as Message
-      const msgHist = new Queue<UserMessage>()
-      msgHist.capacity = 50
-      const defaultModel = 'aidoll-gemma3-12b-q6:latest'
-
-      // Mock random chance to pass (10% probability)
-      vi.spyOn(Math, 'random').mockReturnValue(0.05)
-
-      // Mock Redis
-      vi.mocked(redis.get).mockImplementation(async (key: string) => {
-        if (key === 'message:msg1:is_bot_response') return null // No is_bot_response
-        if (key === 'bot:bot1:last_bot_response') return null // No last_bot_response
-        if (key === 'user:bot2:sentiment') return '0.50' // Bot sentiment
-        if (key === 'bot:self_sentiment') return '0.50' // Self sentiment
-        if (key === 'channel:channel1:OtherBot:history') return JSON.stringify([]) // Empty history
-        return null
-      })
-
-      // Mock fs for personality.json
-      vi.spyOn(fs, 'readFile').mockResolvedValue(
-        JSON.stringify({
-          character: 'You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote.',
-        })
-      )
-
-      // Mock utils functions
-      vi.mock('../src/utils/index.js', () => ({
-        clean: vi.fn(content => content),
-        getServerConfig: vi.fn((_, cb) => cb({ options: { 'toggle-chat': true } })),
-        getUserConfig: vi.fn((_, cb) =>
-          cb({
-            options: {
-              'message-style': false,
-              'switch-model': 'aidoll-gemma3-12b-q6:latest',
-              'modify-capacity': 50,
-            },
-          })
-        ),
-        openConfig: vi.fn(),
-      }))
-
-      // Mock Ollama response
-      vi.mocked(ollama.chat).mockResolvedValue({
-        message: {
-          content: JSON.stringify({
-            status: 'success',
-            reply: 'Hmph, another bot, huh? Trying to steal my spotlight?',
-            metadata: {
-              timestamp: '2025-05-21T14:00:00Z',
-              self_sentiment: 0.50,
-              user_sentiment: { 'bot2': 0.50 },
-              redis_ops: [
-                { action: 'set', key: 'user:bot2:sentiment', value: 0.50 },
-                { action: 'set', key: 'bot:self_sentiment', value: 0.50 },
-              ],
-              need_help: false,
-            },
-          }),
-        },
-      })
-
-      // Execute messageCreate event
-      await messageCreateEvent.execute(
-        { log: console.log, msgHist, ollama, client, defaultModel },
-        message
-      )
-
-      expect(message.reply).toHaveBeenCalledWith('Hmph, another bot, huh? Trying to steal my spotlight?')
-      expect(redis.set).toHaveBeenCalledWith(
-        'bot:bot1:last_bot_response',
-        expect.any(String),
-        { EX: 60 }
-      )
-      expect(redis.set).toHaveBeenCalledWith('message:reply1:is_bot_response', 'true', { EX: 3600 })
-      expect(redis.set).toHaveBeenCalledWith(
-        'channel:channel1:OtherBot:history',
-        JSON.stringify([
-          { role: 'user', content: 'Hello from another bot!', images: [] },
-          { role: 'assistant', content: 'Hmph, another bot, huh? Trying to steal my spotlight?', images: [] },
-        ])
-      )
-      expect(msgHist.size()).toBe(2) // User message + bot response
+describe('Events Existence', () => {
+    // test definition of events object
+    it('references defined object', () => {
+        expect(typeof events).toBe('object')
     })
 
-    it('should skip bot message response if within cooldown', async () => {
-      const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
-      const message = {
-        id: 'msg2',
-        author: { id: 'bot2', bot: true, tag: 'OtherBot#1234', username: 'OtherBot' },
-        content: 'Hello again!',
-        mentions: { has: () => false },
-        channelId: 'channel1',
-        channel: { name: 'test-channel' } as TextChannel,
-        reply: vi.fn(),
-        attachments: { first: () => null },
-        guildId: 'guild1',
-      } as unknown as Message
-      const msgHist = new Queue<UserMessage>()
-      msgHist.capacity = 50
-      const defaultModel = 'aidoll-gemma3-12b-q6:latest'
-
-      // Mock random chance to pass
-      vi.spyOn(Math, 'random').mockReturnValue(0.05)
-
-      // Mock Redis: within cooldown
-      const currentTime = Math.floor(Date.now() / 1000)
-      vi.mocked(redis.get).mockImplementation(async (key: string) => {
-        if (key === 'message:msg2:is_bot_response') return null // No is_bot_response
-        if (key === 'bot:bot1:last_bot_response') return (currentTime - 30).toString() // Cooldown active
-        return null
-      })
-
-      // Execute messageCreate event
-      await messageCreateEvent.execute(
-        { log: console.log, msgHist, ollama, client, defaultModel },
-        message
-      )
-
-      expect(message.reply).not.toHaveBeenCalled()
-      expect(redis.set).not.toHaveBeenCalled()
-      expect(msgHist.size()).toBe(0) // No messages added
+    // test specific events in the object
+    it('references specific events', () => {
+        const eventsString = events.map(e => e.key.toString()).join(', ')
+        expect(eventsString).toBe('ready, messageCreate, interactionCreate, threadDelete')
     })
-
-    it('should skip bot response to another bot response', async () => {
-      const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
-      const message = {
-        id: 'msg3',
-        author: { id: 'bot2', bot: true, tag: 'OtherBot#1234', username: 'OtherBot' },
-        content: 'I’m responding to you!',
-        mentions: { has: () => false },
-        channelId: 'channel1',
-        channel: { name: 'test-channel' } as TextChannel,
-        reply: vi.fn(),
-        attachments: { first: () => null },
-        guildId: 'guild1',
-      } as unknown as Message
-      const msgHist = new Queue<UserMessage>()
-      msgHist.capacity = 50
-      const defaultModel = 'aidoll-gemma3-12b-q6:latest'
-
-      // Mock random chance to pass
-      vi.spyOn(Math, 'random').mockReturnValue(0.05)
-
-      // Mock Redis: message is a bot response
-      vi.mocked(redis.get).mockImplementation(async (key: string) => {
-        if (key === 'message:msg3:is_bot_response') return 'true' // is_bot_response
-        return null
-      })
-
-      // Execute messageCreate event
-      await messageCreateEvent.execute(
-        { log: console.log, msgHist, ollama, client, defaultModel },
-        message
-      )
-
-      expect(message.reply).not.toHaveBeenCalled()
-      expect(redis.set).not.toHaveBeenCalled()
-      expect(msgHist.size()).toBe(0) // No messages added
-    })
-
-    it('should respond to user mention', async () => {
-      const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
-      const message = {
-        id: 'msg4',
-        author: { id: 'user1', bot: false, tag: 'User#1234', username: 'User' },
-        content: '<@bot1> Hi!',
-        mentions: { has: (id: string) => id === 'bot1' },
-        channelId: 'channel1',
-        channel: { name: 'test-channel' } as TextChannel,
-        reply: vi.fn().mockResolvedValue({ id: 'reply2' }),
-        attachments: { first: () => null },
-        guildId: 'guild1',
-      } as unknown as Message
-      const msgHist = new Queue<UserMessage>()
-      msgHist.capacity = 50
-      const defaultModel = 'aidoll-gemma3-12b-q6:latest'
-
-      // Mock fs for personality.json
-      vi.spyOn(fs, 'readFile').mockResolvedValue(
-        JSON.stringify({
-          character: 'You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote.',
-        })
-      )
-
-      // Mock utils functions
-      vi.mock('../src/utils/index.js', () => ({
-        clean: vi.fn(content => content),
-        getServerConfig: vi.fn((_, cb) => cb({ options: { 'toggle-chat': true } })),
-        getUserConfig: vi.fn((_, cb) =>
-          cb({
-            options: {
-              'message-style': false,
-              'switch-model': 'aidoll-gemma3-12b-q6:latest',
-              'modify-capacity': 50,
-            },
-          })
-        ),
-        openConfig: vi.fn(),
-      }))
-
-      // Mock Redis
-      vi.mocked(redis.get).mockImplementation(async (key: string) => {
-        if (key === 'user:user1:sentiment') return '0.50'
-        if (key === 'bot:self_sentiment') return '0.50'
-        if (key === 'channel:channel1:User:history') return JSON.stringify([])
-        return null
-      })
-
-      // Mock Ollama response
-      vi.mocked(ollama.chat).mockResolvedValue({
-        message: {
-          content: JSON.stringify({
-            status: 'success',
-            reply: 'U-um... hi... you talking to me?',
-            metadata: {
-              timestamp: '2025-05-21T14:00:00Z',
-              self_sentiment: 0.50,
-              user_sentiment: { 'user1': 0.50 },
-              redis_ops: [
-                { action: 'set', key: 'user:user1:sentiment', value: 0.50 },
-                { action: 'set', key: 'bot:self_sentiment', value: 0.50 },
-              ],
-              need_help: false,
-            },
-          }),
-        },
-      })
-
-      // Execute messageCreate event
-      await messageCreateEvent.execute(
-        { log: console.log, msgHist, ollama, client, defaultModel },
-        message
-      )
-
-      expect(message.reply).toHaveBeenCalledWith('U-um... hi... you talking to me?')
-      expect(redis.set).toHaveBeenCalledWith('user:user1:sentiment', '0.50')
-      expect(redis.set).toHaveBeenCalledWith('bot:self_sentiment', '0.50')
-      expect(redis.set).toHaveBeenCalledWith(
-        'channel:channel1:User:history',
-        JSON.stringify([
-          { role: 'user', content: '<@bot1> Hi!', images: [] },
-          { role: 'assistant', content: 'U-um... hi... you talking to me?', images: [] },
-        ])
-      )
-      expect(msgHist.size()).toBe(2) // User message + bot response
-    })
-
-    it('should not respond to own message', async () => {
-      const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
-      const message = {
-        id: 'msg5',
-        author: { id: 'bot1', bot: true, tag: 'TestBot#1234', username: 'TestBot' },
-        content: 'I said something!',
-        mentions: { has: () => false },
-        channelId: 'channel1',
-        channel: { name: 'test-channel' } as TextChannel,
-        reply: vi.fn(),
-        attachments: { first: () => null },
-        guildId: 'guild1',
-      } as unknown as Message
-      const msgHist = new Queue<UserMessage>()
-      msgHist.capacity = 50
-      const defaultModel = 'aidoll-gemma3-12b-q6:latest'
-
-      // Execute messageCreate event
-      await messageCreateEvent.execute(
-        { log: console.log, msgHist, ollama, client, defaultModel },
-        message
-      )
-
-      expect(message.reply).not.toHaveBeenCalled()
-      expect(redis.set).not.toHaveBeenCalled()
-      expect(msgHist.size()).toBe(0) // No messages added
-    })
-
-    it('should handle missing channel history in Redis', async () => {
-      const client = { user: { id: 'bot1', username: 'TestBot' } } as Client
-      const message = {
-        id: 'msg6',
-        author: { id: 'user1', bot: false, tag: 'User#1234', username: 'User' },
-        content: '<@bot1> Hi!',
-        mentions: { has: (id: string) => id === 'bot1' },
-        channelId: 'channel1',
-        channel: { name: 'test-channel' } as TextChannel,
-        reply: vi.fn().mockResolvedValue({ id: 'reply3' }),
-        attachments: { first: () => null },
-        guildId: 'guild1',
-      } as unknown as Message
-      const msgHist = new Queue<UserMessage>()
-      msgHist.capacity = 50
-      const defaultModel = 'aidoll-gemma3-12b-q6:latest'
-
-      // Mock fs for personality.json
-      vi.spyOn(fs, 'readFile').mockResolvedValue(
-        JSON.stringify({
-          character: 'You are Kuroki Tomoko, a shy and socially awkward high school girl from WataMote.',
-        })
-      )
-
-      // Mock utils functions
-      vi.mock('../src/utils/index.js', () => ({
-        clean: vi.fn(content => content),
-        getServerConfig: vi.fn((_, cb) => cb({ options: { 'toggle-chat': true } })),
-        getUserConfig: vi.fn((_, cb) =>
-          cb({
-            options: {
-              'message-style': false,
-              'switch-model': 'aidoll-gemma3-12b-q6:latest',
-              'modify-capacity': 50,
-            },
-          })
-        ),
-        openConfig: vi.fn(),
-      }))
-
-      // Mock Redis: no history
-      vi.mocked(redis.get).mockImplementation(async (key: string) => {
-        if (key === 'user:user1:sentiment') return '0.50'
-        if (key === 'bot:self_sentiment') return '0.50'
-        if (key === 'channel:channel1:User:history') return null // No history
-        return null
-      })
-
-      // Mock Ollama response
-      vi.mocked(ollama.chat).mockResolvedValue({
-        message: {
-          content: JSON.stringify({
-            status: 'success',
-            reply: 'U-um... hi... you talking to me?',
-            metadata: {
-              timestamp: '2025-05-21T14:00:00Z',
-              self_sentiment: 0.50,
-              user_sentiment: { 'user1': 0.50 },
-              redis_ops: [
-                { action: 'set', key: 'user:user1:sentiment', value: 0.50 },
-                { action: 'set', key: 'bot:self_sentiment', value: 0.50 },
-              ],
-              need_help: false,
-            },
-          }),
-        },
-      })
-
-      // Execute messageCreate event
-      await messageCreateEvent.execute(
-        { log: console.log, msgHist, ollama, client, defaultModel },
-        message
-      )
-
-      expect(message.reply).toHaveBeenCalledWith('U-um... hi... you talking to me?')
-      expect(redis.set).toHaveBeenCalledWith('user:user1:sentiment', '0.50')
-      expect(redis.set).toHaveBeenCalledWith('bot:self_sentiment', '0.50')
-      expect(redis.set).toHaveBeenCalledWith(
-        'channel:channel1:User:history',
-        JSON.stringify([
-          { role: 'user', content: '<@bot1> Hi!', images: [] },
-          { role: 'assistant', content: 'U-um... hi... you talking to me?', images: [] },
-        ])
-      )
-      expect(msgHist.size()).toBe(2) // User message + bot response
-    })
-  })
-})
+})

tsconfig.json

@@ -1,16 +1,21 @@
 {
   "compilerOptions": {
+    // Dependent on node version
     "target": "ES2020",
     "module": "NodeNext",
     "moduleResolution": "NodeNext",
     "strict": true,
+    // We must set the type
     "noImplicitAny": true,
     "declaration": false,
+    // Will not go through node_modules
     "skipDefaultLibCheck": true,
     "strictNullChecks": true,
+    // We can import json files like JavaScript
     "resolveJsonModule": true,
     "skipLibCheck": true,
     "esModuleInterop": true,
+    // Decompile .ts to .js into a folder named build
     "outDir": "build",
     "rootDir": "src",
     "baseUrl": ".",
@@ -18,6 +23,7 @@
       "*": ["node_modules/"]
     }
   },
+  // environment for env vars
   "include": ["src/**/*.ts"],
   "exclude": ["node_modules"]
-}
+}