From ccae357ad2c8a3788a248075644cf27d312f226b Mon Sep 17 00:00:00 2001
From: Antoine Caron <Slashgear@users.noreply.github.com>
Date: Mon, 8 Jul 2019 15:30:14 +0200
Subject: [PATCH] :sparkles: Filter social network inputs to remove potential @
 (#93)

---
 .all-contributorsrc                  | 11 +++++++++++
 README.md                            |  1 +
 src/questions/author-github.js       |  5 ++++-
 src/questions/author-github.spec.js  |  3 ++-
 src/questions/author-twitter.js      |  5 ++++-
 src/questions/author-twitter.spec.js |  3 ++-
 src/utils.js                         | 11 ++++++++++-
 src/utils.spec.js                    | 13 ++++++++++++-
 8 files changed, 46 insertions(+), 6 deletions(-)

diff --git a/.all-contributorsrc b/.all-contributorsrc
index 55d09e2..d0d38c4 100644
--- a/.all-contributorsrc
+++ b/.all-contributorsrc
@@ -96,6 +96,17 @@
       "contributions": [
         "code"
       ]
+    },
+    {
+      "login": "Slashgear",
+      "name": "Antoine Caron",
+      "avatar_url": "https://avatars0.githubusercontent.com/u/6263857?v=4",
+      "profile": "http://slashgear.github.io/",
+      "contributions": [
+        "code",
+        "test",
+        "ideas"
+      ]
     }
   ],
   "contributorsPerLine": 7,
diff --git a/README.md b/README.md
index 4924585..1fc5497 100644
--- a/README.md
+++ b/README.md
@@ -105,6 +105,7 @@ Feel free to check [issues page](https://github.com/kefranabg/readme-md-generato
   <tr>
     <td align="center"><a href="https://github.com/hgb123"><img src="https://avatars0.githubusercontent.com/u/18468577?v=4" width="75px;" alt="Bao Ho"/><br /><sub><b>Bao Ho</b></sub></a><br /><a href="https://github.com/kefranabg/readme-md-generator/commits?author=hgb123" title="Code">💻</a> <a href="https://github.com/kefranabg/readme-md-generator/commits?author=hgb123" title="Tests">⚠️</a></td>
     <td align="center"><a href="https://github.com/zizizi17"><img src="https://avatars0.githubusercontent.com/u/10571073?v=4" width="75px;" alt="Sasha Semanyuk"/><br /><sub><b>Sasha Semanyuk</b></sub></a><br /><a href="https://github.com/kefranabg/readme-md-generator/commits?author=zizizi17" title="Code">💻</a></td>
+    <td align="center"><a href="http://slashgear.github.io/"><img src="https://avatars0.githubusercontent.com/u/6263857?v=4" width="75px;" alt="Antoine Caron"/><br /><sub><b>Antoine Caron</b></sub></a><br /><a href="https://github.com/kefranabg/readme-md-generator/commits?author=Slashgear" title="Code">💻</a> <a href="https://github.com/kefranabg/readme-md-generator/commits?author=Slashgear" title="Tests">⚠️</a> <a href="#ideas-Slashgear" title="Ideas, Planning, & Feedback">🤔</a></td>
   </tr>
 </table>
 
diff --git a/src/questions/author-github.js b/src/questions/author-github.js
index 51f0e0b..6648b43 100644
--- a/src/questions/author-github.js
+++ b/src/questions/author-github.js
@@ -1,6 +1,9 @@
+const { cleanSocialNetworkUsername } = require('../utils')
+
 module.exports = projectInfos => ({
   type: 'input',
   message: '👤  Github username (use empty value to skip)',
   name: 'authorGithubUsername',
-  default: projectInfos.githubUsername
+  default: projectInfos.githubUsername,
+  filter: cleanSocialNetworkUsername
 })
diff --git a/src/questions/author-github.spec.js b/src/questions/author-github.spec.js
index c51726b..06d1bae 100644
--- a/src/questions/author-github.spec.js
+++ b/src/questions/author-github.spec.js
@@ -11,7 +11,8 @@ describe('askAuthorGithub', () => {
       type: 'input',
       message: '👤  Github username (use empty value to skip)',
       name: 'authorGithubUsername',
-      default: githubUsername
+      default: githubUsername,
+      filter: expect.any(Function)
     })
   })
 })
diff --git a/src/questions/author-twitter.js b/src/questions/author-twitter.js
index a9d4ffa..145d5d9 100644
--- a/src/questions/author-twitter.js
+++ b/src/questions/author-twitter.js
@@ -1,5 +1,8 @@
+const { cleanSocialNetworkUsername } = require('../utils')
+
 module.exports = () => ({
   type: 'input',
   message: '🐦  Twitter username (use empty value to skip)',
-  name: 'authorTwitterUsername'
+  name: 'authorTwitterUsername',
+  filter: cleanSocialNetworkUsername
 })
diff --git a/src/questions/author-twitter.spec.js b/src/questions/author-twitter.spec.js
index 287b144..9e77a15 100644
--- a/src/questions/author-twitter.spec.js
+++ b/src/questions/author-twitter.spec.js
@@ -7,7 +7,8 @@ describe('askAuthorTwitter', () => {
     expect(result).toEqual({
       type: 'input',
       message: '🐦  Twitter username (use empty value to skip)',
-      name: 'authorTwitterUsername'
+      name: 'authorTwitterUsername',
+      filter: expect.any(Function)
     })
   })
 })
diff --git a/src/utils.js b/src/utils.js
index 967feff..cb4d059 100644
--- a/src/utils.js
+++ b/src/utils.js
@@ -96,6 +96,14 @@ const getDefaultAnswers = questions =>
     {}
   )
 
+/**
+ * Clean social network username by removing the @ prefix
+ *
+ * @param input social network username input
+ * @returns {*} input without the prefix
+ */
+const cleanSocialNetworkUsername = input => input.replace(/^@/, '')
+
 module.exports = {
   getPackageJson,
   showEndMessage,
@@ -103,5 +111,6 @@ module.exports = {
   END_MSG,
   BOXEN_CONFIG,
   getDefaultAnswers,
-  getDefaultAnswer
+  getDefaultAnswer,
+  cleanSocialNetworkUsername
 }
diff --git a/src/utils.spec.js b/src/utils.spec.js
index 87a3c32..047f01a 100644
--- a/src/utils.spec.js
+++ b/src/utils.spec.js
@@ -14,7 +14,8 @@ const {
   END_MSG,
   BOXEN_CONFIG,
   getDefaultAnswer,
-  getDefaultAnswers
+  getDefaultAnswers,
+  cleanSocialNetworkUsername
 } = require('./utils')
 
 jest.mock('load-json-file')
@@ -195,4 +196,14 @@ describe('utils', () => {
       })
     })
   })
+
+  describe('cleanSocialNetworkUsername', () => {
+    it('should remove prefixed @', () => {
+      expect(cleanSocialNetworkUsername('@Slashgear_')).toEqual('Slashgear_')
+    })
+
+    it('should return the same string when string is not prefixed', () => {
+      expect(cleanSocialNetworkUsername('Slashgear_')).toEqual('Slashgear_')
+    })
+  })
 })