email_reply_trimmer 0.1.6 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c6eabb8ce3f3327f3abe63f3ee2fe147fb161d96
-  data.tar.gz: 7a07c2267ef47f4607a2ae2f05feac8c0a2584c1
+SHA256:
+  metadata.gz: 9914eb793e4bbfa4f291097707acb2af27f491507b0e52b0e1433df3c1fb1f0d
+  data.tar.gz: 2c519cd4b6fe2db1dc3b12201c8a5bd540fbf274537610069b73d34bb3e0566f
 SHA512:
-  metadata.gz: dba90e1fdc0b0a4f7032f9c2d1e9aabf575a390ee4cf39618037b9a820de8d7abad6338623b203211ef349dc3568b2e55440721dc89fa8ac144eda878cf0e463
-  data.tar.gz: 19be9d9b0496d31e81f7f7adb296d273aeea84130a8243d669857de751748a4e923584a14d4c8f0a90f338428e7dd219fa4212fddce38575b44ec58a598c5455
+  metadata.gz: b0687f10183b5472c816d433c3f654dd085b8d615ef223c54e97e61e893c47752ed20eb5b1354c7d184ab84075de3c3fa492c76191b1fc0cfdcfc48a1d661b34
+  data.tar.gz: 3d740b872f6116bd0c59d2d1b19e405191f1c25c619e5564a602eebed3691323761292d7a063f7f224bacd668f2ede622eac085f7a5b7bad3b90570ac3b018b9

data/Gemfile

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+source 'https://rubygems.org'
+
+# Specify your gem's dependencies in email_reply_trimmer.gemspec
+gemspec

data/Gemfile.lock

