Merge branch 'attachments'

[sup] / lib / sup / message.rb

diff --git a/lib/sup/message.rb b/lib/sup/message.rb
index 5fc91def4914d14927c35cefa91c74b28d97b0e2..2cf97c8ce482c69097d6b8f014d06ff0be6060c5 100644 (file)
--- a/lib/sup/message.rb
+++ b/lib/sup/message.rb
@@ -149,7 +149,18 @@ class Message
     @source.fn_for_offset @source_info
   end
 
-  def sanitize_message_id mid; mid.gsub(/\s+/, "")[0..254] end
+  ## sanitize message ids by removing spaces and non-ascii characters.
+  ## also, truncate to 255 characters. all these steps are necessary
+  ## to make ferret happy. of course, we probably fuck up a couple
+  ## valid message ids as well. as long as we're consistent, this
+  ## should be fine, though.
+  ##
+  ## also, mostly the message ids that are changed by this belong to
+  ## spam email.
+  ##
+  ## an alternative would be to SHA1 or MD5 all message ids on a regular basis.
+  ## don't tempt me.
+  def sanitize_message_id mid; mid.gsub(/(\s|[^\000-\177])+/, "")[0..254] end
 
   def save index
     return unless @dirty