From cc9e7e284fc31e2bf81391f6e2eb90ae708b3b71 Mon Sep 17 00:00:00 2001
From: Dan Menzies <dan.menzies@gmail.com>
Date: Wed, 13 Feb 2019 10:36:32 +0000
Subject: [PATCH 1/5] Added JetBrains WebStorm config file to ignore list

---
 .gitignore | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index 667a66c..002d6d7 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,4 +4,5 @@ yarn.lock
 config.json
 npm-debug.log
 *.sublime-*
-.DS_Store
\ No newline at end of file
+.DS_Store
+/.idea

From cce1c723731e01412d76865cfe128a4797c07f3d Mon Sep 17 00:00:00 2001
From: Dan Menzies <dan.menzies@gmail.com>
Date: Wed, 13 Feb 2019 11:13:35 +0000
Subject: [PATCH 2/5] Added contributor's note for Jerram Digital

---
 package.json | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/package.json b/package.json
index 973a430..1aef2c1 100644
--- a/package.json
+++ b/package.json
@@ -51,6 +51,10 @@
     {
       "name": "g-div",
       "web": "https://github.com/g-div"
+    },
+    {
+      "name": "Jerram Digital",
+      "web": "https://jerram.co.uk/"
     }
   ],
   "devDependencies": {

From b81892e3f38027a99c385600be9100b83d2459b8 Mon Sep 17 00:00:00 2001
From: Dan Menzies <dan.menzies@gmail.com>
Date: Wed, 13 Feb 2019 12:29:00 +0000
Subject: [PATCH 3/5] Added real comments file to ignore list

---
 .gitignore | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.gitignore b/.gitignore
index 002d6d7..4168d8b 100644
--- a/.gitignore
+++ b/.gitignore
@@ -6,3 +6,4 @@ npm-debug.log
 *.sublime-*
 .DS_Store
 /.idea
+/wordpress-comments.xml

From 5ed6e9f74957e2b2ecddd67a3dd539421d7e9a69 Mon Sep 17 00:00:00 2001
From: Dan Menzies <dan.menzies@gmail.com>
Date: Wed, 13 Feb 2019 15:34:46 +0000
Subject: [PATCH 4/5] Prevent erorrs from being thrown, when an existing user
 is queried during import

---
 src/db/queries.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/db/queries.js b/src/db/queries.js
index e2b772a..3a01f01 100644
--- a/src/db/queries.js
+++ b/src/db/queries.js
@@ -54,7 +54,7 @@ module.exports = {
        WHERE provider = ? AND provider_id = ?`,
 
   create_user:
-      `INSERT INTO user
+      `INSERT OR IGNORE INTO user
       (provider, provider_id, display_name, name, url,
        created_at, trusted, blocked)
       VALUES (?, ?, ?, ?, ?, datetime(), ?, 0)`,

From ab99b820a4ce045f58162c38d1132debdb4928bb Mon Sep 17 00:00:00 2001
From: Dan Menzies <dan.menzies@gmail.com>
Date: Thu, 21 Feb 2019 11:15:36 +0000
Subject: [PATCH 5/5] Updated WP Importer to assign user_id to source_id field,
 instead of the author's Display Name

---
 src/importer.js | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/importer.js b/src/importer.js
index 1164fdc..d1e5bd0 100644
--- a/src/importer.js
+++ b/src/importer.js
@@ -38,9 +38,15 @@ async function parse(file) {
 }
 
 function getWPAuthor(comment) {
+
+    let provider_id = comment['wp:comment_author'];
+    if (comment['wp:comment_user_id'].toString().length && !isNaN(comment['wp:comment_user_id'] * 1)) {
+        provider_id = comment['wp:comment_user_id']
+    }
+
     return [
         'wordpress',
-        comment['wp:comment_author'],
+        provider_id,
         comment['wp:comment_author'],
         comment['wp:comment_author'],
         0