From 528fbfb017993f852503baf6cb143e258aa34656 Mon Sep 17 00:00:00 2001
From: Ilya Chesnokov <ilya.chesnokov@protonmail.com>
Date: Fri, 25 Oct 2019 14:25:03 +0300
Subject: [PATCH] Switch back to using upstream email-address library (#998)

---
 npm-shrinkwrap.json | 5 +++--
 package.json        | 2 +-
 src/util.js         | 2 +-
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/npm-shrinkwrap.json b/npm-shrinkwrap.json
index 444a4b84..8ecd8cf4 100644
--- a/npm-shrinkwrap.json
+++ b/npm-shrinkwrap.json
@@ -2204,8 +2204,9 @@
       }
     },
     "email-addresses": {
-      "version": "github:openpgpjs/email-addresses#686743c6452b44bafcd06d47db7f36ddf3f3f118",
-      "from": "github:openpgpjs/email-addresses#686743c6452b44bafcd06d47db7f36ddf3f3f118",
+      "version": "3.1.0",
+      "resolved": "https://registry.npmjs.org/email-addresses/-/email-addresses-3.1.0.tgz",
+      "integrity": "sha512-k0/r7GrWVL32kZlGwfPNgB2Y/mMXVTq/decgLczm/j34whdaspNrZO8CnXPf1laaHxI6ptUlsnAxN+UAPw+fzg==",
       "dev": true
     },
     "encodeurl": {
diff --git a/package.json b/package.json
index 1c90ef3c..8a682dbb 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "seek-bzip": "github:openpgpjs/seek-bzip#6187fc025851d35c4e104a25ea15a10b9b8d6f7d",
     "tweetnacl": "github:openpgpjs/tweetnacl-js#1ef755f2b252a3e328ac739848d00e0dad76be2d",
     "web-stream-tools": "github:openpgpjs/web-stream-tools#dc4b05e8a272b45819233f3df735423432beacfc",
-    "email-addresses": "github:openpgpjs/email-addresses#686743c6452b44bafcd06d47db7f36ddf3f3f118"
+    "email-addresses": "3.1.0"
   },
   "dependencies": {
     "asn1.js": "^5.0.0",
diff --git a/src/util.js b/src/util.js
index 710af8c1..cf766a35 100644
--- a/src/util.js
+++ b/src/util.js
@@ -677,7 +677,7 @@ export default {
       throw new Error('User id string is too long');
     }
     try {
-      const { name, address: email, comments } = emailAddresses.parseOneAddress(userid);
+      const { name, address: email, comments } = emailAddresses.parseOneAddress({ input: userid, atInDisplayName: true });
       return { name, email, comment: comments.replace(/^\(|\)$/g, '') };
     } catch(e) {
       throw new Error('Invalid user id format');