Extract the mail subject correctly

[rails.git] / script / deliver-message

diff --git a/script/deliver-message b/script/deliver-message
index 3df09f85fdbde5cf396d55da6591072dfba2b78c..28b32cda61dbb9c84873b58589df5a85482caf6b 100755 (executable)
--- a/script/deliver-message
+++ b/script/deliver-message
@@ -10,11 +10,13 @@ if recipient[1] == "c"
   digest = comment.digest
   from = comment.diary_entry.user
   to = comment.user
+  subject = mail.subject
 else
   message = Message.find(recipient[2])
   digest = message.digest
   from = message.recipient
   to = message.sender
+  subject = mail.subject.sub(/\[OpenStreetMap\] */, "")
 end
 
 exit 0 unless recipient[3] == digest[0,6]
@@ -23,7 +25,7 @@ mail = TMail::Mail.parse(STDIN.readlines.join)
 
 message = Message.new(:sender => from, :recipient => to,
                       :sent_on => Time.now.getutc,
-                      :title => mail.subject,
+                      :title => subject,
                       :body => mail.body)
 message.save!