From 2fbe708b840872306196c98016e4ff0c61a116f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Bo=C3=ABs?= <fboes@3960.org>
Date: Tue, 21 Aug 2018 07:36:11 +0200
Subject: [PATCH 1/5] Improve ES linting for arrow functions

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

diff --git a/package.json b/package.json
index 8655e58a..85be7091 100644
--- a/package.json
+++ b/package.json
@@ -78,6 +78,8 @@
     },
     "globals": {},
     "rules": {
+      "arrow-parens": ["error", "always"],
+      "arrow-body-style": ["error", "always"],
       "brace-style": 2,
       "comma-dangle": [
         2,

From 9f6d7734e857c9f176391df774c8aaa3ffc6d7c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Bo=C3=ABs?= <fboes@3960.org>
Date: Thu, 23 Aug 2018 19:29:04 +0200
Subject: [PATCH 2/5] Update NPM package `autoprefixer@9.1.3` &
 `inquirer@6.2.0`

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

diff --git a/package.json b/package.json
index 85be7091..b5a361d2 100644
--- a/package.json
+++ b/package.json
@@ -28,7 +28,7 @@
     "static site generator"
   ],
   "devDependencies": {
-    "autoprefixer": "^9.0.0",
+    "autoprefixer": "^9.1.3",
     "beepbeep": "^1.2.2",
     "gulp": "^3.9.1",
     "gulp-eslint": "^5.0.0",
@@ -60,7 +60,7 @@
     "glob": "^7.0.5",
     "gm": "^1.23.0",
     "handlebars": "^4.0.11",
-    "inquirer": "^6.0.0",
+    "inquirer": "^6.2.0",
     "inquirer-datepicker-prompt": "^0.4.2",
     "js-yaml": "^3.11.0",
     "marked": "^0.5.0",
@@ -78,8 +78,14 @@
     },
     "globals": {},
     "rules": {
-      "arrow-parens": ["error", "always"],
-      "arrow-body-style": ["error", "always"],
+      "arrow-parens": [
+        "error",
+        "always"
+      ],
+      "arrow-body-style": [
+        "error",
+        "always"
+      ],
       "brace-style": 2,
       "comma-dangle": [
         2,

From 4a59485b811fed3e66cbdd2f29fa31cf0a6b104b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Bo=C3=ABs?= <fboes@3960.org>
Date: Thu, 23 Aug 2018 19:29:28 +0200
Subject: [PATCH 3/5] Add feedback instructions to `README.md`

---
 README.md | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/README.md b/README.md
index d134956e..d47465d2 100644
--- a/README.md
+++ b/README.md
@@ -53,6 +53,11 @@ Update
 1. To find out if your Blogophon needs updating, run `npm outdated -g blogophon`.
 2. Run `npm update -g blogophon` to update your local Blogophon installation to the latest stable release.
 
+Feedback
+--------
+
+In case of issues or suggestions for the Blogophon consider using [Blogophon's issue board](https://github.com/fboes/blogophon/issues).
+
 Status
 -------
 

From 12e7ca9db677f4ad5301b682087e4f4c60824082 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Bo=C3=ABs?= <fboes@3960.org>
Date: Thu, 23 Aug 2018 19:29:54 +0200
Subject: [PATCH 4/5] Upgrade Twitter links in `default` template to https

---
 htdocs/themes/default/templates/partials/sidebar.html | 2 +-
 htdocs/themes/default/templates/post.html             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/htdocs/themes/default/templates/partials/sidebar.html b/htdocs/themes/default/templates/partials/sidebar.html
index 6e5d19d5..990a93a9 100644
--- a/htdocs/themes/default/templates/partials/sidebar.html
+++ b/htdocs/themes/default/templates/partials/sidebar.html
@@ -5,7 +5,7 @@ <h3>{{#i18n}}Links{{/i18n}}</h3>
   <ul>
     <li><a href="{{config.basePath}}tagged/">{{#i18n}}All tags{{/i18n}}</a></li>
     {{#if config.twitterAccount}}
-      <li><a href="http://twitter.com/{{config.twitterAccount}}" rel="me">{{#i18n}}Twitter feed{{/i18n}}</a></li>
+      <li><a href="https://twitter.com/{{config.twitterAccount}}" rel="me">{{#i18n}}Twitter feed{{/i18n}}</a></li>
     {{/if}}
   </ul>
 </section>
diff --git a/htdocs/themes/default/templates/post.html b/htdocs/themes/default/templates/post.html
index 92be84a2..db22575a 100644
--- a/htdocs/themes/default/templates/post.html
+++ b/htdocs/themes/default/templates/post.html
@@ -111,7 +111,7 @@ <h1>
             </div>
             <footer class="meta">
               {{#if ../config.twitterAccount}}
-                <p><a href="http://twitter.com/{{../config.twitterAccount}}" rel="me">{{#i18n}}Comment &amp; discuss on Twitter{{/i18n}}</a></p>
+                <p><a href="https://twitter.com/{{../config.twitterAccount}}" rel="me">{{#i18n}}Comment &amp; discuss on Twitter{{/i18n}}</a></p>
               {{/if}}
               {{#if meta.Modified}}
                 <p>{{#i18n}}Last modified{{/i18n}} <time datetime="{{dateFormat meta.Modified 'iso'}}" itemprop="dateModified" class="modified dt-updated">{{dateFormat meta.Modified 'locale' meta.Language}}</time></p>

From 088e95e72c3b8618e965fd7e246d73704a3cadde Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Frank=20Bo=C3=ABs?= <fboes@3960.org>
Date: Thu, 23 Aug 2018 19:37:43 +0200
Subject: [PATCH 5/5] Add black list for Webmentions, ignoring Wikipedia, Steam
 and Github by default

---
 lib/helpers/webmentions.js | 14 ++++++++++----
 test/webmentions.js        | 23 ++++++++++++++++++-----
 2 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/lib/helpers/webmentions.js b/lib/helpers/webmentions.js
index 56f6f7a8..92310514 100644
--- a/lib/helpers/webmentions.js
+++ b/lib/helpers/webmentions.js
@@ -12,12 +12,15 @@ const querystring = require('querystring');
  * @see    http://alistapart.com/article/webmentions-enabling-better-communication-on-the-internet
  * @param  {Boolean} useConsole [description]
  * @param  {String}  ua         [description]
+ * @param  {Object}  options    Like `blacklist`
  * @return {Object}             [description]
  */
-const webmentions = function(useConsole = false, ua = 'Blogophon\'s Webmention Adapter') {
+const webmentions = function(useConsole = false, ua = 'Blogophon\'s Webmention Adapter', options = {}) {
   const external = {};
   const internal = {};
 
+  options.blacklist = options.blacklist || /[/.](wikipedia\.org|wikia\.com|steampowered\.com|github\.com)/;
+
   /**
    * Send Webmentions to all external URLs found in article
    * @param  {Post}   post [description]
@@ -46,11 +49,14 @@ const webmentions = function(useConsole = false, ua = 'Blogophon\'s Webmention A
       const links = post.html.match(/<(?:a|link)[^>]+href="(https?:\/\/[^"]+)"[^>]*>/g) || [];
       links.forEach(function(all) {
         if (!all.match(/(class|rel)="[^"]*nomention/)) {
-          externalUrls.push(all.replace(/^.*href="([^"]*)".*$/, '$1'));
+          let possibleUrl = all.replace(/^.*href="([^"]*)".*$/, '$1');
+          if (internal.isExternalUrl(possibleUrl)) {
+            externalUrls.push(possibleUrl);
+          }
         }
       });
     }
-    externalUrls = externalUrls.filter(function(value, index, self) {
+    externalUrls = externalUrls.filter((value, index, self) => {
       return self.indexOf(value) === index;
     });
     return externalUrls;
@@ -62,7 +68,7 @@ const webmentions = function(useConsole = false, ua = 'Blogophon\'s Webmention A
    * @return {Boolean}     [description]
    */
   internal.isExternalUrl = function(url) {
-    return url.match(/^https?:\/\//);
+    return url.match(/^https?:\/\//) && (!options.blacklist || !url.match(options.blacklist));
   };
 
   /**
diff --git a/test/webmentions.js b/test/webmentions.js
index d61b1305..cb0656fc 100644
--- a/test/webmentions.js
+++ b/test/webmentions.js
@@ -3,8 +3,8 @@
 const assert = require('assert');
 const webmentions = require('../lib/helpers/webmentions')();
 
-describe('Webmentions', function() {
-  it('should find external URLs', function() {
+describe('Webmentions', () => {
+  it('should find external URLs', () => {
     let externalUrls;
 
     externalUrls = webmentions.findExternalLinks({});
@@ -68,7 +68,7 @@ describe('Webmentions', function() {
     //console.log(externalUrls);
   });
 
-  it('should ignore some external URLs', function() {
+  it('should ignore some external URLs', () => {
     let externalUrls;
 
     externalUrls = webmentions.findExternalLinks({
@@ -92,6 +92,19 @@ describe('Webmentions', function() {
     assert.equal(externalUrls[0], 'https://www.example.com/');
   });
 
+  it('should ignore external URLs from the black list', () => {
+    let externalUrls;
+
+    externalUrls = webmentions.findExternalLinks({
+      meta: {
+        hasExternalLink: true,
+        Link: 'https://example.wikipedia.org/external2'
+      },
+      html: `I am a <a href="https://example.wikipedia.org/external">Link</a>.`
+    });
+    assert.equal(externalUrls.length, 0);
+  });
+
   const discoverUrls = [
     'https://webmention.rocks/test/1',
     'https://webmention.rocks/test/2',
@@ -122,7 +135,7 @@ describe('Webmentions', function() {
       this.timeout(10000);
       webmentions
         .sendMentions('https://3960.org/sandbox/webmention.php', [url])
-        .then(function() {
+        .then(() => {
           // if (result >= 400) {
           //   result.forEach(function(r) {
           //     console.log(r, url);
@@ -130,7 +143,7 @@ describe('Webmentions', function() {
           // }
           assert.ok(true);
         })
-        .catch(function() {
+        .catch(() => {
           assert.ok(false);
         })
         .then(done, done)