Merged 'github_enterprise' recipe into 'github' with the extra bits.

7 files changed, 21 insertions, 53 deletions

diff --git a/recipes/github/index.js b/recipes/github/index.js
index 23607bd..dfcd7d1 100644
--- a/recipes/github/index.js
+++ b/recipes/github/index.js
@@ -1 +1,19 @@
-module.exports = Ferdi => Ferdi;
+module.exports = Ferdi => class GitHub extends Ferdi {
+  async validateUrl(url) {
+    try {
+      const resp = await window.fetch(`${url}/api/v3`, {
+        method: 'GET',
+        headers: {
+          'Content-Type': 'application/json',
+          Accept: 'application/vnd.github.v3+json',
+        },
+      });
+      // doc: https://developer.github.com/enterprise/2.17/v3/#current-version
+      return resp.status.toString().startsWith('2');
+    } catch (err) {
+      console.error(err);
+    }
+
+    return false;
+  }
+};
diff --git a/recipes/github/package.json b/recipes/github/package.json
index 2ed611e..573f743 100644
--- a/recipes/github/package.json
+++ b/recipes/github/package.json
@@ -1,10 +1,11 @@
 {
   "id": "github",
   "name": "GitHub",
-  "version": "2.1.1",
+  "version": "2.2.0",
   "license": "MIT",
   "config": {
     "serviceURL": "https://github.com/notifications",
+    "hasCustomUrl": true,
     "hasIndirectMessages": true
   }
 }
diff --git a/recipes/github_entreprise/LICENSE b/recipes/github_entreprise/LICENSE
deleted file mode 100644
index 33926c0..0000000
--- a/recipes/github_entreprise/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-MIT License
-
-Copyright (c) 2017 Sudhir Ganesan
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
diff --git a/recipes/github_entreprise/icon.svg b/recipes/github_entreprise/icon.svg
deleted file mode 100644
index 87f6f80..0000000
--- a/recipes/github_entreprise/icon.svg
+++ /dev/null
@@ -1 +0,0 @@
-<svg height="1024" width="1024" xmlns="http://www.w3.org/2000/svg"><path d="M512 0C229.25 0 0 229.25 0 512c0 226.25 146.688 418.125 350.156 485.812 25.594 4.688 34.938-11.125 34.938-24.625 0-12.188-.469-52.562-.719-95.312C242 908.812 211.906 817.5 211.906 817.5c-23.312-59.125-56.844-74.875-56.844-74.875-46.531-31.75 3.53-31.125 3.53-31.125 51.406 3.562 78.47 52.75 78.47 52.75 45.688 78.25 119.875 55.625 149 42.5 4.654-33 17.904-55.625 32.5-68.375-113.656-12.937-233.218-56.875-233.218-253.063 0-55.938 19.969-101.562 52.656-137.406-5.219-13-22.844-65.094 5.062-135.562 0 0 42.938-13.75 140.812 52.5 40.812-11.406 84.594-17.031 128.125-17.219 43.5.188 87.312 5.875 128.188 17.281 97.688-66.312 140.688-52.5 140.688-52.5 28 70.531 10.375 122.562 5.125 135.5 32.812 35.844 52.625 81.469 52.625 137.406 0 196.688-119.75 240-233.812 252.688 18.438 15.875 34.75 47 34.75 94.75 0 68.438-.688 123.625-.688 140.5 0 13.625 9.312 29.562 35.25 24.562C877.438 930 1024 738.125 1024 512 1024 229.25 794.75 0 512 0z"/></svg>
\ No newline at end of file
diff --git a/recipes/github_entreprise/index.js b/recipes/github_entreprise/index.js
deleted file mode 100644
index f45d240..0000000
--- a/recipes/github_entreprise/index.js
+++ /dev/null
@@ -1,19 +0,0 @@
-module.exports = Ferdi => class GitHubEnterprise extends Ferdi {
-  async validateUrl(url) {
-    try {
-      const resp = await window.fetch(`${url}/api/v3`, {
-        method: 'GET',
-        headers: {
-          'Content-Type': 'application/json',
-          Accept: 'application/vnd.github.v3+json',
-        },
-      });
-      // doc: https://developer.github.com/enterprise/2.17/v3/#current-version
-      return resp.status.toString().startsWith('2');
-    } catch (err) {
-      console.error(err);
-    }
-
-    return false;
-  }
-};
diff --git a/recipes/github_entreprise/package.json b/recipes/github_entreprise/package.json
deleted file mode 100644
index e40d6d3..0000000
--- a/recipes/github_entreprise/package.json
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  "id": "github_entreprise",
-  "name": "GitHub Enterprise",
-  "version": "1.1.0",
-  "license": "MIT",
-  "config": {
-    "serviceURL": "https://github.mycompany.com/",
-    "hasCustomUrl": true
-  }
-}
diff --git a/recipes/github_entreprise/webview.js b/recipes/github_entreprise/webview.js
deleted file mode 100644
index e69de29..0000000
--- a/recipes/github_entreprise/webview.js
+++ /dev/null