Merge pull request #220 from BetterDiscord/development

Merge Development
BetterDiscord · Oct 19, 2021 · 1b020b8 · 1b020b8
2 parents 1bf733d + 97f5037
commit 1b020b8
Show file tree

Hide file tree

Showing 28 changed files with 2,622 additions and 2,158 deletions.
diff --git a/README.md b/README.md
@@ -65,7 +65,8 @@ These will link you to the latest builds found in the [releases](https://github.
 
 ## Prerequisites
 - [Git](https://git-scm.com)
-- [Node.js](https://nodejs.org/en/) with `npm`.
+- [Node.js](https://nodejs.org/en/)
+- [yarn](https://yarnpkg.com)
 - Command line of your choice.
 
 ## Building
@@ -79,27 +80,27 @@ This will create a local copy of this repository and navigate you to the root fo
 ### 2: Install Dependencies
 Run this command at the root folder to install dependencies:
 ```ps
-npm i
+yarn install
 ```
 
 ### 3: Run Build Script
 To run the installer in development mode, simply run the following command:
 ```ps
-npm run dev
+yarn dev
 ```
 
 ## Additional Scripts
 
 ### Linting
 This project uses [ESLint](https://eslint.org/). Run this command to lint your changes:
 ```ps
-npm run lint
+yarn lint
 ```
 
 ### Compiling & Distribution
 
 ```ps
-npm run dist
+yarn dist
 ```
 
 ---

diff --git a/assets/license.txt b/assets/license.txt
@@ -1,7 +1,28 @@
-Copyright (c) 2017 - Present BetterDiscord
+End-User License Agreement for BetterDiscord
 
-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:
+PLEASE READ THIS AGREEMENT CAREFULLY. IT CONTAINS IMPORTANT TERMS THAT AFFECT YOU AND YOUR USE OF THE SOFTWARE. BY INSTALLING, COPYING OR USING THE SOFTWARE, YOU AGREE TO BE BOUND BY THE TERMS OF THIS AGREEMENT. IF YOU DO NOT AGREE TO THESE TERMS, DO NOT INSTALL, COPY, OR USE THE SOFTWARE.
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+This End-User License Agreement (EULA) is a legal agreement between you--either an individual or a single entity--and the author(s) of this Software for the product identified above, which includes computer software and may include associated media, and online or electronic documentation ("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.
+By installing, copying, or otherwise using the Software, you agree to be bounded by the terms of this EULA.
+If you do not agree to the terms of this EULA, do not install or use the Software.
+
+
+1. GRANT OF LICENSE.
+This EULA grants you a non-exclusive, non-sublicensable, non-transferable license to install and use the Software. You may install and use an unlimited number of copies of the Software.
+
+You may reproduce and distribute an unlimited number of copies of the Software; provided that each copy shall be a true and complete copy, including all copyright and trademark notices.
+
+Without prejudice to any other rights, the author(s) of this Software may terminate this EULA if you fail to comply with the terms and conditions of this EULA. In such event, you must destroy all copies of the Software and all of its component parts.
+
+
+2. COPYRIGHT.
+All title and copyrights in and to the Software (including but not limited to any images, libraries, and examples incorporated into the Software), the accompanying documentation, and any copies of the Software are owned by the author(s) of this Software.
+
+
+3. NO WARRANTIES.
+The author(s) of this Software expressly disclaims any warranty for the Software. The Software and any related documentation is provided "as is" without warranty of any kind, either express or implied, including, without limitation, the implied warranties or merchantability, fitness for a particular purpose, or noninfringement. The entire risk arising out of use or performance of the Software remains with you.
+
+
+4. NO LIABILITY FOR DAMAGES.
+In no event shall the author(s) of this Software be liable for any special, consequential, incidental or indirect damages whatsoever (including, without limitation, damages for loss of business profits, business interruption, loss of business information, or any other pecuniary loss) arising out of the use of or inability to use this product, even if the author(s) of this Software is aware of the possibility of such damages and known defects.
diff --git a/package.json b/package.json
@@ -15,6 +15,7 @@
     "dist:dir": "yarn dist --dir -c.compression=store -c.mac.identity=null"
   },
   "dependencies": {
+    "semver": "^7.3.5",
     "source-map-support": "^0.5.16"
   },
   "devDependencies": {
@@ -26,8 +27,8 @@
     "eslint-plugin-svelte3": "^3.1.2",
     "find-process": "^1.4.4",
     "focus-visible": "^5.2.0",
-    "phin": "^3.5.1",
-    "svelte": "^3.35.0",
+    "phin": "^3.6.0",
+    "svelte": "^3.38.2",
     "svelte-loader": "^3.0.0",
     "svelte-spa-router": "^3.1.0",
     "tree-kill": "^1.2.2",
@@ -39,7 +40,6 @@
     "productName": "BetterDiscord",
     "copyright": "Copyright © 2021 BetterDiscord",
     "afterAllArtifactBuild": "scripts/fixmac.js",
-
     "win": {
       "artifactName": "${productName}-Windows.${ext}",
       "icon": "assets/icon.ico",
@@ -54,7 +54,6 @@
       "requestExecutionLevel": "user",
       "useZip": true
     },
-
     "mac": {
       "artifactName": "${productName}-Mac.${ext}",
       "icon": "assets/icon.icns",
@@ -66,7 +65,6 @@
         ]
       }
     },
-
     "linux": {
       "artifactName": "${productName}-Linux.${ext}",
       "category": "Utility",

diff --git a/src/main/index.js b/src/main/index.js
@@ -1,6 +1,7 @@
-import {app, BrowserWindow, ipcMain} from "electron";
+import {app, BrowserWindow, shell} from "electron";
 import path from "path";
 import URL from "url";
+import updateInstaller from "./update_installer";
 
 const isDevelopment = process.env.NODE_ENV !== "production";
 app.name = "BetterDiscord";
@@ -54,7 +55,7 @@ function createMainWindow() {
 
     window.webContents.on("new-window", (e, url) => {
         e.preventDefault();
-        require("electron").shell.openExternal(url);
+        shell.openExternal(url);
     });
 
     return window;
@@ -73,6 +74,7 @@ app.on("activate", () => {
 });
 
 // create main BrowserWindow when electron is ready
-app.on("ready", () => {
+app.on("ready", async () => {
     mainWindow = createMainWindow();
+    if (!process.env.BD_SKIP_UPDATECHECK) updateInstaller();
 });
diff --git a/src/main/update_installer.js b/src/main/update_installer.js
@@ -0,0 +1,45 @@
+import {dialog, shell} from "electron";
+import phin from "phin";
+const semverGreaterThan = require("semver/functions/gt");
+const {version} = require("../../package.json");
+
+const getJSON = phin.defaults({
+    method: "GET",
+    parse: "json",
+    headers: {"User-Agent": "BetterDiscord Installer"},
+    followRedirects: true
+});
+
+export default async function () {
+    const downloadUrl = "https://api.github.com/repos/BetterDiscord/Installer/releases";
+    console.info(`Better Discord Installer ${version}`);
+
+    try {
+        const response = await getJSON(downloadUrl);
+        const latestRelease = response.body[0];
+        const latestVersion = latestRelease.tag_name;
+
+        if (semverGreaterThan(latestVersion, version)) {
+            console.info(`Found new release ${latestVersion}`);
+
+            const result = await dialog.showMessageBox({
+                title: "New Installer Version Available",
+                message: `A new version of the BetterDiscord installer is available. Click "Download" to download the newest version.`,
+                buttons: ["Download", "Later"],
+                defaultId: 0,
+                cancelId: 1
+            });
+
+            if (result.response === 0) {
+                await shell.openExternal(latestRelease.html_url);
+                process.exit(0);
+            }
+
+        } else {
+            console.info(`The installer is up to date.`);
+        }
+    }
+    catch (err) {
+        console.error("Failed to check for updates.", err);
+    }
+}
diff --git a/src/renderer/App.svelte b/src/renderer/App.svelte
@@ -1,18 +1,15 @@
 <script>
+    import "focus-visible";
+
     // import Page from "./containers/Page.svelte";
     import Titlebar from "./common/Titlebar.svelte";
     import Footer from "./common/Footer.svelte";
     import Router from "svelte-spa-router";
     import routes from "./routes";
-    require("focus-visible");
 </script>
 
-<div class="main-window platform-{process.platform}">
-    {#if process.platform == "darwin"}
-        <Titlebar macButtons />
-    {:else}
-        <Titlebar />
-    {/if}
+<div class="main-window platform-{process.platform || "win32"}">
+    <Titlebar macButtons={process.platform === "darwin"} />
     <main class="installer-body">
         <div class="sections">
             <Router {routes} />
@@ -22,25 +19,37 @@
 </div>
 
 <style>
-    @import url('https://rsms.me/inter/inter.css');
+    @import url("https://rsms.me/inter/inter.css");
 
-    :global(.focus-visible) {
+    :global([data-focus-visible-added]) {
         box-shadow: 0 0 0 4px var(--accent-faded) !important;
     }
 
     :root {
+
+        /* Primary backgrounds */
         --bg1: #040405;
         --bg2: #0c0d10;
         --bg2-alt: #101116;
         --bg3: #14151b;
         --bg3-alt: #191a21;
         --bg4: #20212b;
+
+        /* Text Colors */
         --text-light: #f1f1f1;
         --text-normal: #bfc4c9;
         --text-muted: #95989d;
+        --text-link: #5a88ce;
+
+        /* Accent colors */
         --accent: #3a71c1;
         --accent-hover: #2f5b9d;
-        --accent-faded: rgba(58, 113, 193, .4);
+        --accent-faded: rgba(58, 113, 193, 0.4);
+
+        /* Danger colors */
+        --danger: #c13a3a;
+        --danger-hover: #992e2e;
+        --danger-faded: rgb(193, 58, 58, 0.4);
     }
 
     :global(html),
@@ -127,7 +136,7 @@
     }
 
     .installer-body::after {
-        content: '';
+        content: "";
         position: absolute;
         top: 0;
         left: 0;

diff --git a/src/renderer/actions/install.js b/src/renderer/actions/install.js
@@ -45,15 +45,15 @@ async function makeDirectories(...folders) {
     }
 }
 
-const getJSON = phin.defaults({method: "GET", parse: "json", headers: {"User-Agent": "BetterDiscord Installer"}});
+const getJSON = phin.defaults({method: "GET", parse: "json", followRedirects: true, headers: {"User-Agent": "BetterDiscord Installer"}});
 const downloadFile = phin.defaults({method: "GET", followRedirects: true, headers: {"User-Agent": "BetterDiscord Installer", "Accept": "application/octet-stream"}});
 const asarPath = path.join(bdDataFolder, "betterdiscord.asar");
 async function downloadAsar() {
-    let downloadUrl = "https://api.github.com/repos/rauenzi/BetterDiscordApp/releases";
+    let downloadUrl = "https://api.github.com/repos/BetterDiscord/BetterDiscord/releases";
     try {
         const response = await getJSON(downloadUrl);
         const releases = response.body;
-        const asset = releases[0].assets.find(a => a.name === "betterdiscord.asar");
+        const asset = releases && releases.length ? releases[0].assets.find(a => a.name === "betterdiscord.asar") : "https://api.github.com/repos/BetterDiscord/BetterDiscord/releases/assets/39982244"; // temporary workaround
         downloadUrl = asset.url;
 
         const resp = await downloadFile(downloadUrl);

diff --git a/src/renderer/actions/paths.js b/src/renderer/actions/paths.js
@@ -10,7 +10,7 @@ const getDiscordPath = function(releaseChannel) {
     if (process.platform === "win32") {
         const basedir = path.join(process.env.LOCALAPPDATA, releaseChannel.replace(/ /g, ""));
         if (!fs.existsSync(basedir)) return "";
-        const version = fs.readdirSync(basedir).filter(f => fs.lstatSync(path.join(basedir, f)).isDirectory() && f.split(".").length > 1).sort().reverse()[0];
+        const version = fs.readdirSync(basedir).filter(f => fs.lstatSync(path.join(basedir, f)).isDirectory() && f.split(".").length > 1).sort()[0];
         if (!version) return "";
         resourcePath = path.join(basedir, version, "resources");
     }
@@ -20,7 +20,7 @@ const getDiscordPath = function(releaseChannel) {
     else {
         const basedir = path.join(remote.app.getPath("userData"), "..", releaseChannel.toLowerCase().replace(" ", ""));
         if (!fs.existsSync(basedir)) return "";
-        const version = fs.readdirSync(basedir).filter(f => fs.lstatSync(path.join(basedir, f)).isDirectory() && f.split(".").length > 1).sort().reverse()[0];
+        const version = fs.readdirSync(basedir).filter(f => fs.lstatSync(path.join(basedir, f)).isDirectory() && f.split(".").length > 1).sort()[0];
         if (!version) return "";
         resourcePath = path.join(basedir, version, "modules", "discord_desktop_core");
     }
@@ -55,7 +55,7 @@ const validateWindows = function(channel, proposedPath) {
     const selected = path.basename(proposedPath);
     const isBaseDir = selected === channelName;
     if (isBaseDir) {
-        const version = fs.readdirSync(proposedPath).filter(f => fs.lstatSync(path.join(proposedPath, f)).isDirectory() && f.split(".").length > 1).sort().reverse()[0];
+        const version = fs.readdirSync(proposedPath).filter(f => fs.lstatSync(path.join(proposedPath, f)).isDirectory() && f.split(".").length > 1).sort()[0];
         if (!version) return "";
         resourcePath = path.join(proposedPath, version, "resources");
     }
@@ -90,7 +90,7 @@ const validateLinux = function(channel, proposedPath) {
     let resourcePath = "";
     const selected = path.basename(proposedPath);
     if (selected === channelName) {
-        const version = fs.readdirSync(proposedPath).filter(f => fs.lstatSync(path.join(proposedPath, f)).isDirectory() && f.split(".").length > 1).sort().reverse()[0];
+        const version = fs.readdirSync(proposedPath).filter(f => fs.lstatSync(path.join(proposedPath, f)).isDirectory() && f.split(".").length > 1).sort()[0];
         if (!version) return "";
         resourcePath = path.join(proposedPath, version, "modules", "discord_desktop_core");
     }

diff --git a/src/renderer/common/Button.svelte b/src/renderer/common/Button.svelte
@@ -1,16 +1,23 @@
 <script>
     export let type = "secondary";
-    export let disabled = false;
+
+    const types = ["primary", "secondary"];
 </script>
 
-<button type="button"{disabled} on:keypress on:click|preventDefault|stopPropagation class="btn {(type == "primary" || type == "secondary") ? type : "secondary"}">
+<button
+    class="button {types.includes(type) ? `type-${type}` : "type-secondary"}"
+    type="button"
+    on:keypress
+    on:click|preventDefault|stopPropagation
+    {...$$restProps}
+>
     <span>
         <slot></slot>
     </span>
 </button>
 
 <style>
-    .btn {
+    .button {
         width: auto;
         border: none;
         display: flex;
@@ -27,34 +34,34 @@
         border-radius: 2px;
     }
 
-    .btn[disabled] {
+    .button[disabled] {
         opacity: .5;
         pointer-events: none;
     }
 
-    .btn span {
+    .button span {
         max-width: 100%;
         overflow: hidden;
         text-overflow: ellipsis;
     }
 
-    .btn.primary {
+    .button.type-primary {
         border: 1px solid transparent;
         background-color: var(--accent);
         color: #ffffff;
     }
 
-    .btn.primary:hover {
+    .button.type-primary:hover {
         background-color: var(--accent-hover);
     }
 
-    .btn.secondary {
+    .button.type-secondary {
         background-color: transparent;
         border: 1px solid rgba(255, 255, 255, 0.05);
         color: var(--text-normal);
     }
 
-    .btn.secondary:hover {
+    .button.type-secondary:hover {
         border-color: rgba(255, 255, 255, 0.1);
     }
 </style>