refac

backend/open_webui/routers/channels.py

@@ -436,7 +436,7 @@ async def new_message_handler(
             }
 
             await sio.emit(
-                "channel-events",
+                "events:channel",
                 event_data,
                 to=f"channel:{channel.id}",
             )
@@ -447,7 +447,7 @@ async def new_message_handler(
 
                 if parent_message:
                     await sio.emit(
-                        "channel-events",
+                        "events:channel",
                         {
                             "channel_id": channel.id,
                             "message_id": parent_message.id,
@@ -644,7 +644,7 @@ async def update_message_by_id(
 
         if message:
             await sio.emit(
-                "channel-events",
+                "events:channel",
                 {
                     "channel_id": channel.id,
                     "message_id": message.id,
@@ -708,7 +708,7 @@ async def add_reaction_to_message(
         message = Messages.get_message_by_id(message_id)
 
         await sio.emit(
-            "channel-events",
+            "events:channel",
             {
                 "channel_id": channel.id,
                 "message_id": message.id,
@@ -774,7 +774,7 @@ async def remove_reaction_by_id_and_user_id_and_name(
         message = Messages.get_message_by_id(message_id)
 
         await sio.emit(
-            "channel-events",
+            "events:channel",
             {
                 "channel_id": channel.id,
                 "message_id": message.id,
@@ -839,7 +839,7 @@ async def delete_message_by_id(
     try:
         Messages.delete_message_by_id(message_id)
         await sio.emit(
-            "channel-events",
+            "events:channel",
             {
                 "channel_id": channel.id,
                 "message_id": message.id,
@@ -862,7 +862,7 @@ async def delete_message_by_id(
 
             if parent_message:
                 await sio.emit(
-                    "channel-events",
+                    "events:channel",
                     {
                         "channel_id": channel.id,
                         "message_id": parent_message.id,

backend/open_webui/socket/main.py

@@ -356,7 +356,7 @@ async def join_note(sid, data):
     await sio.enter_room(sid, f"note:{note.id}")
 
 
-@sio.on("channel-events")
+@sio.on("events:channel")
 async def channel_events(sid, data):
     room = f"channel:{data['channel_id']}"
     participants = sio.manager.get_participants(
@@ -373,7 +373,7 @@ async def channel_events(sid, data):
 
     if event_type == "typing":
         await sio.emit(
-            "channel-events",
+            "events:channel",
             {
                 "channel_id": data["channel_id"],
                 "message_id": data.get("message_id", None),
@@ -658,7 +658,7 @@ def get_event_emitter(request_info, update_db=True):
 
         emit_tasks = [
             sio.emit(
-                "chat-events",
+                "events",
                 {
                     "chat_id": chat_id,
                     "message_id": message_id,
@@ -770,7 +770,7 @@ def get_event_emitter(request_info, update_db=True):
 def get_event_call(request_info):
     async def __event_caller__(event_data):
         response = await sio.call(
-            "chat-events",
+            "events",
             {
                 "chat_id": request_info.get("chat_id", None),
                 "message_id": request_info.get("message_id", None),

src/lib/components/channel/Channel.svelte

@@ -160,7 +160,7 @@
 	};
 
 	const onChange = async () => {
-		$socket?.emit('channel-events', {
+		$socket?.emit('events:channel', {
 			channel_id: id,
 			message_id: null,
 			data: {
@@ -180,7 +180,7 @@
 			chatId.set('');
 		}
 
-		$socket?.on('channel-events', channelEventHandler);
+		$socket?.on('events:channel', channelEventHandler);
 
 		mediaQuery = window.matchMedia('(min-width: 1024px)');
 
@@ -197,7 +197,7 @@
 	});
 
 	onDestroy(() => {
-		$socket?.off('channel-events', channelEventHandler);
+		$socket?.off('events:channel', channelEventHandler);
 	});
 </script>
 

src/lib/components/channel/Thread.svelte

@@ -143,7 +143,7 @@
 	};
 
 	const onChange = async () => {
-		$socket?.emit('channel-events', {
+		$socket?.emit('events:channel', {
 			channel_id: channel.id,
 			message_id: threadId,
 			data: {
@@ -156,11 +156,11 @@
 	};
 
 	onMount(() => {
-		$socket?.on('channel-events', channelEventHandler);
+		$socket?.on('events:channel', channelEventHandler);
 	});
 
 	onDestroy(() => {
-		$socket?.off('channel-events', channelEventHandler);
+		$socket?.off('events:channel', channelEventHandler);
 	});
 </script>
 

src/lib/components/chat/Chat.svelte

@@ -531,7 +531,7 @@
 		loading = true;
 		console.log('mounted');
 		window.addEventListener('message', onMessageHandler);
-		$socket?.on('chat-events', chatEventHandler);
+		$socket?.on('events', chatEventHandler);
 
 		pageSubscribe = page.subscribe(async (p) => {
 			if (p.url.pathname === '/') {
@@ -618,7 +618,7 @@
 			selectedFolderSubscribe();
 			chatIdUnsubscriber?.();
 			window.removeEventListener('message', onMessageHandler);
-			$socket?.off('chat-events', chatEventHandler);
+			$socket?.off('events', chatEventHandler);
 		} catch (e) {
 			console.error(e);
 		}

src/routes/+layout.svelte

@@ -575,11 +575,11 @@
 
 		user.subscribe((value) => {
 			if (value) {
-				$socket?.off('chat-events', chatEventHandler);
-				$socket?.off('channel-events', channelEventHandler);
+				$socket?.off('events', chatEventHandler);
+				$socket?.off('events:channel', channelEventHandler);
 
-				$socket?.on('chat-events', chatEventHandler);
-				$socket?.on('channel-events', channelEventHandler);
+				$socket?.on('events', chatEventHandler);
+				$socket?.on('events:channel', channelEventHandler);
 
 				// Set up the token expiry check
 				if (tokenTimer) {
@@ -587,8 +587,8 @@
 				}
 				tokenTimer = setInterval(checkTokenExpiry, 15000);
 			} else {
-				$socket?.off('chat-events', chatEventHandler);
-				$socket?.off('channel-events', channelEventHandler);
+				$socket?.off('events', chatEventHandler);
+				$socket?.off('events:channel', channelEventHandler);
 			}
 		});