Merge branch 'dev'

Open-LLM-VTuber · Jan 25, 2025 · 665efbb · 665efbb
2 parents 6015a47 + 59ea730
commit 665efbb
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/src/renderer/src/services/websocket-handler.tsx b/src/renderer/src/services/websocket-handler.tsx
@@ -137,13 +137,13 @@ function WebSocketHandler({ children }: { children: React.ReactNode }) {
         if (aiState === 'interrupted' || aiState === 'listening') {
           console.log('Audio playback intercepted. Sentence:', message.text);
         } else {
-          console.log("expressions", message.expressions);
+          console.log("actions", message.actions);
           addAudioTask({
             audioBase64: message.audio || '',
             volumes: message.volumes || [],
             sliceLength: message.slice_length || 0,
             text: message.text || null,
-            expressions: message.expressions || null,
+            expressions: message.actions?.expressions || null,
           });
         }
         break;

diff --git a/src/renderer/src/services/websocket-service.tsx b/src/renderer/src/services/websocket-service.tsx
@@ -17,13 +17,19 @@ export interface Message {
   timestamp: string;
 }
 
+export interface Actions {
+  expressions?: string[] | number [];
+  pictures?: string[];
+  sounds?: string[];
+}
+
 export interface MessageEvent {
   type: string;
   audio?: string;
   volumes?: number[];
   slice_length?: number;
   files?: BackgroundFile[];
-  expressions?: string[] | number [];
+  actions?: Actions;
   text?: string;
   model_info?: ModelInfo;
   conf_name?: string;