Tweaked emotion generation code

hiibolt · Dec 26, 2023 · ec13c97 · ec13c97
1 parent dbacc7f
commit ec13c97
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/public/index.html b/public/index.html
@@ -2,7 +2,7 @@
 <html lang="en">
     <head>
         <meta charset="UTF-8">
-        <title>WebSocket Chat</title>
+        <title>MonikaiV2</title>
         <script src="https://cdn.jsdelivr.net/npm/p5@1.4.1/lib/p5.js"></script>
 		<link href="public/style.css" rel="stylesheet" type="text/css" />
     </head>
@@ -54,7 +54,7 @@
 
             function preload() {
                 background_sprite = loadImage('public/assets/backgrounds/default.png');
-                textbox_sprite = loadImage('public/assets/gui/TEXTBOX_NASTYA.png');
+                textbox_sprite = loadImage('public/assets/gui/TEXTBOX_LIBITINA.png');
                 speech_font = loadFont('public/assets/fonts/ALLER.ttf');
 
                 let emotions = ["CONCERNED", "CRYING", "LAUGHING", "NEUTRAL", "SAD"];
@@ -96,7 +96,7 @@
 
                 // Textbox Sprite Handling
                 if ( current_message.length > 0 ) { 
-                    image(textbox_sprite, (1280 / 2) - (800 / 2), 535, 800, 260);
+                    image(textbox_sprite, (1280 / 2) - (900 / 2), 535, 900, 260);
                 }
 
                 fill(255);

diff --git a/src/monikai/mod.rs b/src/monikai/mod.rs
@@ -294,11 +294,10 @@ async fn monikai_websocket(stream: WebSocket, monikai: Arc<Mutex<Monikai>>) {
                 NEXT RESPONSE:
                 {}
 
-                {{
-                    \"message\": \"{}\",
+                {{\"message\":\"{}\",\"emotion\":
             ", description, conversation, response, response)).await.unwrap();
 
-            let response_with_emotion = format!(r#"{{"message": "{}",{}"#, response, emotion);
+            let response_with_emotion = format!(r#"{{"message": "{}","emotion":{}"#, response, emotion);
 
             sender
                 .send(axum::extract::ws::Message::Text(response_with_emotion))