From 185f682f6c05907da875da24382b5e16469a4b6c Mon Sep 17 00:00:00 2001
From: Patrick Gansterer <paroga@paroga.com>
Date: Sat, 30 Sep 2017 01:20:12 +0200
Subject: [PATCH] Remove useless text from received mails via the
 email_reply_trimmer gem

---
 Gemfile.lock                                                  | 2 ++
 plugins/messages/app/mail_receivers/messages_mail_receiver.rb | 4 ++++
 plugins/messages/foodsoft_messages.gemspec                    | 1 +
 3 files changed, 7 insertions(+)

diff --git a/Gemfile.lock b/Gemfile.lock
index ec025482..79fa029c 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -24,6 +24,7 @@ PATH
     foodsoft_messages (0.0.1)
       base32
       deface (~> 1.0)
+      email_reply_trimmer
       mail
       rails
 
@@ -151,6 +152,7 @@ GEM
     docile (1.1.5)
     domain_name (0.5.20170223)
       unf (>= 0.0.5, < 1.0.0)
+    email_reply_trimmer (0.1.8)
     erubis (2.7.0)
     eventmachine (1.0.9.1)
     exception_notification (4.2.1)
diff --git a/plugins/messages/app/mail_receivers/messages_mail_receiver.rb b/plugins/messages/app/mail_receivers/messages_mail_receiver.rb
index 49633df2..ee358321 100644
--- a/plugins/messages/app/mail_receivers/messages_mail_receiver.rb
+++ b/plugins/messages/app/mail_receivers/messages_mail_receiver.rb
@@ -1,3 +1,5 @@
+require "email_reply_trimmer"
+
 class MessagesMailReceiver
 
   def self.regexp
@@ -37,6 +39,8 @@ class MessagesMailReceiver
       body = Nokogiri::HTML(body).text
     end
 
+    body = EmailReplyTrimmer.trim(body)
+
     message = user.send_messages.new body: body,
       group: original_message.group,
       private: original_message.private,
diff --git a/plugins/messages/foodsoft_messages.gemspec b/plugins/messages/foodsoft_messages.gemspec
index 09e75757..13050bf8 100644
--- a/plugins/messages/foodsoft_messages.gemspec
+++ b/plugins/messages/foodsoft_messages.gemspec
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
   s.add_dependency "rails"
   s.add_dependency "base32"
   s.add_dependency "deface", "~> 1.0"
+  s.add_dependency "email_reply_trimmer"
   s.add_dependency "mail"
 
   s.add_development_dependency "sqlite3"