From 2ce875f57f819eba8e52a44a68e929e849a7a2e8 Mon Sep 17 00:00:00 2001
From: "sentry[bot]" <39604003+sentry[bot]@users.noreply.github.com>
Date: Sun, 24 May 2026 15:50:47 +0200
Subject: [PATCH] fix(messages): handle blank content submission gracefully
 (#1938)

Co-authored-by: sentry[bot] <39604003+sentry[bot]@users.noreply.github.com>
---
 app/controllers/messages_controller.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/controllers/messages_controller.rb b/app/controllers/messages_controller.rb
index b8041ad3d..f5e98ae41 100644
--- a/app/controllers/messages_controller.rb
+++ b/app/controllers/messages_controller.rb
@@ -4,13 +4,17 @@ class MessagesController < ApplicationController
   before_action :set_chat
 
   def create
-    @message = UserMessage.create!(
+    @message = UserMessage.new(
       chat: @chat,
       content: message_params[:content],
       ai_model: message_params[:ai_model].presence || Chat.default_model
     )
 
-    redirect_to chat_path(@chat, thinking: true)
+    if @message.save
+      redirect_to chat_path(@chat, thinking: true)
+    else
+      redirect_to chat_path(@chat), alert: @message.errors.full_messages.to_sentence
+    end
   end
 
   private