From ebf8e902ddcb86942eacd10ae9e408abe1a6893f Mon Sep 17 00:00:00 2001
From: Philipp Rothmann <philipprothmann@posteo.de>
Date: Thu, 9 Feb 2023 12:18:18 +0100
Subject: [PATCH] add richtext field to messages

---
 plugins/messages/app/controllers/messages_controller.rb   | 8 +++++---
 plugins/messages/app/helpers/messages_helper.rb           | 2 +-
 plugins/messages/app/models/message.rb                    | 2 ++
 plugins/messages/app/views/messages/new.haml              | 2 +-
 plugins/messages/app/views/messages/show.haml             | 2 +-
 .../app/views/messages_mailer/foodsoft_message.html.haml  | 6 ++++++
 6 files changed, 16 insertions(+), 6 deletions(-)
 create mode 100644 plugins/messages/app/views/messages_mailer/foodsoft_message.html.haml

diff --git a/plugins/messages/app/controllers/messages_controller.rb b/plugins/messages/app/controllers/messages_controller.rb
index 628f145b..7807b67f 100644
--- a/plugins/messages/app/controllers/messages_controller.rb
+++ b/plugins/messages/app/controllers/messages_controller.rb
@@ -20,11 +20,13 @@ class MessagesController < ApplicationController
         @message.group_id = original_message.group_id
         @message.private = original_message.private
         @message.subject = I18n.t('messages.model.reply_subject', :subject => original_message.subject)
-        @message.body = I18n.t('messages.model.reply_header', :user => original_message.sender.display, :when => I18n.l(original_message.created_at, :format => :short)) + "\n"
-        original_message.body.each_line { |l| @message.body += I18n.t('messages.model.reply_indent', :line => l) }
+        @message.body = I18n.t('messages.model.reply_header', :user => original_message.sender.display, :when => I18n.l(original_message.created_at, :format => :short)) + "\n" \
+                        + "<blockquote>" + original_message.body.to_trix_html +  "</blockquote>"
+
+        # .each_line { |l| @message.body += I18n.t('messages.model.reply_indent', :line => l) }
       else
         redirect_to new_message_url, alert: I18n.t('messages.new.error_private')
-      end
+      end 
     end
   end
 
diff --git a/plugins/messages/app/helpers/messages_helper.rb b/plugins/messages/app/helpers/messages_helper.rb
index d5371fe4..d386e6df 100644
--- a/plugins/messages/app/helpers/messages_helper.rb
+++ b/plugins/messages/app/helpers/messages_helper.rb
@@ -5,7 +5,7 @@ module MessagesHelper
       body = ""
     else
       subject = message.subject
-      body = truncate(message.body, :length => length - subject.length)
+      body = truncate(message.body.to_plain_text, :length => length - subject.length)
     end
     "<b>#{link_to(h(subject), message)}</b> <span style='color:grey'>#{h(body)}</span>".html_safe
   end
diff --git a/plugins/messages/app/models/message.rb b/plugins/messages/app/models/message.rb
index f6b03c10..b5087d0d 100644
--- a/plugins/messages/app/models/message.rb
+++ b/plugins/messages/app/models/message.rb
@@ -22,6 +22,8 @@ class Message < ApplicationRecord
   validates_presence_of :message_recipients, :subject, :body
   validates_length_of :subject, :in => 1..255
 
+  has_rich_text :body
+
   after_initialize do
     @recipients_ids ||= []
     @send_method ||= 'recipients'
diff --git a/plugins/messages/app/views/messages/new.haml b/plugins/messages/app/views/messages/new.haml
index 57d6b452..d288cd72 100644
--- a/plugins/messages/app/views/messages/new.haml
+++ b/plugins/messages/app/views/messages/new.haml
@@ -110,7 +110,7 @@
     = f.input :recipient_tokens, :input_html => { 'data-pre' => User.where(id: @message.recipients_ids).map(&:token_attributes).to_json }
   = f.input :private, inline_label: t('.hint_private')
   = f.input :subject, input_html: {class: 'input-xxlarge'}
-  = f.input :body, input_html: {class: 'input-xxlarge', rows: 13}
+  = f.rich_text_area :body, input_html: {class: 'input-xxlarge', rows: 13}
   .form-actions
     = f.submit class: 'btn btn-primary'
     = link_to t('ui.or_cancel'), :back
diff --git a/plugins/messages/app/views/messages/show.haml b/plugins/messages/app/views/messages/show.haml
index 36e7b570..8b3f7c1c 100644
--- a/plugins/messages/app/views/messages/show.haml
+++ b/plugins/messages/app/views/messages/show.haml
@@ -33,7 +33,7 @@
         - if @message.can_toggle_private?(current_user)
           = link_to t('.change_visibility'), toggle_private_message_path(@message), method: :post, class: 'btn btn-mini'
   %hr/
-  %p= simple_format(h(@message.body))
+  .trix-content= @message.body
   %hr/
   %p
     = link_to t('.reply'), new_message_path(:message => {:reply_to => @message.id}), class: 'btn'
diff --git a/plugins/messages/app/views/messages_mailer/foodsoft_message.html.haml b/plugins/messages/app/views/messages_mailer/foodsoft_message.html.haml
new file mode 100644
index 00000000..8c81d380
--- /dev/null
+++ b/plugins/messages/app/views/messages_mailer/foodsoft_message.html.haml
@@ -0,0 +1,6 @@
+= @message.body
+%hr/
+%pre
+  - if @message.group
+    = raw t '.footer_group', group: @message.group.name
+  = raw t '.footer', reply_url: new_message_url('message[reply_to]' => @message.id), msg_url: message_url(@message), profile_url: my_profile_url
\ No newline at end of file