From f2355ea48460966b47e4b8657f737a094a1eaa1f Mon Sep 17 00:00:00 2001
From: JBHemloque <jbhemlock@gmail.com>
Date: Wed, 19 Mar 2025 19:37:51 -0700
Subject: [PATCH 1/2] Update ollama.js

---
 server/ollama.js | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/server/ollama.js b/server/ollama.js
index d59b9d5..ec09a5a 100644
--- a/server/ollama.js
+++ b/server/ollama.js
@@ -8,10 +8,10 @@ var config = require('../config.json');
 
 const { Ollama} = require('ollama');
 
-const ollama = new Ollama({url:config.ollamaAddr});
-
 let ollamaConfig = config.ollama;
 
+const ollama = new Ollama({url:ollamaConfig.addr});
+
 function makeHistoryFilepath(user) {
     return path.resolve(base.path, `server/history/${user}.json`);
 }
@@ -78,7 +78,7 @@ exports.chat = async function(input, user) {
         console.log(JSON.stringify(history,null,2));
     }
     let response = await ollama.chat({
-          model: config.ollamaModel,
+          model: ollamaConfig.model,
           messages: history,
         });
     history.push(response.message);

From eb5ace163b548d67b8bbc04d1899c9c1477e280d Mon Sep 17 00:00:00 2001
From: Jim Anderson <jimanderson@Marrow.local>
Date: Tue, 12 Aug 2025 12:25:11 -0700
Subject: [PATCH 2/2] Fixed showcmdr command

---
 package-lock.json                 | 4 ++--
 package.json                      | 2 +-
 server/commands/elite/showcmdr.js | 7 ++++++-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index 4514f04..9078a71 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "SINBot",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "SINBot",
-      "version": "3.0.0",
+      "version": "3.0.1",
       "license": "ISC",
       "dependencies": {
         "@napi-rs/canvas": "^0.1.68",
diff --git a/package.json b/package.json
index fc4becc..bce92ee 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
   "name": "SINBot",
   "type": "commonjs",
-  "version": "3.0.0",
+  "version": "3.0.1",
   "description": "Discord bot appropriate for Elite Dangerous",
   "main": "server/server.js",
   "dependencies": {
diff --git a/server/commands/elite/showcmdr.js b/server/commands/elite/showcmdr.js
index 3f4289a..6307e21 100644
--- a/server/commands/elite/showcmdr.js
+++ b/server/commands/elite/showcmdr.js
@@ -7,7 +7,12 @@ const elite = require(path.resolve(base.path, 'server/elite/elite.js'));
 module.exports = {
     data: new SlashCommandBuilder()
         .setName('showcmdr')
-        .setDescription('Show your EDSM name, if registered'),
+        .setDescription('Show your EDSM name, if registered')
+        .addStringOption(option => 
+            option
+                .setName('edsm_name')
+                .setDescription('Your CMDRs name on EDSM')
+                .setRequired(true)),
     async execute(interaction) {
         var edsmName = elite.getEdsmName(interaction);
          if (edsmName) {