forked from open-webui/open-webui
		
	Merge branch 'dev' into pr/926
This commit is contained in:
		
						commit
						df55ced0c0
					
				
					 18 changed files with 538 additions and 204 deletions
				
			
		|  | @ -143,7 +143,9 @@ | |||
| 	}; | ||||
| 
 | ||||
| 	const scrollToBottom = () => { | ||||
| 		messagesContainerElement.scrollTop = messagesContainerElement.scrollHeight; | ||||
| 		if (messagesContainerElement) { | ||||
| 			messagesContainerElement.scrollTop = messagesContainerElement.scrollHeight; | ||||
| 		} | ||||
| 	}; | ||||
| 
 | ||||
| 	////////////////////////// | ||||
|  | @ -313,7 +315,7 @@ | |||
| 					.map((file) => file.url.slice(file.url.indexOf(',') + 1)); | ||||
| 
 | ||||
| 				// Add images array only if it contains elements | ||||
| 				if (imageUrls && imageUrls.length > 0) { | ||||
| 				if (imageUrls && imageUrls.length > 0 && message.role === 'user') { | ||||
| 					baseMessage.images = imageUrls; | ||||
| 				} | ||||
| 
 | ||||
|  | @ -543,7 +545,8 @@ | |||
| 					.filter((message) => message) | ||||
| 					.map((message, idx, arr) => ({ | ||||
| 						role: message.role, | ||||
| 						...(message.files?.filter((file) => file.type === 'image').length > 0 ?? false | ||||
| 						...((message.files?.filter((file) => file.type === 'image').length > 0 ?? false) && | ||||
| 						message.role === 'user' | ||||
| 							? { | ||||
| 									content: [ | ||||
| 										{ | ||||
|  |  | |||
|  | @ -162,7 +162,9 @@ | |||
| 	}; | ||||
| 
 | ||||
| 	const scrollToBottom = () => { | ||||
| 		messagesContainerElement.scrollTop = messagesContainerElement.scrollHeight; | ||||
| 		if (messagesContainerElement) { | ||||
| 			messagesContainerElement.scrollTop = messagesContainerElement.scrollHeight; | ||||
| 		} | ||||
| 	}; | ||||
| 
 | ||||
| 	////////////////////////// | ||||
|  | @ -323,7 +325,7 @@ | |||
| 					.map((file) => file.url.slice(file.url.indexOf(',') + 1)); | ||||
| 
 | ||||
| 				// Add images array only if it contains elements | ||||
| 				if (imageUrls && imageUrls.length > 0) { | ||||
| 				if (imageUrls && imageUrls.length > 0 && message.role === 'user') { | ||||
| 					baseMessage.images = imageUrls; | ||||
| 				} | ||||
| 
 | ||||
|  | @ -553,7 +555,8 @@ | |||
| 					.filter((message) => message) | ||||
| 					.map((message, idx, arr) => ({ | ||||
| 						role: message.role, | ||||
| 						...(message.files?.filter((file) => file.type === 'image').length > 0 ?? false | ||||
| 						...((message.files?.filter((file) => file.type === 'image').length > 0 ?? false) && | ||||
| 						message.role === 'user' | ||||
| 							? { | ||||
| 									content: [ | ||||
| 										{ | ||||
|  | @ -702,7 +705,12 @@ | |||
| 
 | ||||
| 		if (messages.length == 2) { | ||||
| 			window.history.replaceState(history.state, '', `/c/${_chatId}`); | ||||
| 			await setChatTitle(_chatId, userPrompt); | ||||
| 
 | ||||
| 			if ($settings?.titleAutoGenerateModel) { | ||||
| 				await generateChatTitle(_chatId, userPrompt); | ||||
| 			} else { | ||||
| 				await setChatTitle(_chatId, userPrompt); | ||||
| 			} | ||||
| 		} | ||||
| 	}; | ||||
| 
 | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 Timothy J. Baek
						Timothy J. Baek