From 39cc53d501084f9e03c9e86300042bb4e42bde12 Mon Sep 17 00:00:00 2001
From: Aaron Crate <crateimage@gmail.com>
Date: Fri, 19 Jun 2026 01:12:46 -0500
Subject: [PATCH] jonbot fixes

---
 .gitea/workflows/deploy.yaml |  1 -
 docker-compose.yml           |  4 ++--
 jonbot/jonbot.py             | 11 ++++++-----
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index e7e9b6c..2abcda0 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -22,7 +22,6 @@ jobs:
             if [ "$(docker compose ps -q)" ]; then
                 docker compose down
             fi
-            docker build -t git.crate.zip/crate/garfbot:latest .
             docker compose up -d --build
           else
             docker restart garfbot
diff --git a/docker-compose.yml b/docker-compose.yml
index f9a3125..34f5e90 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -7,7 +7,7 @@ services:
       dockerfile: Dockerfile
     restart: always
     volumes:
-      - ../garfbot:/usr/src/app
+      - /home/crate/garfbot:/usr/src/app
 
   jonbot:
     image: git.crate.zip/crate/jonbot:latest
@@ -17,4 +17,4 @@ services:
       dockerfile: Dockerfile
     restart: always
     volumes:
-      - ../garfbot/jonbot:/usr/src/app
+      - /home/crate/garfbot/jonbot:/usr/src/app
diff --git a/jonbot/jonbot.py b/jonbot/jonbot.py
index 912e380..b4e292d 100644
--- a/jonbot/jonbot.py
+++ b/jonbot/jonbot.py
@@ -33,7 +33,8 @@ if not logger.hasHandlers():
 
 openai.api_key = config.OPENAI_TOKEN
 jonkey = config.JONBOT_TOKEN
-model = config.TXT_MODEL
+txtmodel = config.TXT_MODEL
+sysprompt = config.SYSTEM_PROMPT
 
 intents = discord.Intents.default()
 intents.messages = True
@@ -47,7 +48,7 @@ client = commands.Bot(
 
 @client.event
 async def on_ready():
-    print(f"Logged in as {client.user.name} running {model}.", flush=True)
+    print(f"Logged in as {client.user.name} running {txtmodel}.", flush=True)
 
 @client.command(name="chat")
 async def jonchat(ctx, *, prompt):
@@ -80,12 +81,12 @@ oai = AsyncOpenAI(
     base_url=config.BASE_URL,
 )
 
-async def generate_chat(self, question: str) -> str:
+async def generate_chat(question: str) -> str:
     try:
         response = await oai.chat.completions.create(
-            model=self.txtmodel,
+            model=txtmodel,
             messages=[
-                {"role": "system", "content": self.sysprompt},
+                {"role": "system", "content": sysprompt},
                 {"role": "user",   "content": question},
             ],
             max_tokens=400,