Merge branch 'development' into feat/Martin/Docker-infrastructure

Author: Neunerlei

.env.example

@@ -39,6 +39,8 @@
 #  - APP_PREVIOUS_KEYS:      Comma seperated list of previously used encryption keys
 #  - APP_MAINTENANCE_DRIVER: Maintenance mode driver: "cache" or "file": "cache" allows setting the maintenance mode across multiple machines
 #  - APP_MAINTENANCE_STORE:  Maintenance mode storage: "database" or ???
+#  - AI_MENTION_HANDLE:      Hnadle to mention AI in group chats.
+
 
 PROJECT_NAME=hawki2
 APP_NAME= HAWKI2
@@ -57,6 +59,9 @@ APP_PREVIOS_KEYS=
 APP_MAINTENANCE_DRIVER= cache
 APP_MAINTENANCE_STORE= database
 
+AI_MENTION_HANDLE="hawki"
+
+
 # ===============
 # Database server
 # ===============

config/app.php

@@ -123,4 +123,18 @@
         'store' => env('APP_MAINTENANCE_STORE', 'database'),
     ],
 
+
+    /*
+    |--------------------------------------------------------------------------
+    | AI Mention Handle
+    |--------------------------------------------------------------------------
+    |
+    | The handle which allows users to mention AI in groupchats.
+    |
+    |
+    */
+    'aiHandle' => '@'. env('AI_MENTION_HANDLE', 'hawki'),
+
+
+
 ];

public/js_v2.0.1/groupchat_functions.js

@@ -94,7 +94,7 @@ async function onSendMessageToRoom(inputField) {
 
     // console.log(messageObj);
     // if HAWKI is targeted send copy to stream controller
-    if(submittedObj.filteredContent.aiMention && submittedObj.filteredContent.aiMention.toLowerCase().includes('@hawki')){
+    if(submittedObj.filteredContent.aiMention && submittedObj.filteredContent.aiMention.toLowerCase().includes(aiHandle.toLowerCase())){
 
         const aiCryptoSalt = await fetchServerSalt('AI_CRYPTO_SALT');
         const aiKey = await deriveKey(roomKey, activeRoom.slug, aiCryptoSalt);

public/js_v2.0.1/message_functions.js

@@ -422,7 +422,7 @@ function detectMentioning(rawText){
         let processedText = rawText;
 
         for (const mention of mentionMatches) {
-            if (mention.toLowerCase() === "@hawki") {
+            if (mention.toLowerCase() === aiHandle.toLowerCase()) {
                 returnObj.aiMentioned = true;
                 returnObj.aiMention = mention; // Remove the '@' for aiMention
                 processedText = processedText.replace(new RegExp(mention, 'i'), '').trim();

resources/language/de_DE.json

@@ -78,7 +78,7 @@
     "Impressum": "Impressum",
     "Info": "Info",
     "Input_Placeholder_Chat": "Hier kannst Du deine Anfrage stellen",
-    "Input_Placeholder_Room": "Schreibe eine Gruppennachricht oder erwähne @hawki, um die KI zu nutzen.",
+    "Input_Placeholder_Room": "Schreibe eine Gruppennachricht oder nutze die KI mit ",
     "language": "Sprache",
     "LeaveRoom": "Raum Verlassen",
     "LeftRoom": "hat den Raum verlassen",

resources/language/en_US.json

@@ -76,7 +76,7 @@
     "Impressum": "Imprint",
     "Info": "Info",
     "Input_Placeholder_Chat": "You can enter your request here",
-    "Input_Placeholder_Room": "Write a group message or mention to use the AI.",
+    "Input_Placeholder_Room": "Write a group message or use the AI model by mentioning",
     "language": "Language",
     "LeaveRoom": "Leave Room",
     "LeftRoom": "left room",

resources/views/layouts/home.blade.php

@@ -85,8 +85,12 @@
 	const defaultModel = @json($models).defaultModel;
 	const systemModels = @json($models).systemModels;
 
+
+	const aiHandle = "{{ config('app.aiHandle') }}";
+
+	
 	window.addEventListener('DOMContentLoaded', async (event) => {
-		
+
 		setSessionCheckerTimer(0);
 		CheckModals()
 

resources/views/partials/home/input-field.blade.php

@@ -174,7 +174,7 @@ class="input-field"
 
                 @elseif($activeModule === 'groupchat')
 
-                    placeholder="{{ $translation['Input_Placeholder_Room'] }}" 
+                    placeholder="{{ $translation['Input_Placeholder_Room'] ." ". config('app.aiHandle')}}"
                     oninput="resizeInputField(this); onGroupchatType()" 
                     onkeypress="onHandleKeydownRoom(event)"