feat(references): remove references that already appear in the subject

Also simplifies the regex of GitHub issue and user.

Resolves conventional-changelog/standard-version#70

Author: stevemao

index.js

@@ -43,6 +43,7 @@ function issueUrl() {
 var writerOpts = {
   transform: function(commit) {
     var discard = true;
+    var issues = [];
 
     commit.notes.forEach(function(note) {
       note.title = 'BREAKING CHANGES';
@@ -83,13 +84,25 @@ var writerOpts = {
       var url = issueUrl();
       if (url) {
         // GitHub issue URLs.
-        commit.subject = commit.subject.replace(/( ?)#([0-9]+)(\b|^)/g, '$1[#$2](' + url + '$2)$3');
+        commit.subject = commit.subject.replace(/#([0-9]+)/g, function(_, issue) {
+          issues.push(issue);
+          return '[#' + issue + '](' + url + issue + ')';
+        });
       }
       // GitHub user URLs.
-      commit.subject = commit.subject.replace(/( ?)@([a-zA-Z0-9_]+)(\b|^)/g, '$1[@$2](https://github.com/$2)$3');
+      commit.subject = commit.subject.replace(/@([a-zA-Z0-9_]+)/g, '[@$1](https://github.com/$1)');
       commit.subject = commit.subject;
     }
 
+    // remove references that already appear in the subject
+    commit.references = commit.references.filter(function(reference) {
+      if (issues.indexOf(reference.issue) === -1) {
+        return true;
+      }
+
+      return false;
+    });
+
     return commit;
   },
   groupBy: 'type',

test/test.js

@@ -20,7 +20,7 @@ describe('angular preset', function() {
     // fix this once https://github.com/arturadib/shelljs/issues/175 is solved
     child.exec('git commit -m"feat: amazing new module\n\nBREAKING CHANGE: Not backward compatible." --allow-empty', function() {
       gitDummyCommit(['fix(compile): avoid a bug', 'BREAKING CHANGE: The Change is huge.']);
-      gitDummyCommit('perf(ngOptions): make it faster closes #1, #2');
+      gitDummyCommit(['perf(ngOptions): make it faster', ' closes #1, #2']);
       gitDummyCommit('revert(ngOptions): bad commit');
       gitDummyCommit('fix(*): oops');
 
@@ -79,6 +79,23 @@ describe('angular preset', function() {
       }));
   });
 
+  it('should remove the issues that already appear in the subject', function(done) {
+    gitDummyCommit(['feat(awesome): fix #88']);
+
+    conventionalChangelogCore({
+      config: preset
+    })
+      .on('error', function(err) {
+        done(err);
+      })
+      .pipe(through(function(chunk) {
+        chunk = chunk.toString();
+        expect(chunk).to.include('[#88](https://github.com/conventional-changelog/conventional-changelog-angular/issues/88)');
+        expect(chunk).to.not.include('closes [#88](https://github.com/conventional-changelog/conventional-changelog-angular/issues/88)');
+        done();
+      }));
+  });
+
   it('should replace @username with GitHub user URL', function(done) {
     gitDummyCommit(['feat(awesome): issue brought up by @bcoe! on Friday']);