From 793be4b2048c653b69ed4996d29b6b72cf9ab784 Mon Sep 17 00:00:00 2001
From: end-4 <97237370+end-4@users.noreply.github.com>
Date: Mon, 17 Jun 2024 18:27:51 +0700
Subject: [PATCH] wtf

---
 .config/ags/modules/.configuration/user_options.js | 14 +++++++++++++-
 .config/ags/services/gpt.js                        | 13 ++-----------
 2 files changed, 15 insertions(+), 12 deletions(-)

diff --git a/.config/ags/modules/.configuration/user_options.js b/.config/ags/modules/.configuration/user_options.js
index 31f2f89ea..92fccd82e 100644
--- a/.config/ags/modules/.configuration/user_options.js
+++ b/.config/ags/modules/.configuration/user_options.js
@@ -84,6 +84,19 @@ let configOptions = {
         'wsNumMarginScale': 0.07,
     },
     'sidebar': {
+        'ai': {
+            'extraGptModels': {
+                'oxygen3': {
+                    'name': 'Oxygen (GPT-3.5)',
+                    'logo_name': 'ai-oxygen-symbolic',
+                    'description': 'An API from Tornado Softwares\nPricing: Free: 100/day\nRequires you to join their Discord for a key',
+                    'base_url': 'https://app.oxyapi.uk/v1/chat/completions',
+                    'key_get_url': 'https://discord.com/invite/kM6MaCqGKA',
+                    'key_file': 'oxygen_key.txt',
+                    'model': 'gpt-3.5-turbo',
+                },
+            }
+        },
         'image': {
             'columns': 2,
             'batchCount': 20,
@@ -95,7 +108,6 @@ let configOptions = {
                 'order': ["gemini", "gpt", "waifu", "booru"],
             }
         },
-
     },
     'search': {
         'enableFeatures': {
diff --git a/.config/ags/services/gpt.js b/.config/ags/services/gpt.js
index 6d7f40203..ffd6ce3d9 100644
--- a/.config/ags/services/gpt.js
+++ b/.config/ags/services/gpt.js
@@ -6,7 +6,7 @@ import GLib from 'gi://GLib';
 import Soup from 'gi://Soup?version=3.0';
 import { fileExists } from '../modules/.miscutils/files.js';
 
-const PROVIDERS = { // There's this list hmm https://github.com/zukixa/cool-ai-stuff/
+const PROVIDERS = Object.assign({ // There's this list hmm https://github.com/zukixa/cool-ai-stuff/
     'openai': {
         'name': 'OpenAI',
         'logo_name': 'openai-symbolic',
@@ -43,15 +43,6 @@ const PROVIDERS = { // There's this list hmm https://github.com/zukixa/cool-ai-s
         'key_file': 'oxygen_key.txt',
         'model': 'gpt-4o',
     },
-    'oxygen3': {
-        'name': 'Oxygen (GPT-3.5)',
-        'logo_name': 'ai-oxygen-symbolic',
-        'description': 'An API from Tornado Softwares\nPricing: Free: 100/day\nRequires you to join their Discord for a key',
-        'base_url': 'https://app.oxyapi.uk/v1/chat/completions',
-        'key_get_url': 'https://discord.com/invite/kM6MaCqGKA',
-        'key_file': 'oxygen_key.txt',
-        'model': 'gpt-3.5-turbo',
-    },
     'zukijourney': {
         'name': 'zukijourney (GPT-3.5)',
         'logo_name': 'ai-zukijourney',
@@ -61,7 +52,7 @@ const PROVIDERS = { // There's this list hmm https://github.com/zukixa/cool-ai-s
         'key_file': 'zuki_key.txt',
         'model': 'gpt-3.5-turbo',
     },
-}
+}, userOptions.sidebar.ai.extraGptModels)
 
 // Custom prompt
 const initMessages =