@@ -0,0 +1,98 @@
+PATH
+  remote: .
+  specs:
+    email_reply_trimmer (0.2.0)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (8.0.0)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    ast (2.4.2)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.8)
+    concurrent-ruby (1.3.4)
+    connection_pool (2.4.1)
+    drb (2.2.1)
+    i18n (1.14.6)
+      concurrent-ruby (~> 1.0)
+    json (2.8.2)
+    language_server-protocol (3.17.0.3)
+    logger (1.6.1)
+    minitest (5.25.2)
+    parallel (1.26.3)
+    parser (3.3.6.0)
+      ast (~> 2.4.1)
+      racc
+    racc (1.8.1)
+    rack (3.1.8)
+    rainbow (3.1.1)
+    rake (12.3.3)
+    regexp_parser (2.9.2)
+    rubocop (1.69.0)
+      json (~> 2.3)
+      language_server-protocol (>= 3.17.0)
+      parallel (~> 1.10)
+      parser (>= 3.3.0.2)
+      rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 2.4, < 3.0)
+      rubocop-ast (>= 1.36.1, < 2.0)
+      ruby-progressbar (~> 1.7)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.36.2)
+      parser (>= 3.3.1.0)
+    rubocop-capybara (2.21.0)
+      rubocop (~> 1.41)
+    rubocop-discourse (3.8.6)
+      activesupport (>= 6.1)
+      rubocop (>= 1.59.0)
+      rubocop-capybara (>= 2.0.0)
+      rubocop-factory_bot (>= 2.0.0)
+      rubocop-rails (>= 2.25.0)
+      rubocop-rspec (>= 3.0.1)
+      rubocop-rspec_rails (>= 2.30.0)
+    rubocop-factory_bot (2.26.1)
+      rubocop (~> 1.61)
+    rubocop-rails (2.27.0)
+      activesupport (>= 4.2.0)
+      rack (>= 1.1)
+      rubocop (>= 1.52.0, < 2.0)
+      rubocop-ast (>= 1.31.1, < 2.0)
+    rubocop-rspec (3.2.0)
+      rubocop (~> 1.61)
+    rubocop-rspec_rails (2.30.0)
+      rubocop (~> 1.61)
+      rubocop-rspec (~> 3, >= 3.0.1)
+    ruby-progressbar (1.13.0)
+    securerandom (0.3.2)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (3.1.2)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
+    uri (1.0.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  email_reply_trimmer!
+  minitest (~> 5)
+  rake (~> 12)
+  rubocop
+  rubocop-discourse
+
+BUNDLED WITH
+   2.5.22

data/README.md

@@ -1,4 +1,4 @@
-# Discourse Email Reply Trimmer [![Build Status](https://api.travis-ci.org/discourse/email_reply_trimmer.svg?branch=master)](https://travis-ci.org/discourse/email_reply_trimmer)
+# Discourse Email Reply Trimmer
 
 EmailReplyTrimmer is a small library to trim replies from plain text email.
 
@@ -16,6 +16,6 @@ Run `rake` to run the tests.
 
 ## Inspirations
 
- - [GitHub's Email Reply Parser](https://github.com/github/email_reply_parser)
- - [MailGun's Talon](https://github.com/mailgun/talon)
- - [Vitor R. Carvalho's Learning to Extract Signature and Reply Lines from Email](http://www.cs.cmu.edu/~vitor/papers/sigFilePaper_finalversion.pdf)
+- [GitHub's Email Reply Parser](https://github.com/github/email_reply_parser)
+- [MailGun's Talon](https://github.com/mailgun/talon)
+- [Vitor R. Carvalho's Learning to Extract Signature and Reply Lines from Email](http://www.cs.cmu.edu/~vitor/papers/sigFilePaper_finalversion.pdf)

data/Rakefile

@@ -1,12 +1,9 @@
-def name
-  @name ||= Dir["*.gemspec"].first.split(".").first
-end
+# frozen_string_literal: true
 
-def version
-  @version ||= File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*['"](?'version'\d+\.\d+\.\d+)['"]/, "version"]
-end
+name = Dir["*.gemspec"].first.split(".").first
+version = File.read("lib/#{name}.rb")[/^\s*VERSION\s*=\s*['"](?'version'\d+\.\d+\.\d+)['"]/, "version"]
 
-task :default => :test
+task default: :test
 
 require "rake/testtask"
 Rake::TestTask.new(:test)

data/devenv.lock

@@ -0,0 +1,184 @@
+{
+  "nodes": {
+    "devenv": {
+      "locked": {
+        "dir": "src/modules",
+        "lastModified": 1732830318,
+        "owner": "cachix",
+        "repo": "devenv",
+        "rev": "51abcb75d471a215c800937d4e30dc765d305c6d",
+        "type": "github"
+      },
+      "original": {
+        "dir": "src/modules",
+        "owner": "cachix",
+        "repo": "devenv",
+        "type": "github"
+      }
+    },
+    "flake-compat": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1732722421,
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-compat_2": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1732722421,
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "gitignore": {
+      "inputs": {
+        "nixpkgs": [
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1709087332,
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1732617236,
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "af51545ec9a44eadf3fe3547610a5cdd882bc34e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs-ruby": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1730958464,
+        "owner": "bobvanderlinden",
+        "repo": "nixpkgs-ruby",
+        "rev": "93bd040be2856ba0e44a33db6360e8c9c0c09aa1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "bobvanderlinden",
+        "repo": "nixpkgs-ruby",
+        "type": "github"
+      }
+    },
+    "nixpkgs-stable": {
+      "locked": {
+        "lastModified": 1732749044,
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "0c5b4ecbed5b155b705336aa96d878e55acd8685",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-24.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "pre-commit-hooks": {
+      "inputs": {
+        "flake-compat": "flake-compat_2",
+        "gitignore": "gitignore",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": "nixpkgs-stable"
+      },
+      "locked": {
+        "lastModified": 1732021966,
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "devenv": "devenv",
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-ruby": "nixpkgs-ruby",
+        "pre-commit-hooks": "pre-commit-hooks"
+      }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

data/devenv.nix

@@ -0,0 +1,4 @@
+{
+  languages.ruby.enable = true;
+  languages.ruby.version = "3.2";
+}

data/devenv.yaml

@@ -0,0 +1,8 @@
+inputs:
+  nixpkgs-ruby:
+    url: github:bobvanderlinden/nixpkgs-ruby
+    inputs:
+      nixpkgs:
+        follows: nixpkgs
+  nixpkgs:
+    url: github:nixos/nixpkgs/nixpkgs-unstable

data/email_reply_trimmer.gemspec

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require_relative "lib/email_reply_trimmer"
 
 Gem::Specification.new do |s|
@@ -9,12 +10,17 @@ Gem::Specification.new do |s|
   s.description = "EmailReplyTrimmer is a small library to trim replies from plain text email."
 
   s.authors = ["Régis Hanol"]
-  s.email = ["regis+rubygems@hanol.fr"]
+  s.email = ["rubygems@hanol.fr"]
 
   s.homepage = "https://github.com/discourse/email_reply_trimmer"
   s.license = "MIT"
 
   s.require_paths = ["lib"]
-  s.files = Dir["**/*"].reject { |path| File.directory?(path) }
+  s.files = Dir["**/*"].reject { |path| File.directory?(path) || path =~ /.*\.gem$/ }
   s.test_files = s.files.select { |path| path =~ /^test\/.+_test\.rb$/ }
+
+  s.add_development_dependency 'rake', '~> 12'
+  s.add_development_dependency 'minitest', '~> 5'
+  s.add_development_dependency 'rubocop'
+  s.add_development_dependency 'rubocop-discourse'
 end

data/lib/email_reply_trimmer/delimiter_matcher.rb

@@ -1,7 +1,8 @@
+# frozen_string_literal: true
 class DelimiterMatcher
 
-  DELIMITER_CHARACTERS ||= "-_,=+~#*ᐧ"
-  DELIMITER_REGEX      ||= /^[[:blank:]]*[#{Regexp.escape(DELIMITER_CHARACTERS)}]+[[:blank:]]*$/
+  DELIMITER_CHARACTERS = "-_,=+~#*ᐧ—"
+  DELIMITER_REGEX      = /^[[:blank:]]*[#{Regexp.escape(DELIMITER_CHARACTERS)}]+[[:blank:]]*$/
 
   def self.match?(line)
     line =~ DELIMITER_REGEX

data/lib/email_reply_trimmer/email_header_matcher.rb

@@ -1,12 +1,13 @@
+# frozen_string_literal: true
 class EmailHeaderMatcher
 
   EMAIL_HEADERS_WITH_DATE_MARKERS = [
-    # Dutch
+    # Norwegian
     ["Sendt"],
     # English
-    ["Sent"],
+    ["Sent", "Date"],
     # French
-    ["Date"],
+    ["Date", "Le"],
     # German
     ["Gesendet"],
     # Portuguese
@@ -17,19 +18,25 @@ class EmailHeaderMatcher
     ["Fecha"],
     # Italian
     ["Data"],
+    # Dutch
+    ["Datum"],
+    # Swedish
+    ["Skickat"],
+    # Chinese
+    ["发送时间"],
   ]
 
   EMAIL_HEADERS_WITH_DATE_REGEXES = EMAIL_HEADERS_WITH_DATE_MARKERS.map do |header|
-    /^[[:blank:]>\*]*(?:#{header.join("|")})[[:blank:]\*]*:.*\d+/
+    /^[[:blank:]*]*(?:#{header.join("|")})[[:blank:]*]*:.*\d+/
   end
 
   EMAIL_HEADERS_WITH_TEXT_MARKERS = [
-    # Dutch
+    # Norwegian
     ["Fra", "Til", "Emne"],
     # English
     ["From", "To", "Cc", "Reply-To", "Subject"],
     # French
-    ["De", "À", "Répondre à", "Objet"],
+    ["De", "Expéditeur", "À", "Destinataire", "Répondre à", "Objet"],
     # German
     ["Von", "An", "Betreff"],
     # Portuguese
@@ -37,11 +44,17 @@ class EmailHeaderMatcher
     # Spanish
     ["De", "Para", "Asunto"],
     # Italian
-    ["Da", "Risposta", "A", "Oggetto"]
+    ["Da", "Risposta", "A", "Oggetto"],
+    # Dutch
+    ["Van", "Beantwoorden - Aan", "Aan", "Onderwerp"],
+    # Swedish
+    ["Från", "Till", "Ämne"],
+    # Chinese
+    ["发件人", "收件人", "主题"],
   ]
 
   EMAIL_HEADERS_WITH_TEXT_REGEXES = EMAIL_HEADERS_WITH_TEXT_MARKERS.map do |header|
-    /^[[:blank:]>\*]*(?:#{header.join("|")})[[:blank:]\*]*:.*[[:word:]]+/
+    /^[[:blank:]*]*(?:#{header.join("|")})[[:blank:]*]*:.*[[:word:]]+/i
   end
 
   EMAIL_HEADER_REGEXES = [

data/lib/email_reply_trimmer/embedded_email_matcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class EmbeddedEmailMatcher
 
   # On Wed, Sep 25, 2013, at 03:57 PM, jorge_castro wrote:
@@ -10,38 +11,43 @@ class EmbeddedEmailMatcher
   # Dnia 14 lip 2015 o godz. 00:25 Michael Downey <info@discourse.org> napisał(a):
   # Em seg, 27 de jul de 2015 17:13, Neil Lalonde <info@discourse.org> escreveu:
   # El jueves, 21 de noviembre de 2013, codinghorror escribió:
-  # Am 03.02.2016 3:35 nachm. schrieb Max Mustermann <mail@example.com>:
-  ON_DATE_SOMEONE_WROTE_MARKERS = [
+  # At 6/16/2016 08:32 PM, you wrote:
+  ON_DATE_SOMEONE_WROTE_REGEXES = [
+    # Chinese
+    /^[[:blank:]<>-]*在 (?:(?!\b(?>在|写道)\b).)+?写道[[:blank:].:>-]*$/im,
     # Dutch
-    ["Op","het volgende geschreven"],
+    /^[[:blank:]<>-]*Op (?:(?!\b(?>Op|het\svolgende\sgeschreven|schreef)\b).)+?(het\svolgende\sgeschreven|schreef[^:]+)[[:blank:].:>-]*$/im,
     # English
-    ["On", "wrote"],
+    /^[[:blank:]<>-]*In message (?:(?!\b(?>In message|writes)\b).)+?writes[[:blank:].:>-]*$/im,
+    /^[[:blank:]<>-]*(On|At) (?:(?!\b(?>On|wrote|writes|says|said)\b).)+?(wrote|writes|says|said)[[:blank:].:>-]*$/im,
     # French
-    ["Le", "a écrit "],
+    /^[[:blank:]<>-]*Le (?:(?!\b(?>Le|nous\sa\sdit|a\s+écrit)\b).)+?(nous\sa\sdit|a\s+écrit)[[:blank:].:>-]*$/im,
+    # German
+    /^[[:blank:]<>-]*Am (?:(?!\b(?>Am|schrieben\sSie)\b).)+?schrieben\sSie[[:blank:].:>-]*$/im,
+    /^[[:blank:]<>-]*Am (?:(?!\b(?>Am|geschrieben)\b).)+?(geschrieben|schrieb[^:]+)[[:blank:].:>-]*$/im,
     # Italian
-    ["Il", "ha scritto"],
+    /^[[:blank:]<>-]*Il (?:(?!\b(?>Il|ha\sscritto)\b).)+?ha\sscritto[[:blank:].:>-]*$/im,
     # Polish
-    ["Dnia", "napisał\\(a\\)"],
+    /^[[:blank:]<>-]*(Dnia|Dňa) (?:(?!\b(?>Dnia|Dňa|napisał)\b).)+?napisał(\(a\))?[[:blank:].:>-]*$/im,
     # Portuguese
-    ["Em", "escreveu"],
+    /^[[:blank:]<>-]*Em (?:(?!\b(?>Em|escreveu)\b).)+?escreveu[[:blank:].:>-]*$/im,
     # Spanish
-    ["El", "escribió"],
-    # German
-    ["Am", "schrieb"],
+    /^[[:blank:]<>-]*El (?:(?!\b(?>El|escribió)\b).)+?escribió[[:blank:].:>-]*$/im,
   ]
 
-  ON_DATE_SOMEONE_WROTE_REGEXES = ON_DATE_SOMEONE_WROTE_MARKERS.map do |on, wrote|
-    wrote.gsub!(/ +/, "[[:space:]]+") # the "wrote" part might span over multiple lines
-    /^([[:blank:]>\-]*#{on}\s(?:(?!#{on}\s|#{wrote}:?)[\s\S])*#{wrote}:?[[:blank:]\-]*)$/m
-  end
-
   # Op 10 dec. 2015 18:35 schreef "Arpit Jalan" <info@discourse.org>:
   # Am 18.09.2013 um 16:24 schrieb codinghorror <info@discourse.org>:
+  # Den 15. jun. 2016 kl. 20.42 skrev Jeff Atwood <info@discourse.org>:
+  # søn. 30. apr. 2017 kl. 00.26 skrev David Taylor <meta@discoursemail.com>:
   ON_DATE_WROTE_SOMEONE_MARKERS = [
     # Dutch
     ["Op", "schreef"],
     # German
     ["Am", "schrieb"],
+    # Norwegian
+    ["Den", "skrev"],
+    # Dutch
+    ["søn\.", "skrev"],
   ]
 
   ON_DATE_WROTE_SOMEONE_REGEXES = ON_DATE_WROTE_SOMEONE_MARKERS.map do |on, wrote|
@@ -49,15 +55,31 @@ class EmbeddedEmailMatcher
   end
 
   # суббота, 14 марта 2015 г. пользователь etewiah написал:
+  # 23 mar 2017 21:25 "Neil Lalonde" <meta@discoursemail.com> napisał(a):
+  # 30 серп. 2016 р. 20:45 "Arpit" no-reply@example.com пише:
   DATE_SOMEONE_WROTE_MARKERS = [
     # Russian
     ["пользователь", "написал"],
+    # Polish
+    ["", "napisał\\(a\\)"],
+    # Ukrainian
+    ["", "пише"],
   ]
 
   DATE_SOMEONE_WROTE_REGEXES = DATE_SOMEONE_WROTE_MARKERS.map do |user, wrote|
-    /.+#{user}.+#{wrote}:/
+    user.size == 0 ?
+      /\d{4}.{1,80}\n?.{0,80}?#{wrote}:/ :
+      /\d{4}.{1,80}#{user}.{0,80}\n?.{0,80}?#{wrote}:/
   end
 
+  # Max Mustermann <try_discourse@discoursemail.com> schrieb am Fr., 28. Apr. 2017 um 11:53 Uhr:
+  SOMEONE_WROTE_ON_DATE_REGEXES = [
+    # English
+    /^.+\bwrote\b[[:space:]]+\bon\b.+[^:]+:/,
+    # German
+    /^.+\bschrieb\b[[:space:]]+\bam\b.+[^:]+:/,
+  ]
+
   # 2016-03-03 17:21 GMT+01:00 Some One
   ISO_DATE_SOMEONE_REGEX = /^[[:blank:]>]*20\d\d-\d\d-\d\d \d\d:\d\d GMT\+\d\d:\d\d [\w[:blank:]]+$/
 
@@ -65,7 +87,7 @@ class EmbeddedEmailMatcher
   # 2013/10/2 camilohollanda <info@discourse.org>
   # вт, 5 янв. 2016 г. в 23:39, Erlend Sogge Heggen <info@discourse.org>:
   # ср, 1 апр. 2015, 18:29, Denis Didkovsky <info@discourse.org>:
-  DATE_SOMEONE_EMAIL_REGEX = /^[[:blank:]>]*.*\d{4}.+<[^@<>]+@[^@<>.]+\.[^@<>]+>:?$/
+  DATE_SOMEONE_EMAIL_REGEX = /\d{4}.{1,80}\s?<[^@<>]+@[^@<>.]+\.[^@<>]+>:?$/
 
   # codinghorror via Discourse Meta wrote:
   # codinghorror via Discourse Meta <info@discourse.org> schrieb:
@@ -77,11 +99,12 @@ class EmbeddedEmailMatcher
   ]
 
   SOMEONE_VIA_SOMETHING_WROTE_REGEXES = SOMEONE_VIA_SOMETHING_WROTE_MARKERS.map do |wrote|
-    /^[[:blank:]>]*.+ via .+ #{wrote}:?[[:blank:]]*$/
+    /^.+ via .+ #{wrote}:?[[:blank:]]*$/
   end
 
   # Some One <info@discourse.org> wrote:
-  SOMEONE_EMAIL_WROTE_REGEX = /^[[:blank:]>]*.+ <.+@.+\..+> wrote:?/
+  # Gavin Sinclair (gsinclair@soyabean.com.au) wrote:
+  SOMEONE_EMAIL_WROTE_REGEX = /^.+\b[\w.+-]+@[\w.-]+\.\w{2,}\b.+wrote:?$/
 
   # Posted by mpalmer on 01/21/2016
   POSTED_BY_SOMEONE_ON_DATE_REGEX = /^[[:blank:]>]*Posted by .+ on \d{2}\/\d{2}\/\d{4}$/i
@@ -92,17 +115,21 @@ class EmbeddedEmailMatcher
   # ----- Original Message -----
   # -----Original Message-----
   # *----- Original Message -----*
+  # ----- Reply message -----
+  # ------------------ 原始邮件 ------------------
   FORWARDED_EMAIL_REGEXES = [
     # English
     /^[[:blank:]>]*Begin forwarded message:/i,
-    /^[[:blank:]>]*Reply message/i,
-    /^[[:blank:]>\*]*-{2,}[[:blank:]]*(Forwarded|Original) Message[[:blank:]]*-{2,}/i,
+    /^[[:blank:]>*]*-{2,}[[:blank:]]*(Forwarded|Original|Reply) Message[[:blank:]]*-{2,}/i,
     # French
-    /^[[:blank:]>\*]*-{2,}[[:blank:]]*Message transféré[[:blank:]]*-{2,}/i,
+    /^[[:blank:]>]*Début du message transféré :/i,
+    /^[[:blank:]>*]*-{2,}[[:blank:]]*Message transféré[[:blank:]]*-{2,}/i,
     # German
-    /^[[:blank:]>\*]*-{2,}[[:blank:]]*Ursprüngliche Nachricht[[:blank:]]*-{2,}/i,
+    /^[[:blank:]>*]*-{2,}[[:blank:]]*Ursprüngliche Nachricht[[:blank:]]*-{2,}/i,
     # Spanish
-    /^[[:blank:]>\*]*-{2,}[[:blank:]]*Mensaje original[[:blank:]]*-{2,}/i,
+    /^[[:blank:]>*]*-{2,}[[:blank:]]*Mensaje original[[:blank:]]*-{2,}/i,
+    # Chinese
+    /^[[:blank:]>*]*-{2,}[[:blank:]]*原始邮件[[:blank:]]*-{2,}/i,
   ]
 
   EMBEDDED_REGEXES = [
@@ -110,6 +137,7 @@ class EmbeddedEmailMatcher
     ON_DATE_WROTE_SOMEONE_REGEXES,
     DATE_SOMEONE_WROTE_REGEXES,
     DATE_SOMEONE_EMAIL_REGEX,
+    SOMEONE_WROTE_ON_DATE_REGEXES,
     ISO_DATE_SOMEONE_REGEX,
     SOMEONE_VIA_SOMETHING_WROTE_REGEXES,
     SOMEONE_EMAIL_WROTE_REGEX,

data/lib/email_reply_trimmer/empty_line_matcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class EmptyLineMatcher
 
   def self.match?(line)

data/lib/email_reply_trimmer/quote_matcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class QuoteMatcher
 
   def self.match?(line)

data/lib/email_reply_trimmer/signature_matcher.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 class SignatureMatcher
 
   # Envoyé depuis mon iPhone
@@ -15,22 +16,36 @@ class SignatureMatcher
   # 從我的 iPhone 傳送
   SIGNATURE_REGEXES = [
     # Chinese
-    /^[[:blank:]>]*從我的 iPhone 傳送/i,
+    /^[[:blank:]]*從我的 iPhone 傳送/i,
     # English
-    /^[[:blank:]>]*[[:word:]]+ from mobile/i,
-    /^[[:blank:]>]*[\(<]*sent (?:from|via|with|by) .+[\)>]*/i,
-    /^[[:blank:]>]*from my .{1,20}/i, # don't match too much
+    /^[[:blank:]]*[[:word:]]+ from mobile/i,
+    /^[[:blank:]]*[\(<]*Sent (from|via|with|by) .+[\)>]*/i,
+    /^[[:blank:]]*From my .{1,20}/i,
+    /^[[:blank:]]*Get Outlook for /i,
     # French
-    /^[[:blank:]>]*Envoyé depuis mon .+/i,
+    /^[[:blank:]]*Envoyé depuis (mon|Yahoo Mail)/i,
     # German
-    /^[[:blank:]>]*Von meinem .+ gesendet/i,
-    /^[[:blank:]>]*Diese Nachricht wurde von .+ gesendet/i,
+    /^[[:blank:]]*Von meinem .+ gesendet/i,
+    /^[[:blank:]]*Diese Nachricht wurde von .+ gesendet/i,
+    # Italian
+    /^[[:blank:]]*Inviato da /i,
+    # Norwegian
+    /^[[:blank:]]*Sendt fra min /i,
+    # Portuguese
+    /^[[:blank:]]*Enviado do meu /i,
     # Spanish
-    /^[[:blank:]>]*Enviado desde mi .+/i,
+    /^[[:blank:]]*Enviado desde mi /i,
+    # Dutch
+    /^[[:blank:]]*Verzonden met /i,
+    /^[[:blank:]]*Verstuurd vanaf mijn /i,
+    # Swedish
+    /^[[:blank:]]*från min /i,
   ]
 
   def self.match?(line)
-    SIGNATURE_REGEXES.any? { |r| line =~ r }
+    # remove any markdown links
+    stripped = line.gsub(/\[([^\]]+)\]\([^\)]+\)/) { $1 }
+    SIGNATURE_REGEXES.any? { |r| stripped =~ r }
   end
 
 end