From 7df1b9ba166d99b73065e6cd674cc1a7994fc6cb Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 11 Feb 2022 17:06:59 -0800
Subject: [PATCH 01/44] Themes in settings will now only display less files

---
 src/main/base/browserwindow.ts        | 6 +++++-
 src/renderer/views/pages/settings.ejs | 2 +-
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 4293e4fc..b5dbecf6 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -359,7 +359,11 @@ export class BrowserWindow {
 
         ipcMain.on("get-themes", (event, _key) => {
             if (existsSync(utils.getPath("themes"))) {
-                event.returnValue = readdirSync(utils.getPath("themes"));
+                let files = readdirSync(utils.getPath("themes"));
+                let themes = files.filter((file) => {
+                    return file.endsWith(".less");
+                });
+                event.returnValue = themes;
             } else {
                 event.returnValue = [];
             }
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 8c856a12..29dfab1f 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -130,7 +130,7 @@
                         <select class="md-select" @change="$root.setTheme($root.cfg.visual.theme)" v-model="$root.cfg.visual.theme">
                             <option value="default.less">{{$root.getLz('settings.option.visual.theme.default')}}</option>
                             <option value="dark.less">{{$root.getLz('settings.option.visual.theme.dark')}}</option>
-                            <option v-for="theme in themes" :value="theme">{{ theme }}</option>
+                            <option v-for="theme in themes" :value="theme">{{ theme.replace(".less", "") }}</option>
                         </select>
                     </div>
                 </div>

From 1e2978199e90b70cfca44e5541663fceafd8b2a7 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 08:19:58 +0700
Subject: [PATCH 02/44] tmp

---
 src/main/plugins/discordrpc.ts | 24 +++++++++++++++++++++---
 src/renderer/index.js          |  1 +
 2 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts
index f30c68c8..31e8d81f 100644
--- a/src/main/plugins/discordrpc.ts
+++ b/src/main/plugins/discordrpc.ts
@@ -1,4 +1,6 @@
 import * as RPC from 'discord-rpc'
+import {ipcMain} from "electron";
+import fetch from 'electron-fetch'
 
 export default class DiscordRichPresence {
 
@@ -6,6 +8,7 @@ export default class DiscordRichPresence {
      * Private variables for interaction in plugins
      */
     private static _store: any;
+    private _app : any;
     private static _connection: boolean = false;
 
     /**
@@ -29,6 +32,7 @@ export default class DiscordRichPresence {
         smallImageText: '',
         instance: false
     };
+
     private _activityCache: RPC.Presence = {
         details: '',
         state: '',
@@ -101,7 +105,7 @@ export default class DiscordRichPresence {
         }
 
 		// Check large image
-        if (activity.largeImageKey === null || activity.largeImageKey === ""){
+        if (activity.largeImageKey == null || activity.largeImageKey === "" || activity.largeImageKey.length > 256) { 
             activity.largeImageKey = "cider";
         }
 
@@ -169,7 +173,6 @@ export default class DiscordRichPresence {
                 this._client.setActivity(this._activity)
                 .catch((e: any) => console.error(`[DiscordRichPresence][setActivity] ${e}`));
             }
-
         } else if (this._activity && this._activityCache !== this._activity && this._activity.details) {
             if (!DiscordRichPresence._store.general.discord_rpc_clear_on_pause) {
                 this._activity.smallImageKey = 'play';
@@ -190,9 +193,10 @@ export default class DiscordRichPresence {
     /**
      * Runs on plugin load (Currently run on application start)
      */
-    constructor(_app: any, store: any) {
+    constructor(app: any, store: any) {
         DiscordRichPresence._store = store
         console.debug(`[Plugin][${this.name}] Loading Complete.`);
+        this._app = app;
     }
 
     /**
@@ -201,6 +205,20 @@ export default class DiscordRichPresence {
     onReady(_win: any): void {
         this.connect((DiscordRichPresence._store.general.discord_rpc == 1) ? '911790844204437504' : '886578863147192350');
         console.debug(`[Plugin][${this.name}] Ready.`);
+        // ipcMain.on('updateRPCImage', (_event, imageurl) => {
+        //     fetch('https://api.cider.sh/v1/images' ,{ 
+
+        //         method: 'POST',
+        //         body: JSON.stringify({url : imageurl}),
+        //         headers: { 
+        //             'Content-Type': 'application/json',
+        //             'User-Agent': 'Cider Development Environment'
+        //         },
+        //     })
+        //     .then(res => res.text())
+        //     .then(json => console.log(json))
+        
+        // })
     }
 
     /**
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 2c91af90..72c9248e 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -3109,6 +3109,7 @@ const app = new Vue({
                     data = data.data.data[0];
                     if (data != null && data !== "" && data.attributes != null && data.attributes.artwork != null) {
                         this.currentArtUrl = (data["attributes"]["artwork"]["url"] ?? '').replace('{w}', 50).replace('{h}', 50);
+                        ipcRenderer.send('updateRPCImage', this.currentArtUrl ?? '');
                         try {
                             document.querySelector('.app-playback-controls .artwork').style.setProperty('--artwork', `url("${this.currentArtUrl}")`);
                         } catch (e) {

From d6d93ed3b7f1ee6335649f4e5d314b79950a5ed5 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 11 Feb 2022 17:21:47 -0800
Subject: [PATCH 03/44] themes can now be in folders and have resources in
 those folders

---
 src/main/base/browserwindow.ts | 32 ++++++++++++++++++++++++++++----
 1 file changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index b5dbecf6..49cdf84b 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -4,7 +4,7 @@ import * as windowStateKeeper from "electron-window-state";
 import * as express from "express";
 import * as getPort from "get-port";
 import {search} from "youtube-search-without-api-key";
-import {existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync} from "fs";
+import {existsSync, mkdirSync, readdirSync, readFileSync, writeFileSync, statSync} from "fs";
 import {Stream} from "stream";
 import {networkInterfaces} from "os";
 import * as mm from 'music-metadata';
@@ -240,7 +240,20 @@ export class BrowserWindow {
             } else {
                 res.send(`// Theme not found - ${userThemePath}`);
             }
+        });
 
+        app.get("/themes/:theme/:file", (req, res) => {
+            const theme = req.params.theme.toLowerCase();
+            const file = req.params.file;
+            const themePath = join(utils.getPath('srcPath'), "./renderer/themes/", theme);
+            const userThemePath = join(utils.getPath('themes'), theme);
+            if (existsSync(userThemePath)) {
+                res.sendFile(join(userThemePath, file));
+            } else if (existsSync(themePath)) {
+                res.sendFile(join(themePath, file));
+            } else {
+                res.send(`// File not found - ${userThemePath}`);
+            }
         });
 
         app.get("/audio.webm", (req, res) => {
@@ -359,10 +372,21 @@ export class BrowserWindow {
 
         ipcMain.on("get-themes", (event, _key) => {
             if (existsSync(utils.getPath("themes"))) {
+                // return any .less files and scan any folders in the themes folder for .less files
                 let files = readdirSync(utils.getPath("themes"));
-                let themes = files.filter((file) => {
-                    return file.endsWith(".less");
-                });
+                let themes = [];
+                for (let file of files) {
+                    if (file.endsWith(".less")) {
+                        themes.push(file);
+                    } else if (statSync(join(utils.getPath("themes"), file)).isDirectory()) {
+                        let subFiles = readdirSync(join(utils.getPath("themes"), file));
+                        for (let subFile of subFiles) {
+                            if (subFile.endsWith(".less")) {
+                                themes.push(join(file, subFile));
+                            }
+                        }
+                    }
+                }
                 event.returnValue = themes;
             } else {
                 event.returnValue = [];

From 51534c3640d5e6e887d06d4d4a3bc97945607348 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 11 Feb 2022 18:16:31 -0800
Subject: [PATCH 04/44] added options to getLz

---
 src/i18n/en_US.jsonc  | 10 ++++++++++
 src/renderer/index.js | 10 +++++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)

diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc
index 220a3352..76216893 100644
--- a/src/i18n/en_US.jsonc
+++ b/src/i18n/en_US.jsonc
@@ -124,6 +124,16 @@
   "term.contributors": "Contributors",
   "term.equalizer": "Equalizer",
   "term.reset": "Reset",
+  "term.track": [
+    {
+      "value": 1,
+      "text": "track"
+    },
+    {
+      "value": 2,
+      "text": "tracks"
+    }
+  ],
   "term.tracks": "tracks", // Assume x amount of tracks. e.g. 50 tracks 
   "term.videos": "Videos",
   "term.menu": "Menu",
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 72c9248e..d68e3190 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -322,8 +322,16 @@ const app = new Vue({
             this.lz = ipcRenderer.sendSync("get-i18n", lang)
             this.mklang = await this.MKJSLang()
         },
-        getLz(message) {
+        getLz(message, options = {}) {
             if (this.lz[message]) {
+                if(options["plural"]) {
+                    let closest = this.lz[message].reduce(function(prev, curr) {
+                        return (Math.abs(curr.value - options["plural"]) < Math.abs(prev.value - options["plural"]) ? curr : prev);
+                    });
+                    return closest.text;
+                }else{
+                    return this.lz[message][0].text
+                }
                 return this.lz[message]
             } else {
                 return message

From df24bad697787f4bf3c4fbdb7bc5f94e00df7323 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 11 Feb 2022 18:17:32 -0800
Subject: [PATCH 05/44] fix

---
 src/renderer/index.js | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/renderer/index.js b/src/renderer/index.js
index d68e3190..6e547824 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -329,8 +329,6 @@ const app = new Vue({
                         return (Math.abs(curr.value - options["plural"]) < Math.abs(prev.value - options["plural"]) ? curr : prev);
                     });
                     return closest.text;
-                }else{
-                    return this.lz[message][0].text
                 }
                 return this.lz[message]
             } else {

From ceb61e7e14a07ef77fc220287bd87a8299efb529 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 11 Feb 2022 18:19:57 -0800
Subject: [PATCH 06/44] added fallback if no plural is specified on a plural
 object

---
 src/renderer/index.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/renderer/index.js b/src/renderer/index.js
index 6e547824..7ed2b57c 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -329,6 +329,8 @@ const app = new Vue({
                         return (Math.abs(curr.value - options["plural"]) < Math.abs(prev.value - options["plural"]) ? curr : prev);
                     });
                     return closest.text;
+                }else if(typeof this.lz[message] === "object") {
+                    return this.lz[message][0].text;
                 }
                 return this.lz[message]
             } else {

From fb65965d82f1a7a778f8f41f05096fffd9a02fae Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 11 Feb 2022 19:05:59 -0800
Subject: [PATCH 07/44] added ipcRenderer.send("get-github-theme", "url")

---
 package.json                   |  5 +++--
 src/main/base/browserwindow.ts | 15 +++++++++++++++
 src/renderer/index.js          |  5 +++++
 3 files changed, 23 insertions(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f4ed5a4b..e3a751ef 100644
--- a/package.json
+++ b/package.json
@@ -23,8 +23,8 @@
     "start:darwin": "yarn build && ELECTRON_ENABLE_LOGGING=true && electron ./build/index.js --enable-accelerated-mjpeg-decode --enable-accelerated-video --disable-gpu-driver-bug-workarounds --ignore-gpu-blacklist --enable-native-gpu-memory-buffers",
     "pack": "electron-builder --dir",
     "dist": "yarn build && electron-builder",
-    "dist:macarm" : "yarn build && electron-builder --mac --arm64",
-    "dist:universalNotWorking": "yarn build && electron-builder --mac --universal", 
+    "dist:macarm": "yarn build && electron-builder --mac --arm64",
+    "dist:universalNotWorking": "yarn build && electron-builder --mac --universal",
     "dist:all": "yarn build && electron-builder -mwl",
     "msft": "yarn build && electron-builder -c msft-package.json",
     "postinstall": "electron-builder install-app-deps",
@@ -33,6 +33,7 @@
   "dependencies": {
     "@sentry/electron": "^2.5.4",
     "@sentry/integrations": "^6.17.4",
+    "adm-zip": "^0.5.9",
     "discord-rpc": "^4.0.1",
     "ejs": "^3.1.6",
     "electron-fetch": "^1.7.4",
diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 49cdf84b..1f581fb1 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -13,6 +13,7 @@ import {wsapi} from "./wsapi";
 import {jsonc} from "jsonc";
 import {AppImageUpdater, NsisUpdater} from "electron-updater";
 import {utils} from './utils';
+const AdmZip = require("adm-zip");
 
 
 export class BrowserWindow {
@@ -370,6 +371,20 @@ export class BrowserWindow {
             event.returnValue = process.platform;
         });
 
+        ipcMain.on("get-github-theme", async (event, url) => {
+            if (url.endsWith("/")) url = url.slice(0, -1);
+            let response = await fetch(
+                `${url}/archive/refs/heads/main.zip`
+            );
+            let zip = await response.buffer();
+            let zipFile = new AdmZip(zip);
+            zipFile.extractAllTo(utils.getPath("themes"), true);
+            BrowserWindow.win.webContents.send("theme-installed", "");
+            event.returnValue = {
+                success: true,
+            };
+        });
+
         ipcMain.on("get-themes", (event, _key) => {
             if (existsSync(utils.getPath("themes"))) {
                 // return any .less files and scan any folders in the themes folder for .less files
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 7ed2b57c..ae5bad38 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -693,6 +693,11 @@ const app = new Vue({
                 console.log(e)
             }
 
+            ipcRenderer.on("theme-installed", (event, arg) => {
+                notyf.success("Theme installed")
+                //app.setTheme(arg)
+            })
+
             MusicKit.getInstance().videoContainerElement = document.getElementById("apple-music-video-player")
 
             ipcRenderer.on('SoundCheckTag', (event, tag) => {

From 0aaa40f4e5fe3b232a3071b16e5e92de03ad501a Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 11 Feb 2022 19:07:05 -0800
Subject: [PATCH 08/44] if theme folder does not exist create one

---
 src/main/base/browserwindow.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index 1f581fb1..d5ebe168 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -372,6 +372,9 @@ export class BrowserWindow {
         });
 
         ipcMain.on("get-github-theme", async (event, url) => {
+            if (!existsSync(utils.getPath("themes"))) {
+                mkdirSync(utils.getPath("themes"));
+            }
             if (url.endsWith("/")) url = url.slice(0, -1);
             let response = await fetch(
                 `${url}/archive/refs/heads/main.zip`

From c8a310c29b630b8367aba99e19a51fbc32fabc49 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 10:11:57 +0700
Subject: [PATCH 09/44] plurals

---
 src/i18n/en_US.jsonc        | 14 ++++----------
 src/renderer/index.js       | 23 +++++++++++++++--------
 src/renderer/views/main.ejs |  1 +
 3 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc
index 76216893..07c72a2e 100644
--- a/src/i18n/en_US.jsonc
+++ b/src/i18n/en_US.jsonc
@@ -124,16 +124,10 @@
   "term.contributors": "Contributors",
   "term.equalizer": "Equalizer",
   "term.reset": "Reset",
-  "term.track": [
-    {
-      "value": 1,
-      "text": "track"
-    },
-    {
-      "value": 2,
-      "text": "tracks"
-    }
-  ],
+  "term.track": {
+    "one" : "track",
+    "other" : "tracks"
+  },
   "term.tracks": "tracks", // Assume x amount of tracks. e.g. 50 tracks 
   "term.videos": "Videos",
   "term.menu": "Menu",
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 7ed2b57c..d2475642 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -324,13 +324,17 @@ const app = new Vue({
         },
         getLz(message, options = {}) {
             if (this.lz[message]) {
-                if(options["plural"]) {
-                    let closest = this.lz[message].reduce(function(prev, curr) {
-                        return (Math.abs(curr.value - options["plural"]) < Math.abs(prev.value - options["plural"]) ? curr : prev);
-                    });
-                    return closest.text;
-                }else if(typeof this.lz[message] === "object") {
-                    return this.lz[message][0].text;
+                if(options["count"] ) {
+                    if (typeof this.lz[message] === "object"){
+                        let type = window.fastPluralRules.getPluralFormNameForCardinalByLocale(this.cfg.general.language.replace("_","-"),options["count"]);
+                        return this.lz[message][type] ?? ((this.lz[message])[Object.keys(this.lz[message])[0]] ?? this.lz[message])
+                    } else {
+                        // fallback English plural forms ( old i18n )
+                        if (options["count"] > 1) {
+                            return this.lz[message+ "s"] ?? this.lz[message]} else { return this.lz[message]}
+                    }
+                } else if(typeof this.lz[message] === "object") {
+                    return (this.lz[message])[Object.keys(this.lz[message])[0]]
                 }
                 return this.lz[message]
             } else {
@@ -2149,7 +2153,10 @@ const app = new Vue({
                     let hours = Math.floor(time / 3600)
                     let mins = Math.floor(time / 60) % 60
                     let secs = time % 60
-                    return app.showingPlaylist.relationships.tracks.data.length + " " + app.getLz('term.tracks') + ", " + ((hours > 0) ? (hours + (" " + ((hours > 1) ? app.getLz('term.time.hours') + ", " : app.getLz('term.time.hour') + ", "))) : "") + ((mins > 0) ? (mins + ((mins > 1) ? " " + app.getLz('term.time.minutes') + ", " : " " + app.getLz('term.time.minute') + ", ")) : "") + secs + ((secs > 1) ? " " + app.getLz('term.time.seconds') + "." : " " + app.getLz('term.time.second') + ".");
+                    return app.showingPlaylist.relationships.tracks.data.length + " " + app.getLz('term.track', options = {count : app.showingPlaylist.relationships.tracks.data.length}) + ", " 
+                    + ((hours > 0) ? (hours + (" " + (app.getLz('term.time.hour', options = {count : hours}) + ", "))) : "") + 
+                    ((mins > 0) ? (mins + (" " + app.getLz('term.time.minute', options = {count : mins}) + ", ")) : "") + 
+                    secs + (" " + app.getLz('term.time.second', options = {count : secs}) + ".");
                 } else return ""
             } catch (err) {
                 return ""
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index 55b4403d..3097a196 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -72,6 +72,7 @@
         document.write(unescape("%3Cscript src='https://js-cdn.music.apple.com/musickit/v2/amp/musickit.js' type='text/javascript'%3E%3C/script%3E"));
     }
 </script>
+<script src="https://unpkg.com/fast-plural-rules@1.0.2/dist/index.umd.min.js"></script>
 <script
         src="index.js?v=1"></script>
 <script

From e3555b7b01e1d17bebf156e3ee0db63a8e42180a Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 11 Feb 2022 19:20:29 -0800
Subject: [PATCH 10/44] added install from github url to settings

---
 src/main/base/browserwindow.ts        | 35 ++++++++++++++++-----------
 src/renderer/index.js                 |  5 ----
 src/renderer/views/pages/settings.ejs | 17 +++++++++++++
 3 files changed, 38 insertions(+), 19 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index d5ebe168..ee2f206f 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -371,21 +371,28 @@ export class BrowserWindow {
             event.returnValue = process.platform;
         });
 
-        ipcMain.on("get-github-theme", async (event, url) => {
-            if (!existsSync(utils.getPath("themes"))) {
-                mkdirSync(utils.getPath("themes"));
-            }
-            if (url.endsWith("/")) url = url.slice(0, -1);
-            let response = await fetch(
-                `${url}/archive/refs/heads/main.zip`
-            );
-            let zip = await response.buffer();
-            let zipFile = new AdmZip(zip);
-            zipFile.extractAllTo(utils.getPath("themes"), true);
-            BrowserWindow.win.webContents.send("theme-installed", "");
-            event.returnValue = {
+        ipcMain.handle("get-github-theme", async (event, url) => {
+            const returnVal = {
                 success: true,
-            };
+                theme: null,
+                message: ""
+            }
+            try {
+                if (!existsSync(utils.getPath("themes"))) {
+                    mkdirSync(utils.getPath("themes"));
+                }
+                if (url.endsWith("/")) url = url.slice(0, -1);
+                let response = await fetch(
+                    `${url}/archive/refs/heads/main.zip`
+                );
+                let zip = await response.buffer();
+                let zipFile = new AdmZip(zip);
+                zipFile.extractAllTo(utils.getPath("themes"), true);
+
+            }catch(e) {
+                returnVal.success = false;
+            }
+            BrowserWindow.win.webContents.send("theme-installed", returnVal);
         });
 
         ipcMain.on("get-themes", (event, _key) => {
diff --git a/src/renderer/index.js b/src/renderer/index.js
index ae5bad38..7ed2b57c 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -693,11 +693,6 @@ const app = new Vue({
                 console.log(e)
             }
 
-            ipcRenderer.on("theme-installed", (event, arg) => {
-                notyf.success("Theme installed")
-                //app.setTheme(arg)
-            })
-
             MusicKit.getInstance().videoContainerElement = document.getElementById("apple-music-video-player")
 
             ipcRenderer.on('SoundCheckTag', (event, tag) => {
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 29dfab1f..76e1b8b5 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -132,6 +132,7 @@
                             <option value="dark.less">{{$root.getLz('settings.option.visual.theme.dark')}}</option>
                             <option v-for="theme in themes" :value="theme">{{ theme.replace(".less", "") }}</option>
                         </select>
+                        <button class="md-btn md-btn-small md-btn-block" @click="installTheme()" style="margin-top: 8px">Install from GitHub URL</button>
                     </div>
                 </div>
                 <div class="md-option-line">
@@ -771,6 +772,22 @@
             }
         },
         methods: {
+            installTheme() {
+                let self = this
+                bootbox.prompt("Enter the URL of the theme you want to install", (result) => {
+                    if (result) {
+                        ipcRenderer.once("theme-installed", (event, arg) => {
+                            if (arg.success) {
+                                self.themes = ipcRenderer.sendSync("get-themes")
+                                notyf.success("Theme installed successfully");
+                            } else {
+                                notyf.error("Theme installation failed");
+                            }
+                        });
+                        ipcRenderer.invoke("get-github-theme", result)
+                    }
+                });
+            },
             copyLogs() {
                 ipcRenderer.send('fetch-log')
                 notyf.success(app.getLz('term.share.success'));

From 0c364753cf86dee97446ce0d08b8f307f692e9ff Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 10:23:25 +0700
Subject: [PATCH 11/44] update notice

---
 src/i18n/README.md    | 20 ++++++++++++++++++++
 src/i18n/en_US.jsonc  |  1 +
 src/renderer/index.js |  2 +-
 3 files changed, 22 insertions(+), 1 deletion(-)

diff --git a/src/i18n/README.md b/src/i18n/README.md
index 3fa8fffd..264ceea6 100644
--- a/src/i18n/README.md
+++ b/src/i18n/README.md
@@ -9,6 +9,26 @@ Some notes about Cider's i18n support.
 - Most of the strings in the content area are provided and translated by Apple themselves, and do not need to be translated.
 - The language Apple Music uses are dependent on the storefront region.
 
+# Multiple Plural Forms
+
+Multiple plural forms can be supported as below: 
+
+The keys and its meanings are here : https://github.com/prantlf/fast-plural-rules/blob/master/docs/languages.md#supported-languages
+
+For example , English is in Plural rule #1 and has 2 keys ```one``` and ```other```
+
+Russian is in Plural rule #7 (3 forms) : ```one```, ```few``` and ```other```
+
+How it is implemented for English:
+
+```
+ "term.track": {
+    "one" : "track",
+    "other" : "tracks"
+  },
+```
+
+
 
 ## Localization Notices
 
diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc
index 07c72a2e..eb451e89 100644
--- a/src/i18n/en_US.jsonc
+++ b/src/i18n/en_US.jsonc
@@ -124,6 +124,7 @@
   "term.contributors": "Contributors",
   "term.equalizer": "Equalizer",
   "term.reset": "Reset",
+  // Example for multiple plural forms : look up the key for your language in https://github.com/prantlf/fast-plural-rules/blob/master/docs/languages.md#supported-languages
   "term.track": {
     "one" : "track",
     "other" : "tracks"
diff --git a/src/renderer/index.js b/src/renderer/index.js
index db38d8f7..3877605a 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -331,7 +331,7 @@ const app = new Vue({
                     } else {
                         // fallback English plural forms ( old i18n )
                         if (options["count"] > 1) {
-                            return this.lz[message+ "s"] ?? this.lz[message]} else { return this.lz[message]}
+                            return this.lz[message+ "s"] ?? this.lz[message]} else { return this.lz[message] ?? this.lz[message+ "s"]}
                     }
                 } else if(typeof this.lz[message] === "object") {
                     return (this.lz[message])[Object.keys(this.lz[message])[0]]

From 6cbb472c350267b14c1eeae3172014d35546e53a Mon Sep 17 00:00:00 2001
From: child_duckling <19170969+quacksire@users.noreply.github.com>
Date: Fri, 11 Feb 2022 19:37:09 -0800
Subject: [PATCH 12/44] [MAS] adjust for macOS design standards

---
 src/main/plugins/menubar.ts | 36 +++++++++++++++++++++++-------------
 1 file changed, 23 insertions(+), 13 deletions(-)

diff --git a/src/main/plugins/menubar.ts b/src/main/plugins/menubar.ts
index eb40f61e..f044edc1 100644
--- a/src/main/plugins/menubar.ts
+++ b/src/main/plugins/menubar.ts
@@ -14,7 +14,7 @@ export default class Thumbar {
     public name: string = 'Menubar Plugin';
     public description: string = 'Creates the menubar';
     public version: string = '1.0.0';
-    public author: string = 'Core / Quack';
+    public author: string = 'Core / Quacksire';
 
     /**
      * Thumbnail Toolbar Assets
@@ -38,7 +38,16 @@ export default class Thumbar {
         {
             label: app.getName(),
             submenu: [
-                { role: 'about' },
+                {
+                    label: 'About',
+                    click: () => this._win.webContents.executeJavaScript(`app.appRoute('about')`)
+                },
+                { type: 'separator' },
+                {
+                    label: 'Settings',
+                    accelerator: 'CommandOrControl+,',
+                    click: () => this._win.webContents.executeJavaScript(`app.appRoute('settings')`)
+                },
                 { type: 'separator' },
                 { role: 'services' },
                 { type: 'separator' },
@@ -71,11 +80,20 @@ export default class Thumbar {
                 ...(this.isMac ? [
                     {type: 'separator'},
                     {role: 'front'},
-                    {type: 'separator'},
-                    {role: 'window'}
                 ] : [
                     {role: 'close'}
                 ]),
+                {
+                    label: 'Edit',
+                    submenu: [
+                        { role: 'undo' },
+                        { role: 'redo' },
+                        { type: 'separator' },
+                        { role: 'cut' },
+                        { role: 'copy' },
+                        { role: 'paste' },
+                    ]
+                },
                 {type: 'separator'},
                 {
                     label: 'Web Remote',
@@ -88,11 +106,7 @@ export default class Thumbar {
                     accelerator: 'CommandOrControl+Shift+A',
                     click: () => this._win.webContents.executeJavaScript(`app.modals.audioSettings = true`)
                 },
-                {
-                    label: 'Settings',
-                    accelerator: 'CommandOrControl+,',
-                    click: () => this._win.webContents.executeJavaScript(`app.appRoute('settings')`)
-                }
+
             ]
         },
         {
@@ -151,10 +165,6 @@ export default class Thumbar {
                     label: 'GitHub Wiki',
                     click: () => shell.openExternal("https://github.com/ciderapp/Cider/wiki/Troubleshooting").catch(console.error)
                 },
-                {
-                    label: 'About',
-                    click: () => this._win.webContents.executeJavaScript(`app.appRoute('about')`)
-                },
                 {type: 'separator'},
                 {
                     label: 'Report a...',

From a6abb536e4cd60d1e393dcdbba90866635d5dce2 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 11 Feb 2022 19:46:12 -0800
Subject: [PATCH 13/44] theme.json is now read if present

---
 src/main/base/browserwindow.ts        | 35 +++++++++++++++++++++++++--
 src/renderer/views/pages/settings.ejs |  2 +-
 2 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/main/base/browserwindow.ts b/src/main/base/browserwindow.ts
index ee2f206f..f3d151d4 100644
--- a/src/main/base/browserwindow.ts
+++ b/src/main/base/browserwindow.ts
@@ -397,7 +397,6 @@ export class BrowserWindow {
 
         ipcMain.on("get-themes", (event, _key) => {
             if (existsSync(utils.getPath("themes"))) {
-                // return any .less files and scan any folders in the themes folder for .less files
                 let files = readdirSync(utils.getPath("themes"));
                 let themes = [];
                 for (let file of files) {
@@ -412,7 +411,39 @@ export class BrowserWindow {
                         }
                     }
                 }
-                event.returnValue = themes;
+                let themeObjects = [];
+                for (let theme of themes) {
+                    let themePath = join(utils.getPath("themes"), theme);
+                    let themeName = theme;
+                    let themeDescription = "";
+                    if (theme.includes("/")) {
+                        themeName = theme.split("/")[1];
+                        themeDescription = theme.split("/")[0];
+                    }
+                    if (themePath.endsWith("index.less")) {
+                        themePath = themePath.slice(0, -10);
+                    }
+                    if (existsSync(join(themePath, "theme.json"))) {
+                        let themeJson = JSON.parse(readFileSync(join(themePath, "theme.json"), "utf8"));
+                        themeObjects.push({
+                            name: themeJson.name || themeName,
+                            description: themeJson.description || themeDescription,
+                            path: themePath,
+                            file: theme,
+                            test: join(themePath, "theme.json")
+                        });
+                    } else {
+                        themeObjects.push({
+                            name: themeName,
+                            description: themeDescription,
+                            path: themePath,
+                            file: theme,
+                            test: join(themePath, "theme.json")
+                        });
+                    }
+                }
+                event.returnValue = themeObjects;
+
             } else {
                 event.returnValue = [];
             }
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 76e1b8b5..87b23311 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -130,7 +130,7 @@
                         <select class="md-select" @change="$root.setTheme($root.cfg.visual.theme)" v-model="$root.cfg.visual.theme">
                             <option value="default.less">{{$root.getLz('settings.option.visual.theme.default')}}</option>
                             <option value="dark.less">{{$root.getLz('settings.option.visual.theme.dark')}}</option>
-                            <option v-for="theme in themes" :value="theme">{{ theme.replace(".less", "") }}</option>
+                            <option v-for="theme in themes" :value="theme.file">{{ theme.name }}</option>
                         </select>
                         <button class="md-btn md-btn-small md-btn-block" @click="installTheme()" style="margin-top: 8px">Install from GitHub URL</button>
                     </div>

From 127c628afdd3cd1b1419e60a2b3edd98d0202fb0 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 11:15:46 +0700
Subject: [PATCH 14/44] "get-i18n"

---
 src/i18n/en_US.jsonc  | 8 ++++----
 src/renderer/index.js | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc
index eb451e89..fc16c0c1 100644
--- a/src/i18n/en_US.jsonc
+++ b/src/i18n/en_US.jsonc
@@ -125,10 +125,10 @@
   "term.equalizer": "Equalizer",
   "term.reset": "Reset",
   // Example for multiple plural forms : look up the key for your language in https://github.com/prantlf/fast-plural-rules/blob/master/docs/languages.md#supported-languages
-  "term.track": {
-    "one" : "track",
-    "other" : "tracks"
-  },
+  // "term.track": {
+  //   "one" : "track",
+  //   "other" : "tracks"
+  // },
   "term.tracks": "tracks", // Assume x amount of tracks. e.g. 50 tracks 
   "term.videos": "Videos",
   "term.menu": "Menu",
diff --git a/src/renderer/index.js b/src/renderer/index.js
index 98fca0d3..f4d1aaa4 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -2153,7 +2153,7 @@ const app = new Vue({
                     let hours = Math.floor(time / 3600)
                     let mins = Math.floor(time / 60) % 60
                     let secs = time % 60
-                    return app.showingPlaylist.relationships.tracks.data.length + " " + app.getLz('term.track', options = {count : app.showingPlaylist.relationships.tracks.data.length}) + ", " 
+                    return app.showingPlaylist.relationships.tracks.data.length + " " + app.getLz('term.tracks', options = {count : app.showingPlaylist.relationships.tracks.data.length}) + ", " 
                     + ((hours > 0) ? (hours + (" " + (app.getLz('term.time.hour', options = {count : hours}) + ", "))) : "") + 
                     ((mins > 0) ? (mins + (" " + app.getLz('term.time.minute', options = {count : mins}) + ", ")) : "") + 
                     secs + (" " + app.getLz('term.time.second', options = {count : secs}) + ".");

From f74b46c1ce1ebe3102bfd6452b889eef2a4a2c64 Mon Sep 17 00:00:00 2001
From: booploops <49113086+booploops@users.noreply.github.com>
Date: Fri, 11 Feb 2022 20:22:17 -0800
Subject: [PATCH 15/44] added fast-plural-rules locally

---
 src/renderer/js/fast-plural-rules.js | 1 +
 src/renderer/views/main.ejs          | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
 create mode 100644 src/renderer/js/fast-plural-rules.js

diff --git a/src/renderer/js/fast-plural-rules.js b/src/renderer/js/fast-plural-rules.js
new file mode 100644
index 00000000..b0b5c857
--- /dev/null
+++ b/src/renderer/js/fast-plural-rules.js
@@ -0,0 +1 @@
+!function(n,e){"object"==typeof exports&&"undefined"!=typeof module?e(exports):"function"==typeof define&&define.amd?define(["exports"],e):e((n="undefined"!=typeof globalThis?globalThis:n||self).fastPluralRules={})}(this,(function(n){"use strict";var e=[function(){return 0},function(n){return 1===n?0:1},function(n){return n<=1?0:1},function(n){return n%10==1&&n%100!=11?1:n%10!=0?2:0},function(n){return 1===n||11===n?0:2===n||12===n?1:n>2&&n<20?2:3},function(n){return 1===n?0:0===n||n%100>0&&n%100<20?1:2},function(n){return n%10==1&&n%100!=11?0:n%10>=2&&(n%100<10||n%100>=20)?2:1},function(n){return n%10==1&&n%100!=11?0:n%10>=2&&n%10<=4&&(n%100<10||n%100>=20)?1:2},function(n){return 1===n?0:n>=2&&n<=4?1:2},function(n){return 1===n?0:n%10>=2&&n%10<=4&&(n%100<10||n%100>=20)?1:2},function(n){return n%100==1?0:n%100==2?1:n%100==3||n%100==4?2:3},function(n){return 1===n?0:2===n?1:n>2&&n<7?2:n>6&&n<11?3:4},function(n){return 1===n?0:2===n?1:n%100>=3&&n%100<=10?2:n%100>=11?3:0!==n?4:5},function(n){return 1===n?0:0===n||n%100>0&&n%100<11?1:n%100>10&&n%100<20?2:3},function(n){return n%10==1?0:n%10==2?1:2},function(n){return n%10==1&&n%100!=11?0:1},function(n){return n%10==1&&n%100!=11&&n%100!=71&&n%100!=91?0:n%10==2&&n%100!=12&&n%100!=72&&n%100!=92?1:n%10!=3&&n%10!=4&&n%10!=9||n%100==13||n%100==73||n%100==93||n%100==14||n%100==74||n%100==94||n%100==19||n%100==79||n%100==99?0!==n&&n%1e6==0?3:4:2},function(n){return 0!==n?1:0},function(n){return 1===n?1:2===n?2:3===n?3:6===n?4:0!==n?5:0},function(n){return 1===n?0:n%10>=2&&n%10<=4&&(n%100<10||n%100>=20)?1:2},function(n){return 1===n?0:2===n?1:3===n?2:3},function(n){return n%10==1&&n%100!=11?0:n%10>=2&&n%10<=4&&(n%100<10||n%100>=20)?1:2},function(n){return 0===n?0:1===n?1:2}],r={ach:2,af:1,ak:2,am:2,an:1,anp:1,ar:12,arn:2,as:1,ast:1,ay:0,az:1,be:7,bg:1,bn:1,bo:0,br:2,brx:1,bs:7,ca:1,cgg:0,cs:8,csb:19,cy:18,da:1,de:1,doi:1,dz:0,el:1,en:1,eo:1,es:1,"es-ar":1,et:1,eu:1,fa:2,ff:1,fi:1,fil:2,fo:1,fr:2,fur:1,fy:1,ga:11,gd:4,gl:1,gu:1,gun:2,ha:1,he:1,hi:1,hne:1,hr:7,hu:1,hy:1,ia:1,id:0,is:15,it:1,ja:0,jbo:0,jv:17,ka:0,kk:1,kl:1,km:0,kn:1,ko:0,ku:1,kw:20,ky:1,lb:1,ln:2,lo:0,lt:6,lv:3,mai:1,me:21,mfe:2,mg:2,mi:2,mk:15,ml:1,mn:1,mni:1,mnk:22,mr:1,ms:0,mt:13,my:0,nah:1,nap:1,nb:1,ne:1,nl:1,nn:1,no:1,nso:1,oc:2,or:1,pa:1,pap:1,pl:9,pms:1,ps:1,pt:1,"pt-br":2,rm:1,ro:5,ru:7,rw:1,sah:0,sat:1,sco:1,sd:1,se:1,si:1,sk:8,sl:10,so:1,son:1,sq:1,sr:7,su:0,sv:1,sw:1,ta:1,te:1,tg:2,th:0,ti:2,tk:1,tr:2,tt:0,ug:0,uk:7,ur:1,uz:2,vi:0,wa:2,wo:0,yo:1,"zh-cn":0,"zh-tw":2},o=[["other"],["one","other"],["one","other"],["zero","one","other"],["one","two","few","other"],["one","few","other"],["one","few","other"],["one","few","other"],["one","few","other"],["one","few","other"],["one","two","few","other"],["one","two","few","many","other"],["one","two","few","many","other","zero"],["one","few","many","other"],["one","few","other"],["one","other"],["one","two","few","many","other"],["zero","other"],["zero","one","two","few","many","other"],["one","few","other"],["one","two","few","other"],["one","few","other"],["zero","one","other"]];function t(n){n=function(n){return n.toLowerCase().replace("_","-")}(n);var e=r[n];if(void 0===e){var o=function(n){var e=n.indexOf("-");return e>0?n.substr(0,e):n}(n);e=r[o]}if(void 0===e)throw new Error('Unrecognized locale: "'+n+'".');return e}function u(n,e){var r=o[e];return function(e){return r[n(e)]}}function a(n){var r=t(n);return e[r]}function i(n){var r=e[n];if(void 0===r)throw new Error('Invalid index: "'+n+'".');return r}function f(n){var r=t(n);return u(e[r],r)}function l(n){if(void 0===e[n])throw new Error('Invalid index: "'+n+'".');return u(e[n],n)}n.getPluralFormForCardinalByIndex=function(n,e){return i(n)(e)},n.getPluralFormForCardinalByLocale=function(n,e){return a(n)(e)},n.getPluralFormNameForCardinalByIndex=function(n,e){return l(n)(e)},n.getPluralFormNameForCardinalByLocale=function(n,e){return f(n)(e)},n.getPluralRuleForCardinalsByIndex=i,n.getPluralRuleForCardinalsByLocale=a,n.getPluralRuleForNamedFormsForCardinalsByIndex=l,n.getPluralRuleForNamedFormsForCardinalsByLocale=f,Object.defineProperty(n,"__esModule",{value:!0})}));
\ No newline at end of file
diff --git a/src/renderer/views/main.ejs b/src/renderer/views/main.ejs
index 3097a196..1c6ab3e9 100644
--- a/src/renderer/views/main.ejs
+++ b/src/renderer/views/main.ejs
@@ -72,7 +72,7 @@
         document.write(unescape("%3Cscript src='https://js-cdn.music.apple.com/musickit/v2/amp/musickit.js' type='text/javascript'%3E%3C/script%3E"));
     }
 </script>
-<script src="https://unpkg.com/fast-plural-rules@1.0.2/dist/index.umd.min.js"></script>
+<script src="./js/fast-plural-rules.js"></script>
 <script
         src="index.js?v=1"></script>
 <script

From df9761d2082940ab7f1928fa6f0b369bd6557051 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 12:01:51 +0700
Subject: [PATCH 16/44] macos

---
 .github/workflows/build-macos.yml | 107 ++++++++++++++++++++++++++++++
 1 file changed, 107 insertions(+)
 create mode 100644 .github/workflows/build-macos.yml

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
new file mode 100644
index 00000000..a926b492
--- /dev/null
+++ b/.github/workflows/build-macos.yml
@@ -0,0 +1,107 @@
+# For most projects, this workflow file will not need changing; you simply need
+# to commit it to your repository.
+#
+# You may wish to alter this file to override the set of languages analyzed,
+# or to provide custom queries or build logic.
+#
+# ******** NOTE ********
+# We have attempted to detect the languages in your repository. Please check
+# the `language` matrix defined below to confirm you have the correct set of
+# supported CodeQL languages.
+#
+name: "macOS build"
+
+on:
+  push:
+    branches: [ develop ]
+    paths-ignore:
+    - 'README.md'
+    - 'SECURITY.md'
+    - '.gitmodules'
+    - '.gitignore'
+    - 'LICENSE'
+  pull_request:
+    # The branches below must be a subset of the branches above
+    branches: [ develop ]
+  schedule:
+    - cron: '44 20 * * 1'
+
+jobs:
+  analyze:
+    name: macOS build
+    runs-on: macos-11
+    permissions:
+      actions: read
+      contents: read
+      security-events: write
+
+    strategy:
+      fail-fast: false
+      matrix:
+        language: [ 'javascript' ]
+        # CodeQL supports [ 'cpp', 'csharp', 'go', 'java', 'javascript', 'python' ]
+        # Learn more:
+        # https://docs.github.com/en/free-pro-team@latest/github/finding-security-vulnerabilities-and-errors-in-your-code/configuring-code-scanning#changing-the-languages-that-are-analyzed
+
+    steps:
+    - uses: maxim-lobanov/setup-xcode@v1
+      with:
+        xcode-version: '12.4' 
+        
+    - name: Checkout repository
+      uses: actions/checkout@v2
+      with: 
+        submodules: true
+
+    # Initializes the CodeQL tools for scanning.
+#     - name: Initialize CodeQL
+#       uses: github/codeql-action/init@v1
+#       with:
+#         languages: ${{ matrix.language }}
+        # If you wish to specify custom queries, you can do so here or in a config file.
+        # By default, queries listed here will override any specified in a config file.
+        # Prefix the list here with "+" to use these queries and those in the config file.
+        # queries: ./path/to/local/query, your-org/your-repo/queries@main
+
+    # ℹ️ Command-line programs to run using the OS shell.
+    # 📚 https://git.io/JvXDl
+
+    # ✏️ If the Autobuild fails above, remove it and uncomment the following three lines
+    #    and modify them (or add more) to build your code if your project
+    #    uses a compiled language
+    
+#     - name : env
+#       run: | 
+#         export EVS_ACCOUNT_NAME=${{ secrets.EVS_ACCOUNT_NAME}} && export EVS_PASSWD=${{ secrets.EVS_PASSWD }} 
+#         export CSC_LINK=${{ secrets.CSC_LINK }} && export CSC_KEY_PASSWORD=${{ secrets.CSC_KEY_PASSWORD }}    
+#         export APPLEID=${{ secrets.APPLEID }}  && export APPLEIDPASS=${{ secrets.APPLEIDPASS }}   
+    
+    - name: Sign in to EVS
+      run: |    
+        python3 -m pip install --upgrade castlabs-evs
+        python3 -m castlabs_evs.account refresh -A ${{ secrets.EVS_ACCOUNT_NAME }} -P ${{ secrets.EVS_PASSWD }} 
+        
+    - name : Build  
+      env: 
+        CSC_LINK: ${{ secrets.CSC_LINK }}
+        CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} 
+        APPLEID: ${{ secrets.APPLEID }}
+        APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+        DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
+      run: |
+        rm cider-yarn.lock || true
+        xcodebuild -version
+        yarn install
+        cp resources/macPackager.js node_modules/app-builder-lib/out/macPackager.js 
+        yarn dist:universalNotWorking -p never
+#     - name: Perform CodeQL Analysis
+#       uses: github/codeql-action/analyze@v1
+
+    - name: Upload a Build Artifact
+      uses: actions/upload-artifact@v2.2.3
+      with:
+        # Artifact name
+        name: macOS
+        # A file, directory or wildcard pattern that describes what to upload
+        path: dist/*.dmg
+        # The desired behavior if no files are found using the provided path.

From 31783d30d26847cf2121b5ef7ea425c21a679342 Mon Sep 17 00:00:00 2001
From: child_duckling <19170969+quacksire@users.noreply.github.com>
Date: Fri, 11 Feb 2022 21:43:45 -0800
Subject: [PATCH 17/44] Added Quack language for the memes

---
 src/i18n/en_QUK.jsonc          | 369 +++++++++++++++++++++++++++++++++
 src/main/plugins/discordrpc.ts |   1 -
 2 files changed, 369 insertions(+), 1 deletion(-)
 create mode 100644 src/i18n/en_QUK.jsonc

diff --git a/src/i18n/en_QUK.jsonc b/src/i18n/en_QUK.jsonc
new file mode 100644
index 00000000..3caf1ae7
--- /dev/null
+++ b/src/i18n/en_QUK.jsonc
@@ -0,0 +1,369 @@
+{ // Base File
+
+  // i18n Info
+  "i18n.languageName": "Language of the Quacks", // name of language in native language
+  "i18n.languageNameEnglish": "Language of the Quacks", // name of language in English
+  "i18n.category": "fun", // main = real language, fun = fun community languages
+  "i18n.authors": "@quacksire", // Authors, if you contribute to this file feel free to Quack your name seperated with a space
+  
+  // App info
+  "app.name": "Cider",
+  
+  "date.format": "${m} ${d}, ${y}",
+  
+  // Dialogs
+  "dialog.cancel": "Cancel",
+  "dialog.ok": "OK",
+  
+  // Notification
+  "notification.updatingLibrarySongs": "Quacking library songs...",
+  "notification.updatingLibraryAlbums": "Quacking library albums...",
+  "notification.updatingLibraryArtists": "Quacking library artists...",
+  
+  // Terms
+  "term.appleInc": "Apple Inc.",
+  "term.appleMusic": "Apple Music",
+  "term.applePodcasts": "Apple Podcasts",
+  "term.itunes": "iTunes",
+  "term.github": "GitHub",
+  "term.discord": "Discord",
+  "term.learnMore": "Quack more",
+  "term.accountSettings": "Account Settings",
+  "term.logout": "Quackout",
+  "term.login": "Quack In",
+  "term.about": "About",
+  "term.privateSession": "Private Session",
+  "term.queue": "Queue",
+  "term.history": "History",
+  "term.search": "Search",
+  "term.library": "Library",
+  "term.listenNow": "Listen Now",
+  "term.browse": "Quack",
+  "term.radio": "Radio",
+  "term.recentlyAdded": "Recently Quacked",
+  "term.songs": "Songs",
+  "term.albums": "Albums",
+  "term.artists": "Artists",
+  "term.podcasts": "Podcasts",
+  "term.playlists": "Playlists",
+  "term.playlist": "Playlist",
+  "term.newPlaylist": "New Playlist",
+  "term.newPlaylistFolder": "New Playlist Folder",
+  "term.createNewPlaylist": "Quack New Playlist",
+  "term.createNewPlaylistFolder": "Quack New Playlist Folder",
+  "term.deletePlaylist": "Are you sure you want to quack this playlist?",
+  "term.play": "Play",
+  "term.pause": "Pause",
+  "term.previous": "Previous",
+  "term.next": "Next",
+  "term.shuffle": "Shuffle",
+  "term.repeat": "Repeat",
+  "term.volume": "Volume",
+  "term.mute": "Quack",
+  "term.unmute": "Unquack",
+  "term.share": "Quack",
+  "term.share.success": "Quacked to clipboard",
+  "term.settings": "Settings",
+  "term.seeAll": "Quack All",
+  "term.sortBy": "Quack By",
+  "term.sortBy.album": "Album",
+  "term.sortBy.artist": "Artist",
+  "term.sortBy.name": "Name",
+  "term.sortBy.genre": "Genre",
+  "term.sortBy.releaseDate": "Release Date",
+  "term.sortBy.duration": "Duration",
+  "term.sortBy.dateAdded": "Date Quacked",
+  "term.sortOrder": "A-Z",
+  "term.sortOrder.ascending": "Ascending",
+  "term.sortOrder.descending": "Descending",
+  "term.viewAs": "Quack As",
+  "term.viewAs.coverArt": "Cover Art",
+  "term.viewAs.list": "List",
+  "term.size": "Size",
+  "term.size.normal": "Normal",
+  "term.size.compact": "Compact",
+  "term.enable": "Enable",
+  "term.disable": "Disable",
+  "term.enabled": "Enabled",
+  "term.disabled": "Disabled",
+  "term.connect": "Connect",
+  "term.connecting": "Quacking",
+  "term.disconnect": "Disconnect",
+  "term.authed": "Authed",
+  "term.confirm": "You a duck?",
+  "term.more": "More",
+  "term.less": "Less",
+  "term.showMore": "Quack more",
+  "term.showLess": "Quack less",
+  "term.topSongs": "Top Songs",
+  "term.latestReleases": "Latest Releases",
+  "term.time.added": "Quacked",
+  "term.time.released": "Quacked",
+  "term.time.updated": "Quacked",
+  "term.time.hours": "hours",
+  "term.time.hour": "hour",
+  "term.time.minutes": "minutes",
+  "term.time.minute": "minute",
+  "term.time.seconds": "seconds",
+  "term.time.second": "second",
+  "term.fullscreenView": "Fullscreen View",
+  "term.defaultView": "Default View",
+  "term.audioSettings": "Audio Settings",
+  "term.clearAll": "Clear All",
+  "term.recentStations": "Recent Stations",
+  "term.language": "Language",
+  "term.funLanguages": "Fun",
+  "term.noLyrics": "Quacking... / Lyrics not found./ Instrumental.",
+  "term.copyright": "Copyright",
+  "term.rightsReserved": "All Rights Reserved.",
+  "term.sponsor": "Sponsor this project",
+  "term.ciderTeam": "Cider Team",
+  "term.developer": "Developer",
+  "term.socialTeam": "Social Team",
+  "term.socials": "Socials",
+  "term.contributors": "Contributors",
+  "term.equalizer": "Equalizer",
+  "term.reset": "Reset",
+  // Example for multiple plural forms : look up the key for your language in https://github.com/prantlf/fast-plural-rules/blob/master/docs/languages.md#supported-languages
+  "term.track": {
+    "one" : "duck",
+    "other" : "ducks"
+  },
+  "term.tracks": "tracks", // Assume x amount of tracks. e.g. 50 tracks 
+  "term.videos": "Videos",
+  "term.menu": "Menu",
+  "term.check": "Quack",
+  "term.aboutArtist": "About {{artistName}}", // e.g. 'About Doja Cat'
+  "term.topResult": "Top Result", // Search Results
+  "term.sharedPlaylists": "Shared Playlists", // Search Results
+  "term.people": "People", // Search Results
+  "term.newpreset.name": "New EQ Preset Name", // Equalizer Preset
+  "term.addedpreset": "Quacked Preset",
+  "term.deletepreset.warn": "Are you sure you want to delete this preset?",
+  "term.deletedpreset": "Quacked preset",
+  "term.requestError": "There was a problem with the request.",
+  "term.song.link.generate": "Quacking song.link share URL...",
+  "term.musicVideos": "Music Videos", // Search page friendlyTypes
+  "term.stations": "Stations",
+  "term.curators": "Curators",
+  "term.appleCurators": "Apple Curators",
+  "term.radioShows": "Radio Shows",
+  "term.recordLabels": "Record Labels",
+  "term.videoExtras": "Video Extras",
+  "term.top": "Top",
+  "term.version": "Version",
+  // Home
+  "home.title": "Home",
+  "home.recentlyPlayed": "Recently Quacked",
+  "home.recentlyAdded": "Recently Quacked",
+  "home.artistsFeed": "Your Artists Feed",
+  "home.artistsFeed.noArtist": "Follow some artists first and their latest releases will be here",
+  "home.madeForYou": "Made For You",
+  "home.friendsListeningTo": "Friends Quacking To",
+  "home.followedArtists": "Quacked Artists",
+  
+  // Errors
+  "error.appleMusicSubRequired": "Apple Music requires a subscription.",
+  "error.connectionError": "There was a problem quacking to Apple Music.",
+  "error.noResults": "No Results.",
+  "error.noResults.description": "Try a new duck.",
+  
+  // Podcasts
+  "podcast.followOnCider": "Quack On Cider",
+  "podcast.followedOnCider": "Quacking On Cider",
+  "podcast.subscribeOnItunes": "Quack On iTunes",
+  "podcast.subscribedOnItunes": "Quacked On iTunes",
+  "podcast.itunesStore": "iTunes Store",
+  "podcast.episodes": "Episodes",
+  "podcast.playEpisode": "Quack Episode",
+  "podcast.website": "Podcast Website",
+  
+  // Actions
+  "action.addToLibrary": "Quack to Library",
+  "action.addToLibrary.success": "Quacked to Library",
+  "action.addToLibrary.error": "Error Adding to Library",
+  "action.removeFromLibrary": "Quack from Library",
+  "action.removeFromLibrary.success": "Quacked from Library",
+  "action.addToQueue": "Quack to Queue",
+  "action.addToQueue.success": "Quacked to Queue",
+  "action.addToQueue.error": "Error Quacking to Queue",
+  "action.removeFromQueue": "Quack from Queue",
+  "action.removeFromQueue.success": "Quacked from Queue",
+  "action.removeFromQueue.error": "Error Removing from Queue",
+  "action.createPlaylist": "Create a New Playlist",
+  "action.addToPlaylist": "Quack to Playlist",
+  "action.removeFromPlaylist": "Quack from Playlist",
+  "action.addToFavorites": "Quack to Favorites",
+  "action.follow": "Quack",
+  "action.follow.success": "Quacked",
+  "action.follow.error": "Error Quacking",
+  "action.unfollow": "Unquack",
+  "action.unfollow.success": "Unquacked",
+  "action.unfollow.error": "Error Unquacking",
+  "action.playNext": "Quack Next",
+  "action.playLater": "Quack Later",
+  "action.startRadio": "Quack Radio",
+  "action.goToArtist": "Quack to Artist",
+  "action.goToAlbum": "Quack to Album",
+  "action.moveToTop": "Quack to top",
+  "action.share": "Quack",
+  "action.rename": "Quack",
+  "action.love": "Quack",
+  "action.unlove": "Unquack",
+  "action.dislike": "Disquack",
+  "action.undoDislike": "Unquack disquack",
+  "action.showWebRemoteQR": "Web Remote",
+  "action.playTracksNext": "Quack ${app.selectedMediaItems.length} tracks next",
+  "action.playTracksLater": "Quack ${app.selectedMediaItems.length} tracks later",
+  "action.removeTracks": "Quack ${self.selectedItems.length} tracks from queue",
+  "action.import": "Import",
+  "action.export": "Export",
+  "action.showAlbum": "Quack Complete Album",
+  "action.tray.minimize": "Quackmize to Tray",
+  "action.tray.quit": "Die",
+  "action.tray.show": "Alive Me",
+  "action.update": "gib new quackys",
+  "action.copy": "Quack",
+  "action.newpreset": "New Quackset...", // Equalizer Preset
+  "action.deletepreset": "Delete Quackset",
+  
+  // Settings - General
+  "settings.header.general": "General",
+  "settings.header.general.description": "Adjust the general settings for Cider.",
+  "settings.option.general.language": "Language",
+  
+  // Language optgroups
+  "settings.option.general.language.main": "Languages",
+  "settings.option.general.language.fun": "Fun Languages",
+  "settings.option.general.language.unsorted": "Unsorted",
+
+  // Update Cider
+  "settings.option.general.updateCider": "Update Cider", // Button. Refer to term.check for the check button
+  "settings.option.general.updateCider.branch": "Cider Update Branch", // Dropdown
+  "settings.option.general.updateCider.branch.description": "Select the branch to update Cider to",
+  "settings.option.general.updateCider.branch.main": "Stable",
+  "settings.option.general.updateCider.branch.develop": "Development",
+  
+  // Settings - Audio
+  "settings.header.audio": "Audio",
+  "settings.header.audio.description": "Adjust the audio settings for Cider.",
+  "settings.option.audio.quality": "Audio Quality", // Dropdown
+  "settings.header.audio.quality.hireslossless": "Hi-Res Lossless",
+  "settings.header.audio.quality.hireslossless.description": "up to 24-bit/192 kHz",
+  "settings.header.audio.quality.lossless": "Lossless",
+  "settings.header.audio.quality.lossless.description": "up to 24-bit/48 kHz",
+  "settings.header.audio.quality.high": "High",
+  "settings.header.audio.quality.high.description": "256 kbps",
+  "settings.header.audio.quality.standard": "Standard",
+  "settings.header.audio.quality.standard.description": "64 kbps",
+  "settings.option.audio.seamlessTransition": "Seamless Audio Transition", // Toggle
+  "settings.option.audio.enableAdvancedFunctionality": "Enable Advanced Functionality", // Toggle
+  "settings.option.audio.enableAdvancedFunctionality.description": "Enabling AudioContext functionality will allow for extended audio features like Audio Normalization , Equalizers and Visualizers, however on some systems this may cause stuttering in audio tracks.",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPE": "Cider Adrenaline Processor™️", // Toggle
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPE.description": "Psychoacoustic Enhancements that makes everything sound both richer and more lively | Designed by Maikiwi.",
+  "settings.warn.audio.enableAdvancedFunctionality.ciderPPE.compatibility": "CAP is not compatible with Spatialization. Please disable Spatialization to continue.",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength": "CAP Strength", // Toggle
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.description": "Changes the strength of the processing done to the audio. (Aggressive may yield undesirable results)",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "Standard",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "Aggressive",
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization": "Audio Normalization", // Toggle
+  "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "Normalizes peak volume for individual tracks to create a more uniform listening experience.",
+  "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "Audio Spatialization", // Toggle
+  "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "Spatialize audio and make audio more 3-dimensional (note: This is not Dolby Atmos)",
+  "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "Spatialization is not compatible with CAP. Please disable CAP to continue.",
+  
+  // Settings - Visual
+  "settings.header.visual": "Visual",
+  "settings.header.visual.description": "Adjust the visual settings for Cider.",
+  "settings.option.visual.windowBackgroundStyle": "Window Background Style", // Toggle
+  "settings.header.visual.windowBackgroundStyle.none": "None",
+  "settings.header.visual.windowBackgroundStyle.artwork": "Artwork",
+  "settings.header.visual.windowBackgroundStyle.image": "Image",
+  "settings.option.visual.animatedArtwork": "Animated Artwork", // Dropdown
+  "settings.header.visual.animatedArtwork.always": "Always",
+  "settings.header.visual.animatedArtwork.limited": "Limited to pages and special entries",
+  "settings.header.visual.animatedArtwork.disable": "Disable everywhere",
+  "settings.option.visual.animatedArtworkQuality": "Animated Artwork Quality", // Dropdown
+  "settings.header.visual.animatedArtworkQuality.low": "Low",
+  "settings.header.visual.animatedArtworkQuality.medium": "Medium",
+  "settings.header.visual.animatedArtworkQuality.high": "High",
+  "settings.header.visual.animatedArtworkQuality.veryHigh": "Very High",
+  "settings.header.visual.animatedArtworkQuality.extreme": "Extreme",
+  "settings.option.visual.animatedWindowBackground": "Animated Window Background", // Toggle
+  "settings.option.visual.hardwareAcceleration": "Hardware Acceleration", // Dropdown
+  "settings.option.visual.hardwareAcceleration.description": "Requires relaunch",
+  "settings.header.visual.hardwareAcceleration.default": "Default",
+  "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
+  "settings.header.visual.theme": "Theme",
+  
+  // Settings - Visual - Theme name
+  "settings.option.visual.theme.default": "Cider",
+  "settings.option.visual.theme.dark": "Dark",
+  
+  // Refer to term.disabled for the disabled option
+  "settings.option.visual.showPersonalInfo": "Show Personal Info", // Toggle
+  
+  // Settings - Lyrics
+  "settings.header.lyrics": "Lyrics",
+  "settings.header.lyrics.description": "Adjust the lyrics settings for Cider.",
+  "settings.option.lyrics.enableMusixmatch": "Enable Musixmatch Lyrics", // Toggle
+  "settings.option.lyrics.enableMusixmatchKaraoke": "Enable Karaoke Mode (Musixmatch only)", // Toggle
+  "settings.option.lyrics.musixmatchPreferredLanguage": "Musixmatch Translation Preferred Language", // Dropdown
+  "settings.option.lyrics.enableYoutubeLyrics": "Enable Youtube Lyrics for Music Videos", // Toggle
+  
+  // Settings - Connectivity
+  "settings.header.connectivity": "Connectivity",
+  "settings.header.connectivity.description": "Adjust the connectivity settings for Cider.",
+  "settings.option.connectivity.discordRPC": "Discord Rich Presence", // Dropdown
+  "settings.option.connectivity.playbackNotifications": "Playback Notifications", // Toggle
+  // Refer to term.disabled for the disabled option
+  "settings.header.connectivity.discordRPC.cider": "Display as 'Cider'",
+  "settings.header.connectivity.discordRPC.appleMusic": "Display as 'Apple Music'",
+  "settings.option.connectivity.discordRPC.clearOnPause": "Clear Discord Rich Presence on Pause", // Toggle
+  "settings.option.connectivity.lastfmScrobble": "Last.fm Scrobbling", // Option to Connect
+  "settings.option.connectivity.lastfmScrobble.delay": "Last.fm Scrobble Delay (%)",
+  "settings.option.connectivity.lastfmScrobble.nowPlaying": "Enable Last.fm Now Playing",
+  "settings.option.connectivity.lastfmScrobble.removeFeatured": "Remove featuring artists from song title (Last.fm)",
+  "settings.option.connectivity.lastfmScrobble.filterLoop": "Filter looped track (Last.fm)",
+  // Refer to term.connect for the connect button
+  
+  // Settings - Experimental
+  "settings.header.experimental": "Experimental",
+  "settings.header.experimental.description": "Adjust the experimental settings for Cider.",
+  "settings.option.experimental.compactUI": "Compact UI", // Toggle
+  "settings.option.experimental.close_button_hide": "Close Button Should Hide the Application",
+  "settings.option.experimental.copy_log": "Copy logs to clipboard",
+  "settings.option.experimental.inline_playlists": "Inline Playlists and Albums",
+  
+  // Refer to term.disabled & term.enabled
+  // Spatialization Menu
+  "spatial.notTurnedOn": "Audio Spatialization is disabled. To use, please enable it first.",
+  "spatial.spatialProperties": "Spatial Properties",
+  "spatial.width": "Width",
+  "spatial.height": "Height",
+  "spatial.depth": "Depth",
+  "spatial.gain": "Gain",
+  "spatial.roomMaterials": "Room Materials",
+  "spatial.roomDimensions": "Room Dimensions",
+  "spatial.roomPositions": "Room Positions",
+  "spatial.setDimensions": "Set Dimensions",
+  "spatial.setPositions": "Set Positions",
+  "spatial.up": "Up",
+  "spatial.front": "Front",
+  "spatial.left": "Left",
+  "spatial.right": "Right",
+  "spatial.back": "Back",
+  "spatial.down": "Down",
+  "spatial.listener": "Listener",
+  "spatial.audioSource": "Audio Source",
+
+  // Settings - Unfinished
+  "settings.header.unfinished": "Unfinished",
+
+  // Web Remote
+  "remote.web.title": "Cider Remote",
+  "remote.web.description": "Scan the QR code to pair your phone up with this Cider instance",
+
+  // About
+  "about.thanks": "Major thanks to the Cider Collective Team and all of our contributors. Translation file made by @quacksire",
+}
\ No newline at end of file
diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts
index 31e8d81f..1a444b7f 100644
--- a/src/main/plugins/discordrpc.ts
+++ b/src/main/plugins/discordrpc.ts
@@ -62,7 +62,6 @@ export default class DiscordRichPresence {
 
         // Create the client
         this._client = new RPC.Client({transport: "ipc"});
-
         // Runs on Ready
         this._client.on('ready', () => {
             console.info(`[DiscordRPC][connect] Successfully Connected to Discord. Authed for user: ${this._client.user.id}.`);

From 4e591a711acd705f1044ca0ea6c6b255ab1878d3 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 12:59:06 +0700
Subject: [PATCH 18/44] Update build-macos.yml

---
 .github/workflows/build-macos.yml | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index a926b492..15e4be49 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -20,9 +20,6 @@ on:
     - '.gitmodules'
     - '.gitignore'
     - 'LICENSE'
-  pull_request:
-    # The branches below must be a subset of the branches above
-    branches: [ develop ]
   schedule:
     - cron: '44 20 * * 1'
 

From e78738ad54e6a47c99ba5776e0360e5245074b4a Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 13:49:02 +0700
Subject: [PATCH 19/44] move to pkg

---
 package.json     |  15 ++++++++++++++-
 resources/bg.png | Bin 0 -> 10927 bytes
 2 files changed, 14 insertions(+), 1 deletion(-)
 create mode 100644 resources/bg.png

diff --git a/package.json b/package.json
index e3a751ef..865c0392 100644
--- a/package.json
+++ b/package.json
@@ -69,6 +69,7 @@
     "@types/ws": "^8.2.2",
     "electron": "git+https://github.com/castlabs/electron-releases.git",
     "electron-builder": "^22.14.13",
+    "electron-builder-notarize-pkg": "^1.2.0",
     "electron-webpack": "^2.8.2",
     "musickit-typescript": "^1.2.4",
     "playwright": "^1.18.1",
@@ -106,6 +107,7 @@
     "appId": "cider",
     "afterPack": "./resources/afterPack.js",
     "afterSign": "./resources/notarize.js",
+    "afterAllArtifactBuild": "electron-builder-notarize-pkg",
     "protocols": [
       {
         "name": "Cider",
@@ -151,6 +153,17 @@
       "license": "LICENSE",
       "deleteAppDataOnUninstall": true
     },
+    "pkg": {
+      "allowAnywhere": true,
+      "allowRootDirectory" : true,
+      "license" : "LICENSE",
+      "overwriteAction": "upgrade",
+      "background" : {
+        "file": "./resources/bg.png",
+        "alignment": "bottomleft",
+        "scaling": "tofit"
+      }
+    },
     "win": {
       "target": [
         "nsis"
@@ -170,7 +183,7 @@
       "entitlementsInherit": "./resources/entitlements.mac.plist",
       "darkModeSupport": true,
       "target": [
-        "dmg"
+        "pkg"
       ]
     }
   }
diff --git a/resources/bg.png b/resources/bg.png
new file mode 100644
index 0000000000000000000000000000000000000000..049f0b16746ce7bab8b2511d6c503a276f27e60b
GIT binary patch
literal 10927
zcmeHNT}V_x6rNr0ZoAfoX_Oh1h5bQckq?DQW=2_|(GLVcZ5!nhSV3fk58f<dBM2WV
zd`R1eD0(Q|CkZoGSm-4zsD~xmFo-PLG$^nLvX!|r=RO=}=kA?r3HdZEXYQOi=R4o|
z8L#ZB-x|m-$tQ#a>bBMHCS;mUh_=q>&HVE5<-le_N=aSqroHEGrBj=lwABULKwo%h
zq27Jw)SZ1>4&Qzd+c-M*Yi33|^QX6tKJ~lkx<m`oh3<0|(^Y8=nfPqxFH)czVvB`h
z$*OxA-Lbse>R!nsK&<)s3PY*<m0Z2%rE#hN@y}taS?<;Jx9Uq|23-{_B6)OG>l2B^
zTI&5&ZdcG{aj)bNm{{-db$TlCz%43^g7imSo6c7MeFZL^1Ye;?#MZiuFxjRS^r5j^
zh1BEGxI5>Vgn&Up*K|bi9t(-GbM6v)u5|`LPK%^YZ#RJJRsme`5pA7rBTn0g{9)r<
z8({*cp?rhb)DCMVSH!8x#NVY`Bwx@JQOe|K=djduz)iK+_A@Mr=@sKXgsjo9liVvQ
z7HfIF%E%^e$R>y(?RZx;Jve1=uvxlmkKxkUDqNZv0hM=-dnj1KU$qLlvYwwoQ%K`z
z@<dRD?G=ip-=5w<71fDDM5ctOIBK0^Ud3D(It$Tvcicc+#lM|~k|~Y`{Zl{11qrBN
zZPjjbPE&xZn*3tY6e27#k0p}|H5{~li9t6PJh?Xpy~8&RpSz$$U(1@FuxhH$y%IFX
z7G$<#tP^^nwy#Ny<ZfMab^uR5BSz^P9Z*^X+ljJBs;b9mbba9I4i|&d#oU2~WhFZq
zt+(Zb(ZLpgr`O~KDR_0SibQ6o?MFl2#486`8LT9v)H@xj?hhW;Zu}*q;*rj)0h3Xm
zDCMafjM_Z*#%OIzv38_mZj_CsfU=N_I97~DIvdzXsZgjv=r5Tv`BP&P0WmFp-~p}#
zl>m3y5->C@Ik)O4XC^NZnq1Q9f{NtFk<n{SL_b`7`RLd2@}5@T`|0yMJsC!XNnv7e
zS)5WNI!H{6oM$r<(`+Wx$g*lXa4kmY!ZyQtClmYTXPKu>n0cPfWtR#-(ITmgP%KNI
zSb4JA7`K)|VuyPopH|)S%cju(rX(aw8?M}x00h}jOU6_d5Tzfx0yM_0hijHk!<7(h
zW7>;vo*10}Lcm5a1BXv%iAYJc5Ha-Tc4pvqsz*piNOgc_fKVf!4_oGF^y*-8%TDLk
zMZ2cNpk#`dy}D%L6pEp>UZhhp{~#7ZuZ{s4*((-9LrTdb8VW3-*`W5u#L!Yo$xG&>
zShv!{OVJ`mQ&35Xoy0=`#8gL_2?zhUrra1Nw++<u*F`IH@^5d$Hwei;KJmW*6PW|e
z>64Koy7#cEzHkFex3aJA7`2+bsknr7Y`TwzH$vJNH3-F$eb^9^qX<F@Go(<=Ib@jT
zrY~Drldl9B{6ePau`%JrY}P9tTL`NWN$;x8EgV3R6gCOOZpjU489=J3n`>eo4Nt*`
z!;weq$szvz5G~|&Zv*RzmAsLIBd2ui0^}wIOE8Ua>X`v5Kh=?q&QL?%IK>xHJmEpg
zZ`C}ThA`3j7%MS@)elOhf<hKXn;USTaIaWwD*CFwsxq2M(ACA?f8YP|F6w2kZ$p>Z
h>%qE3%r^`6=6!zEw`OSY_0<XZ)orP-eOME0`vZo*?Dzlx

literal 0
HcmV?d00001


From 628f39961cf7fd1a84ddbd62871b352496a40818 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 13:51:42 +0700
Subject: [PATCH 20/44] oops

---
 .github/workflows/build-macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 15e4be49..7988572e 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -100,5 +100,5 @@ jobs:
         # Artifact name
         name: macOS
         # A file, directory or wildcard pattern that describes what to upload
-        path: dist/*.dmg
+        path: dist/*.pkg
         # The desired behavior if no files are found using the provided path.

From 03761ae4c213839a9698025b0b936bdcba5a1816 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 13:57:43 +0700
Subject: [PATCH 21/44] for sure

---
 .github/workflows/build-macos.yml | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 7988572e..0ad184f4 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -84,6 +84,8 @@ jobs:
         CSC_KEY_PASSWORD: ${{ secrets.CSC_KEY_PASSWORD }} 
         APPLEID: ${{ secrets.APPLEID }}
         APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
+        APPLE_ID: ${{ secrets.APPLEID }}
+        APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
         DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
       run: |
         rm cider-yarn.lock || true

From bd1d80283dcc48a34556c41d1d7e5ef0dd8f1259 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
 <46503943+jay900604@users.noreply.github.com>
Date: Sat, 12 Feb 2022 17:24:27 +0800
Subject: [PATCH 22/44] Update zh_TW.jsonc (#432)

Update TW language.
---
 src/i18n/zh_TW.jsonc | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc
index 0f398cd2..551e868d 100644
--- a/src/i18n/zh_TW.jsonc
+++ b/src/i18n/zh_TW.jsonc
@@ -126,7 +126,8 @@
   "term.menu": "選單",
   "term.check": "檢查",
   "term.aboutArtist": "關於{{artistName}}", // e.g. 'About Doja Cat'
-  
+  "term.version": "版本",
+   
   // Home
   "home.title": "首頁",
   "home.recentlyPlayed": "最近播放",

From 0af82d597f9654405af0ed8b040dd2ed4cbe5954 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 17:18:58 +0700
Subject: [PATCH 23/44] att 1

---
 package.json          |  19 +-
 resources/license.txt | 661 ++++++++++++++++++++++++++++++++++++++++++
 2 files changed, 673 insertions(+), 7 deletions(-)
 create mode 100644 resources/license.txt

diff --git a/package.json b/package.json
index 865c0392..b5d2372a 100644
--- a/package.json
+++ b/package.json
@@ -69,7 +69,7 @@
     "@types/ws": "^8.2.2",
     "electron": "git+https://github.com/castlabs/electron-releases.git",
     "electron-builder": "^22.14.13",
-    "electron-builder-notarize-pkg": "^1.2.0",
+    "electron-builder-notarize-pkg": "^1.1.0",
     "electron-webpack": "^2.8.2",
     "musickit-typescript": "^1.2.4",
     "playwright": "^1.18.1",
@@ -154,15 +154,20 @@
       "deleteAppDataOnUninstall": true
     },
     "pkg": {
-      "allowAnywhere": true,
-      "allowRootDirectory" : true,
-      "license" : "LICENSE",
-      "overwriteAction": "upgrade",
-      "background" : {
+      "scripts": "../build/pkg-scripts",
+      "installLocation": "/Applications",
+      "background": {
         "file": "./resources/bg.png",
         "alignment": "bottomleft",
         "scaling": "tofit"
-      }
+      },
+      "allowAnywhere": true,
+      "allowCurrentUserHome": true,
+      "allowRootDirectory": true,
+      "license": "/resources/license.txt",
+      "isVersionChecked": true,
+      "isRelocatable": false,
+      "overwriteAction": "upgrade"
     },
     "win": {
       "target": [
diff --git a/resources/license.txt b/resources/license.txt
new file mode 100644
index 00000000..0ad25db4
--- /dev/null
+++ b/resources/license.txt
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.

From 57876245db7cb3b319f5f8741de62f6c5f46e423 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 17:19:23 +0700
Subject: [PATCH 24/44] aa

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

diff --git a/package.json b/package.json
index b5d2372a..e9b87911 100644
--- a/package.json
+++ b/package.json
@@ -154,7 +154,7 @@
       "deleteAppDataOnUninstall": true
     },
     "pkg": {
-      "scripts": "../build/pkg-scripts",
+      "scripts": "/build/pkg-scripts",
       "installLocation": "/Applications",
       "background": {
         "file": "./resources/bg.png",

From 8a557f46eda4220c3f89d1eecca037a42c9d0626 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 17:21:15 +0700
Subject: [PATCH 25/44] add key

---
 .github/workflows/build-macos.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 0ad184f4..ba27889e 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -86,6 +86,7 @@ jobs:
         APPLEIDPASS: ${{ secrets.APPLEIDPASS }}
         APPLE_ID: ${{ secrets.APPLEID }}
         APPLE_ID_PASSWORD: ${{ secrets.APPLEIDPASS }}
+        PSC_NAME: ${{ secrets.PSC_NAME }}
         DEVELOPER_DIR: /Applications/Xcode_12.4.app/Contents/Developer
       run: |
         rm cider-yarn.lock || true

From ceaed2b0f2835877181a73dab22c704db000c22f Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 17:34:21 +0700
Subject: [PATCH 26/44] typo

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

diff --git a/package.json b/package.json
index e9b87911..5d471948 100644
--- a/package.json
+++ b/package.json
@@ -164,7 +164,7 @@
       "allowAnywhere": true,
       "allowCurrentUserHome": true,
       "allowRootDirectory": true,
-      "license": "/resources/license.txt",
+      "license": "./resources/license.txt",
       "isVersionChecked": true,
       "isRelocatable": false,
       "overwriteAction": "upgrade"

From 590eef84d6adae87bdbb7987f94b31e7f0d204fa Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 17:34:30 +0700
Subject: [PATCH 27/44] ok

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

diff --git a/package.json b/package.json
index 5d471948..b74e9d5e 100644
--- a/package.json
+++ b/package.json
@@ -154,7 +154,7 @@
       "deleteAppDataOnUninstall": true
     },
     "pkg": {
-      "scripts": "/build/pkg-scripts",
+      "scripts": "build/pkg-scripts",
       "installLocation": "/Applications",
       "background": {
         "file": "./resources/bg.png",
@@ -165,7 +165,7 @@
       "allowCurrentUserHome": true,
       "allowRootDirectory": true,
       "license": "./resources/license.txt",
-      "isVersionChecked": true,
+      "isVersionChecked": false,
       "isRelocatable": false,
       "overwriteAction": "upgrade"
     },

From a99b0a76130aa0b0c8283c6bd00f0e2ee1e35a26 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 17:44:05 +0700
Subject: [PATCH 28/44] fix

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index b74e9d5e..2794e952 100644
--- a/package.json
+++ b/package.json
@@ -154,7 +154,6 @@
       "deleteAppDataOnUninstall": true
     },
     "pkg": {
-      "scripts": "build/pkg-scripts",
       "installLocation": "/Applications",
       "background": {
         "file": "./resources/bg.png",

From ae301b49e5d97e731230cf8cff96efaecbaac069 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 18:11:47 +0700
Subject: [PATCH 29/44] use mas and dmg for now

---
 .github/workflows/build-macos.yml |  2 +-
 package.json                      | 10 +++++++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index ba27889e..0cf7a00e 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -103,5 +103,5 @@ jobs:
         # Artifact name
         name: macOS
         # A file, directory or wildcard pattern that describes what to upload
-        path: dist/*.pkg
+        path: dist/
         # The desired behavior if no files are found using the provided path.
diff --git a/package.json b/package.json
index 2794e952..e295e528 100644
--- a/package.json
+++ b/package.json
@@ -168,6 +168,14 @@
       "isRelocatable": false,
       "overwriteAction": "upgrade"
     },
+    "dmg": {
+      "background": "./resources/bg.png",
+      "icon": "resources/icons/icon.ico"
+    },
+    "mas": {
+      "entitlements": "./resources/entitlements.mac.plist",
+      "entitlementsInherit": "./resources/entitlements.mac.plist"
+    },
     "win": {
       "target": [
         "nsis"
@@ -187,7 +195,7 @@
       "entitlementsInherit": "./resources/entitlements.mac.plist",
       "darkModeSupport": true,
       "target": [
-        "pkg"
+        "dmg" , "mas"
       ]
     }
   }

From 7d385c94770daa4630ee90550df4b5ce987a699e Mon Sep 17 00:00:00 2001
From: kyw504100 <kyw504100@hotmail.com>
Date: Sat, 12 Feb 2022 19:45:57 +0800
Subject: [PATCH 30/44] Duplicated items in sk_SK.jsonc

---
 src/i18n/sk_SK.jsonc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/i18n/sk_SK.jsonc b/src/i18n/sk_SK.jsonc
index 6d77106c..22785c26 100644
--- a/src/i18n/sk_SK.jsonc
+++ b/src/i18n/sk_SK.jsonc
@@ -1,4 +1,4 @@
-{
+{ // To translator, please correct Line 294-297. Delete this sentence after that.
 
   // i18n Info
   "i18n.languageName": "Slovenčina (SK)", // name of language in native language
@@ -291,10 +291,10 @@
   // Settings - Experimental
   "settings.header.experimental": "Experimentálne",
   "settings.header.experimental.description": "Zmeniť experimentálne nastavenia pre Cider.",
-  "settings.option.experimental.compactUI": "Compact UI", // Toggle
-  "settings.option.experimental.close_button_hide": "Zatvoriť by malo skriť aplikáciu",
-  "settings.option.experimental.compactUI": "Kompaktný UI", // Toggle
-  "settings.option.experimental.close_button_hide": "Zatvaranie aplikácie ju malo skriť",
+    //"settings.option.experimental.compactUI": "Compact UI", // Toggle
+    //"settings.option.experimental.close_button_hide": "Zatvoriť by malo skriť aplikáciu",
+    //"settings.option.experimental.compactUI": "Kompaktný UI", // Toggle
+    //"settings.option.experimental.close_button_hide": "Zatvaranie aplikácie ju malo skriť",
 
   // Refer to term.disabled & term.enabled
   // Spatialization Menu

From 59e30a1424c2ec4277b1398d846548d5dfbd52f7 Mon Sep 17 00:00:00 2001
From: kyw504100 <kyw504100@hotmail.com>
Date: Sat, 12 Feb 2022 19:50:37 +0800
Subject: [PATCH 31/44] quacksire, no comma

---
 src/i18n/en_QUK.jsonc | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/i18n/en_QUK.jsonc b/src/i18n/en_QUK.jsonc
index 3caf1ae7..bdadd21d 100644
--- a/src/i18n/en_QUK.jsonc
+++ b/src/i18n/en_QUK.jsonc
@@ -365,5 +365,5 @@
   "remote.web.description": "Scan the QR code to pair your phone up with this Cider instance",
 
   // About
-  "about.thanks": "Major thanks to the Cider Collective Team and all of our contributors. Translation file made by @quacksire",
+  "about.thanks": "Major thanks to the Cider Collective Team and all of our contributors. Translation file made by @quacksire"
 }
\ No newline at end of file

From 9faa5ec01429011b9b48f3b1eeacb09497b28377 Mon Sep 17 00:00:00 2001
From: kyw504100 <kyw504100@hotmail.com>
Date: Sat, 12 Feb 2022 20:04:51 +0800
Subject: [PATCH 32/44] Update i18n changelog

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

diff --git a/src/i18n/README.md b/src/i18n/README.md
index 264ceea6..b5480a90 100644
--- a/src/i18n/README.md
+++ b/src/i18n/README.md
@@ -105,3 +105,8 @@ Update 08/02/2022 10:20 UTC
 Update 10/02/2022 05:58 UTC
 
 * `term.sortBy.dateAdded`: Added for `en_US`.
+
+Update 12/02/2022 12:00 UTC
+
+* Added support for multiple plural forms. [Details](#multiple-plural-forms)
+* `term.version`: Added for `en_US`.
\ No newline at end of file

From ba41683589e21bf8ba4a0878498ab1781132604f Mon Sep 17 00:00:00 2001
From: kyw504100 <kyw504100@hotmail.com>
Date: Sat, 12 Feb 2022 20:08:21 +0800
Subject: [PATCH 33/44] Update zh_HK.jsonc

---
 src/i18n/zh_HK.jsonc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc
index c6aa902f..a67cb7c5 100644
--- a/src/i18n/zh_HK.jsonc
+++ b/src/i18n/zh_HK.jsonc
@@ -72,6 +72,7 @@
   "term.sortBy.genre": "音樂風格",
   "term.sortBy.releaseDate": "發行日期",
   "term.sortBy.duration": "時長",
+  "term.sortBy.dateAdded": "加入日期",
   "term.sortOrder": "字母排序",
   "term.sortOrder.ascending": "順序",
   "term.sortOrder.descending": "倒序",
@@ -123,6 +124,11 @@
   "term.contributors": "貢獻者",
   "term.equalizer": "均衡器",
   "term.reset": "重設",
+  // Example for multiple plural forms : look up the key for your language in https://github.com/prantlf/fast-plural-rules/blob/master/docs/languages.md#supported-languages
+  // "term.track": {
+  //   "one" : "track",
+  //   "other" : "tracks"
+  // },
   "term.tracks": "首歌曲", // Assume x amount of tracks. e.g. 50 tracks 
   "term.videos": "影片",
   "term.menu": "選項",
@@ -145,6 +151,7 @@
   "term.recordLabels": "唱片公司",
   "term.videoExtras": "影片特輯",
     //"term.top": "Top",
+  "term.version": "版本",
 
   // Home
   "home.title": "主頁",

From d836c4c5138c90598c6f42f0e8468a7918839f1c Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 19:12:23 +0700
Subject: [PATCH 34/44] dmg again

---
 .github/workflows/build-macos.yml |   7 +-
 license.txt                       | 661 ++++++++++++++++++++++++++++++
 package.json                      |   3 +-
 resources/license.json            |  11 +
 4 files changed, 679 insertions(+), 3 deletions(-)
 create mode 100644 license.txt
 create mode 100644 resources/license.json

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 0cf7a00e..2d7b842d 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -97,11 +97,16 @@ jobs:
 #     - name: Perform CodeQL Analysis
 #       uses: github/codeql-action/analyze@v1
 
+    - name: Add license to dmg
+      run: |
+        npm install --global dmg-license
+        dmg-license resources/license.json dist/*.dmg
+
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v2.2.3
       with:
         # Artifact name
         name: macOS
         # A file, directory or wildcard pattern that describes what to upload
-        path: dist/
+        path: dist/*.dmg
         # The desired behavior if no files are found using the provided path.
diff --git a/license.txt b/license.txt
new file mode 100644
index 00000000..0ad25db4
--- /dev/null
+++ b/license.txt
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published
+    by the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
diff --git a/package.json b/package.json
index e295e528..0cf9f1fb 100644
--- a/package.json
+++ b/package.json
@@ -107,7 +107,6 @@
     "appId": "cider",
     "afterPack": "./resources/afterPack.js",
     "afterSign": "./resources/notarize.js",
-    "afterAllArtifactBuild": "electron-builder-notarize-pkg",
     "protocols": [
       {
         "name": "Cider",
@@ -195,7 +194,7 @@
       "entitlementsInherit": "./resources/entitlements.mac.plist",
       "darkModeSupport": true,
       "target": [
-        "dmg" , "mas"
+        "dmg"
       ]
     }
   }
diff --git a/resources/license.json b/resources/license.json
new file mode 100644
index 00000000..0451b856
--- /dev/null
+++ b/resources/license.json
@@ -0,0 +1,11 @@
+{
+	"$schema": "https://github.com/argv-minus-one/dmg-license/raw/master/schema.json",
+    "body": [
+		{
+			"file": "license.txt",
+			"lang": ["en-US"]
+		}
+    ]
+
+	
+}
\ No newline at end of file

From f87869397ca9a4d999068dd45aaee04720afa2fa Mon Sep 17 00:00:00 2001
From: kyw504100 <kyw504100@hotmail.com>
Date: Sat, 12 Feb 2022 20:14:18 +0800
Subject: [PATCH 35/44] nope

---
 src/i18n/en_US.jsonc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc
index fc16c0c1..034a20e6 100644
--- a/src/i18n/en_US.jsonc
+++ b/src/i18n/en_US.jsonc
@@ -152,6 +152,7 @@
   "term.videoExtras": "Video Extras",
   "term.top": "Top",
   "term.version": "Version",
+  
   // Home
   "home.title": "Home",
   "home.recentlyPlayed": "Recently Played",

From 6c9d2e064d5eca5d5ce1ce68b7388fc2fef3e7a6 Mon Sep 17 00:00:00 2001
From: kyw504100 <kyw504100@hotmail.com>
Date: Sat, 12 Feb 2022 20:17:08 +0800
Subject: [PATCH 36/44] Update en_SGA.jsonc

---
 src/i18n/en_SGA.jsonc | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/i18n/en_SGA.jsonc b/src/i18n/en_SGA.jsonc
index 2174befe..875080cd 100644
--- a/src/i18n/en_SGA.jsonc
+++ b/src/i18n/en_SGA.jsonc
@@ -72,6 +72,7 @@
   "term.sortBy.genre": "┤ᒷリ∷ᒷ",
   "term.sortBy.releaseDate": "∷ᒷ|:ᒷᖋϟᒷ ↸ᖋᒣᒷ",
   "term.sortBy.duration": "↸⚍∷ᖋᒣ╎ᒍリ",
+  "term.sortBy.dateAdded": "↸ᖋᒣᒷ ᖋ↸↸ᒷ↸",
   "term.sortOrder": "ᖋ-∩",
   "term.sortOrder.ascending": "ᖋϟᔮᒷリ↸╎リ┤",
   "term.sortOrder.descending": "↸ᒷϟᔮᒷリ↸╎リ┤",
@@ -123,6 +124,11 @@
   "term.contributors": "ᔮᒍリᒣ∷╎ᕊ⚍ᒣᒍ∷ϟ",
   "term.equalizer": "ᒷᑑ⚍ᖋ|:╎∩ᒷ∷",
   "term.reset": "∷ᒷϟᒷᒣ",
+  // Example for multiple plural forms : look up the key for your language in https://github.com/prantlf/fast-plural-rules/blob/master/docs/languages.md#supported-languages
+  // "term.track": {
+  //   "one" : "track",
+  //   "other" : "tracks"
+  // },
   "term.tracks": "ᒣ∷ᖋᔮ·ǀ·ϟ", // Assume x amount of tracks. e.g. 50 tracks 
   "term.videos": "⍊╎↸ᒷᒍ",
   "term.menu": "ᒲᒷ⚍リ",
@@ -145,6 +151,7 @@
   "term.recordLabels": "∷ᒷᔮᒍ∷↸ |:ᖋᕊᒷ|:ϟ",
   "term.videoExtras": "⍊╎↸ᒷᒍ ᒷ/ᒣ∷ᖋϟ",
   "term.top": "ᒣᒍi!",
+  "term.version": "⍊ᒷ∷ϟ╎ᒍリ",
 
   // Home
   "home.title": "⍑ᒍᒲᒷ",

From 68b8e1d3033259428dcd487049eb879714221db4 Mon Sep 17 00:00:00 2001
From: JYW0803 <74043061+JYW0803@users.noreply.github.com>
Date: Sat, 12 Feb 2022 20:31:08 +0800
Subject: [PATCH 37/44] Fix windows auto update

Windows exe file name is different from latest.yml, casing 404 error.
`Error: Cannot download "https://416-429851205-gh.circle-artifacts.com/0/%7E/Cider/dist/artifacts/Cider-Setup-1.1.416.exe.blockmap", status 404: Not Found`
---
 package.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 0cf9f1fb..a1362af9 100644
--- a/package.json
+++ b/package.json
@@ -150,7 +150,8 @@
       "perMachine": false,
       "allowToChangeInstallationDirectory": true,
       "license": "LICENSE",
-      "deleteAppDataOnUninstall": true
+      "deleteAppDataOnUninstall": true,
+      "artifactName": "${productName}-Setup-${version}.${ext}"
     },
     "pkg": {
       "installLocation": "/Applications",

From e8dc59580a120c4f4f3a150d564654b8dffd4c18 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 20:24:31 +0700
Subject: [PATCH 38/44] add --save-dev

---
 .github/workflows/build-macos.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index 2d7b842d..cd563927 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -99,7 +99,7 @@ jobs:
 
     - name: Add license to dmg
       run: |
-        npm install --global dmg-license
+        npm install --global dmg-license --save-dev
         dmg-license resources/license.json dist/*.dmg
 
     - name: Upload a Build Artifact

From bc9ecfca03d0ac579744e43005c0c52e3b5ecf6a Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 20:35:55 +0700
Subject: [PATCH 39/44] pain

---
 .github/workflows/build-macos.yml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/.github/workflows/build-macos.yml b/.github/workflows/build-macos.yml
index cd563927..57654cfa 100644
--- a/.github/workflows/build-macos.yml
+++ b/.github/workflows/build-macos.yml
@@ -99,8 +99,7 @@ jobs:
 
     - name: Add license to dmg
       run: |
-        npm install --global dmg-license --save-dev
-        dmg-license resources/license.json dist/*.dmg
+        npx dmg-license resources/license.json dist/*.dmg
 
     - name: Upload a Build Artifact
       uses: actions/upload-artifact@v2.2.3

From 802436e875f35fcb3c25d57af018f8f2eec03e62 Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sat, 12 Feb 2022 23:24:00 +0700
Subject: [PATCH 40/44] top songs queuing (listitem-horizontal)

---
 src/renderer/index.js                         | 62 ++++++++++++++++++-
 .../views/components/listitem-horizontal.ejs  | 11 +++-
 2 files changed, 70 insertions(+), 3 deletions(-)

diff --git a/src/renderer/index.js b/src/renderer/index.js
index f4d1aaa4..e6c2814e 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -2814,7 +2814,67 @@ const app = new Vue({
                             })
                         }
                     })
-                } else {
+                } else if (parent.startsWith('listitem-hr')) {
+                    app.mk.stop().then(() => {
+                        if (app.mk.shuffleMode == 1) {
+                            app.mk.setQueue({
+                                [item.attributes.playParams.kind ?? item.type]: item.attributes.playParams.id ?? item.id
+                            }).then(function () {
+                                app.mk.play().then(() => {
+                                    const data = JSON.parse(parent.split('listitem-hr')[1] ?? '[]')
+                                    let itemsToPlay = {}
+                                    let u = data.map(x => x.id)
+                                    try {
+                                        data.splice(u.indexOf(item.attributes.playParams.id ?? item.id), 1)
+                                    } catch (e) { }
+                                    if (app.mk.shuffleMode == 1) {
+                                        shuffleArray(data)
+                                    }
+                                    data.forEach(item => {
+                                        if (!itemsToPlay[item.kind]) {
+                                            itemsToPlay[item.kind] = []
+                                        }
+                                        itemsToPlay[item.kind].push(item.id)
+                                    })
+                                    // loop through itemsToPlay
+                                    for (let kind in itemsToPlay) {
+                                        let ids = itemsToPlay[kind]
+                                        if (ids.length > 0) {
+                                            app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] })
+                                        }
+                                    }
+                                })
+                            })
+                        } else {
+                            const data = JSON.parse(parent.split('listitem-hr')[1] ?? '[]')
+                            let itemsToPlay = {}
+                            let u = data.map(x => x.id)
+                            data.forEach(item => {
+                                if (!itemsToPlay[item.kind]) {
+                                    itemsToPlay[item.kind] = []
+                                }
+                                itemsToPlay[item.kind].push(item.id)
+                            })
+                            // loop through itemsToPlay
+                            let ind = 0;
+                            for (let kind in itemsToPlay) {
+                                let ids = itemsToPlay[kind]
+                                app.mk.clearQueue().then(function () {
+                                    if (ids.length > 0) {
+                                        app.mk.playLater({ [kind + "s"]: itemsToPlay[kind] }).then(function() {
+                                            ind += 1;
+                                            console.log(ind , Object.keys(itemsToPlay).length)
+                                            if(ind >= Object.keys(itemsToPlay).length) {                        
+                                                app.mk.changeToMediaAtIndex(app.mk.queue._itemIDs.indexOf(item.attributes.playParams.id ?? item.id))
+                                            }
+                                        }
+                                    )}
+                                })
+                            }
+                        }
+                    })
+                }
+                else {
                     app.mk.stop().then(() => {
                         if (truekind == "playlists" && (id.startsWith("p.") || id.startsWith("pl.u"))) {
                             app.mk.setQueue({
diff --git a/src/renderer/views/components/listitem-horizontal.ejs b/src/renderer/views/components/listitem-horizontal.ejs
index 73d74838..a159f362 100644
--- a/src/renderer/views/components/listitem-horizontal.ejs
+++ b/src/renderer/views/components/listitem-horizontal.ejs
@@ -3,7 +3,7 @@
     <vue-horizontal>
         <div v-for="items in itemPages">
             <mediaitem-list-item
-                v-for="(song, index) in items"
+                v-for="(song, index) in items" :parent="'listitem-hr' + simplifiedParent"
                 :index="song.index"
                 :item="song"></mediaitem-list-item>
         </div>
@@ -23,7 +23,8 @@
         },
         data: function () {
             return {
-                itemPages: []
+                itemPages: [],
+                simplifiedParent : []
             }
         },
         mounted() {
@@ -33,6 +34,12 @@
             });
             // split items into pages
             this.itemPages = app.arrayToChunk(this.items, 4);
+            try{
+            this.simplifiedParent = JSON.stringify(this.items.map ( function(x){return x.attributes.playParams}));
+            console.log("simplifiedParent: " + this.simplifiedParent);
+            }
+            catch (e){}
+            
         },
         methods: {
             sayHello: function () {

From 012ef5e8f40550ae6e0c0f2d13ff12b2b0509b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AE=A5=E5=8F=A1?=
 <46503943+jay900604@users.noreply.github.com>
Date: Sun, 13 Feb 2022 00:54:35 +0800
Subject: [PATCH 41/44] Update zh_TW.jsonc (#436)

---
 src/i18n/zh_TW.jsonc | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/i18n/zh_TW.jsonc b/src/i18n/zh_TW.jsonc
index 551e868d..c605d61d 100644
--- a/src/i18n/zh_TW.jsonc
+++ b/src/i18n/zh_TW.jsonc
@@ -33,6 +33,7 @@
   "term.about": "關於",
   "term.privateSession": "私人時段",
   "term.queue": "待播清單",
+  "term.history": "播放歷史",
   "term.search": "搜尋",
   "term.library": "資料庫",
   "term.listenNow": "立即聆聽",
@@ -70,6 +71,7 @@
   "term.sortBy.genre": "音樂風格",
   "term.sortBy.releaseDate": "發行日期",
   "term.sortBy.duration": "時長",
+  "term.sortBy.dateAdded": "新增日期",
   "term.sortOrder": "字母排序",
   "term.sortOrder.ascending": "升序",
   "term.sortOrder.descending": "降序",

From 41dc10943df907058c310bd85fcdf436a2c6148d Mon Sep 17 00:00:00 2001
From: KaHim Chan <kyw504100@hotmail.com>
Date: Sun, 13 Feb 2022 00:58:59 +0800
Subject: [PATCH 42/44] Irregular update 13/02 (#437)

---
 src/i18n/README.md                          |  8 +++++++-
 src/i18n/cz_CZ.jsonc                        |  3 ++-
 src/i18n/en_QUK.jsonc                       |  2 +-
 src/i18n/en_SGA.jsonc                       |  6 ++++++
 src/i18n/en_US.jsonc                        |  6 ++++++
 src/i18n/vi_VN.jsonc                        |  2 +-
 src/i18n/zh_HK.jsonc                        | 10 ++++++++--
 src/renderer/assets/github.svg              |  3 +++
 src/renderer/views/components/equalizer.ejs |  4 ++--
 src/renderer/views/pages/about.ejs          |  1 +
 src/renderer/views/pages/settings.ejs       | 10 ++++++----
 11 files changed, 43 insertions(+), 12 deletions(-)
 create mode 100644 src/renderer/assets/github.svg

diff --git a/src/i18n/README.md b/src/i18n/README.md
index b5480a90..f474d134 100644
--- a/src/i18n/README.md
+++ b/src/i18n/README.md
@@ -109,4 +109,10 @@ Update 10/02/2022 05:58 UTC
 Update 12/02/2022 12:00 UTC
 
 * Added support for multiple plural forms. [Details](#multiple-plural-forms)
-* `term.version`: Added for `en_US`.
\ No newline at end of file
+* `term.version`: Added for `en_US`.
+* `settings.option.visual.theme.github.download`: Added for `en_US`.
+* `settings.prompt.visual.theme.github.URL`: Added for `en_US`.
+* `settings.notyf.visual.theme.install.success`: Added for `en_US`.
+* `settings.notyf.visual.theme.install.error`: Added for `en_US`.
+* `term.defaultPresets`: Added for `en_US`.
+* `term.userPresets`: Added for `en_US`.
diff --git a/src/i18n/cz_CZ.jsonc b/src/i18n/cz_CZ.jsonc
index 1a79d28d..af115dc9 100644
--- a/src/i18n/cz_CZ.jsonc
+++ b/src/i18n/cz_CZ.jsonc
@@ -1,4 +1,5 @@
-{ // Base File
+{
+  
   // i18n Info
   "i18n.languageName": "Čeština (CZ)", // name of language in native language
   "i18n.languageNameEnglish": "Czech (CZ)", // name of language in English
diff --git a/src/i18n/en_QUK.jsonc b/src/i18n/en_QUK.jsonc
index bdadd21d..ddecdb33 100644
--- a/src/i18n/en_QUK.jsonc
+++ b/src/i18n/en_QUK.jsonc
@@ -1,4 +1,4 @@
-{ // Base File
+{
 
   // i18n Info
   "i18n.languageName": "Language of the Quacks", // name of language in native language
diff --git a/src/i18n/en_SGA.jsonc b/src/i18n/en_SGA.jsonc
index 875080cd..ab4107e6 100644
--- a/src/i18n/en_SGA.jsonc
+++ b/src/i18n/en_SGA.jsonc
@@ -141,6 +141,8 @@
   "term.addedpreset": "ᖋ↸↸ᒷ↸ i!∷ᒷϟᒷᒣ",
   "term.deletepreset.warn": "ᖋ∷ᒷ ॥ᒍ⚍ ϟ⚍∷ᒷ ॥ᒍ⚍ ∴ᖋリᒣ ᒣᒍ ↸ᒷ|:ᒷᒣᒷ ᒣ⍑╎ϟ i!∷ᒷϟᒷᒣ?",
   "term.deletedpreset": "∷ᒷᒲᒍ⍊ᒷ↸ i!∷ᒷϟᒷᒣ",
+  "term.defaultPresets": "↸ᒷ⎓ᖋ⚍|:ᒣ i!∷ᒷϟᒷᒣϟ",
+  "term.userPresets": "⚍ϟᒷ∷ i!∷ᒷϟᒷᒣϟ",
   "term.requestError": "ᒣ⍑ᒷ∷ᒷ ∴ᖋϟ ᖋ i!∷ᒍᕊ|:ᒷᒲ ∴╎ᒣ⍑ ᒣ⍑ᒷ ∷ᒷᑑ⚍ᒷϟᒣ.",
   "term.song.link.generate": "┤ᒷᒣᒣ╎リ┤ ϟᒍリ┤.|:╎リ·ǀ· ϟ⍑ᖋ∷ᒷ ⚍∷|:...",
   "term.musicVideos": "ᒲ⚍ϟ╎ᔮ ⍊╎↸ᒷᒍϟ", // Search page friendlyTypes
@@ -296,6 +298,10 @@
   "settings.header.visual.hardwareAcceleration.default": "↸ᒷ⎓ᖋ⚍|:ᒣ",
   "settings.header.visual.hardwareAcceleration.webGPU": "∴ᒷᕊ┤i!⚍",
   "settings.header.visual.theme": "ᒣ⍑ᒷᒲᒷ",
+  "settings.option.visual.theme.github.download": "╎リϟᒣᖋ|:|: ⎓∷ᒍᒲ ┤╎ᒣ⍑⚍ᕊ ⚍∷|:",
+  "settings.prompt.visual.theme.github.URL": "ᒷリᒣᒷ∷ ᒣ⍑ᒷ ⚍∷|: ᒍ⎓ ᒣ⍑ᒷ ᒣ⍑ᒷᒲᒷ ॥ᒍ⚍ ∴ᖋリᒣ ᒣᒍ ╎リϟᒣᖋ|:|:",
+  "settings.notyf.visual.theme.install.success": "ᒣ⍑ᒷᒲᒷ ╎リϟᒣᖋ|:|:ᒷ↸ ϟ⚍ᔮᔮᒷϟϟ⎓⚍|:|:॥",
+  "settings.notyf.visual.theme.install.error": "ᒣ⍑ᒷᒲᒷ ╎リϟᒣᖋ|:|:ᖋᒣ╎ᒍリ ⎓ᖋ╎|:ᒷ↸",
   
   // Settings - Visual - Theme name
   "settings.option.visual.theme.default": "ᔮ╎↸ᒷ∷",
diff --git a/src/i18n/en_US.jsonc b/src/i18n/en_US.jsonc
index 034a20e6..7f65bf75 100644
--- a/src/i18n/en_US.jsonc
+++ b/src/i18n/en_US.jsonc
@@ -141,6 +141,8 @@
   "term.addedpreset": "Added Preset",
   "term.deletepreset.warn": "Are you sure you want to delete this preset?",
   "term.deletedpreset": "Removed preset",
+  "term.defaultPresets": "Default Presets",
+  "term.userPresets": "User Presets",
   "term.requestError": "There was a problem with the request.",
   "term.song.link.generate": "Getting song.link share URL...",
   "term.musicVideos": "Music Videos", // Search page friendlyTypes
@@ -296,6 +298,10 @@
   "settings.header.visual.hardwareAcceleration.default": "Default",
   "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
   "settings.header.visual.theme": "Theme",
+  "settings.option.visual.theme.github.download": "Install from GitHub URL",
+  "settings.prompt.visual.theme.github.URL": "Enter the URL of the theme you want to install",
+  "settings.notyf.visual.theme.install.success": "Theme installed successfully",
+  "settings.notyf.visual.theme.install.error": "Theme installation failed",
   
   // Settings - Visual - Theme name
   "settings.option.visual.theme.default": "Cider",
diff --git a/src/i18n/vi_VN.jsonc b/src/i18n/vi_VN.jsonc
index 0f97ca5f..9b7dc653 100644
--- a/src/i18n/vi_VN.jsonc
+++ b/src/i18n/vi_VN.jsonc
@@ -1,4 +1,4 @@
-{ // Base File
+{
 
   // i18n Info
   "i18n.languageName": "Tiếng Việt", // name of language in native language
diff --git a/src/i18n/zh_HK.jsonc b/src/i18n/zh_HK.jsonc
index a67cb7c5..b63ef199 100644
--- a/src/i18n/zh_HK.jsonc
+++ b/src/i18n/zh_HK.jsonc
@@ -141,6 +141,8 @@
   "term.addedpreset": "已新增",
   "term.deletepreset.warn": "你確認要刪除這個範本？",
   "term.deletedpreset": "已刪除",
+  "term.defaultPresets": "預設範本",
+  "term.userPresets": "自訂範本",
   "term.requestError": "處理請求時發生錯誤",
   "term.song.link.generate": "正在生成 song.link 分享連結...",
   "term.musicVideos": "MV", // Search page friendlyTypes
@@ -296,6 +298,10 @@
   "settings.header.visual.hardwareAcceleration.default": "預設",
   "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
   "settings.header.visual.theme": "主題",
+  "settings.option.visual.theme.github.download": "從 Github 安裝",
+  "settings.prompt.visual.theme.github.URL": "請輸入你想要安裝的主題的連結",
+  "settings.notyf.visual.theme.install.success": "成功安裝主題",
+  "settings.notyf.visual.theme.install.error": "主題安裝失敗",
 
   // Settings - Visual - Theme name
   "settings.option.visual.theme.default": "預設",
@@ -324,8 +330,8 @@
   "settings.option.connectivity.lastfmScrobble": "Last.fm Scrobbling 記錄", // Option to Connect
   "settings.option.connectivity.lastfmScrobble.delay": "Last.fm Scrobble 延遲 (%)",
   "settings.option.connectivity.lastfmScrobble.nowPlaying": "啟用 Last.fm 正在播放",
-  "settings.option.connectivity.lastfmScrobble.removeFeatured": "從歌名中移除客串藝人 (LastFM)", 
-  "settings.option.connectivity.lastfmScrobble.filterLoop": "不記錄單曲循環 (LastFM)", 
+  "settings.option.connectivity.lastfmScrobble.removeFeatured": "從歌名中移除客串藝人（Last.fm）", 
+  "settings.option.connectivity.lastfmScrobble.filterLoop": "不記錄單曲循環（Last.fm）", 
   // Refer to term.connect for the connect button
 
   // Settings - Experimental
diff --git a/src/renderer/assets/github.svg b/src/renderer/assets/github.svg
new file mode 100644
index 00000000..2180f759
--- /dev/null
+++ b/src/renderer/assets/github.svg
@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="24" height="24" viewBox="0 0 24 24">
+  <path d="M12 0c-6.626 0-12 5.373-12 12 0 5.302 3.438 9.8 8.207 11.387.599.111.793-.261.793-.577v-2.234c-3.338.726-4.033-1.416-4.033-1.416-.546-1.387-1.333-1.756-1.333-1.756-1.089-.745.083-.729.083-.729 1.205.084 1.839 1.237 1.839 1.237 1.07 1.834 2.807 1.304 3.492.997.107-.775.418-1.305.762-1.604-2.665-.305-5.467-1.334-5.467-5.931 0-1.311.469-2.381 1.236-3.221-.124-.303-.535-1.524.117-3.176 0 0 1.008-.322 3.301 1.23.957-.266 1.983-.399 3.003-.404 1.02.005 2.047.138 3.006.404 2.291-1.552 3.297-1.23 3.297-1.23.653 1.653.242 2.874.118 3.176.77.84 1.235 1.911 1.235 3.221 0 4.609-2.807 5.624-5.479 5.921.43.372.823 1.102.823 2.222v3.293c0 .319.192.694.801.576 4.765-1.589 8.199-6.086 8.199-11.386 0-6.627-5.373-12-12-12z"/>
+</svg>
\ No newline at end of file
diff --git a/src/renderer/views/components/equalizer.ejs b/src/renderer/views/components/equalizer.ejs
index a999e073..f97e351e 100644
--- a/src/renderer/views/components/equalizer.ejs
+++ b/src/renderer/views/components/equalizer.ejs
@@ -6,10 +6,10 @@
                 <button class="close-btn" @click="close()"></button>
                 <div class="md-option-segment md-option-segment_auto">
                     <select class="md-select" style="width:220px;text-align:center;margin-right:245px" v-model="$root.cfg.audio.equalizer.preset" v-on:change="changePreset($root.cfg.audio.equalizer.preset)">
-                        <optgroup label="User Presets">
+                        <optgroup :label="app.getLz('term.userPresets')">
                             <option v-for="preset in $root.cfg.audio.equalizer.presets" :value="preset.preset">{{preset.name}}</option>
                         </optgroup>
-                        <optgroup label="Default Presets">
+                        <optgroup :label="app.getLz('term.defaultPresets')">
                             <option v-for="preset in defaultPresets" :value="preset.preset">{{preset.name}}</option>
                         </optgroup>
                     </select>
diff --git a/src/renderer/views/pages/about.ejs b/src/renderer/views/pages/about.ejs
index 5807c116..4b60755f 100644
--- a/src/renderer/views/pages/about.ejs
+++ b/src/renderer/views/pages/about.ejs
@@ -15,6 +15,7 @@
                 <button onclick="window.open('https://ko-fi.com/cryptofyre')" class="md-btn sponsorBtn"><img src="./assets/ko_fi.svg"/>Ko-fi</button>
                 <button onclick="window.open('https://opencollective.com/ciderapp')" class="md-btn sponsorBtn"><img src="./assets/open_collective.svg"/>Open Collective</button>
                 <h3>{{$root.getLz('term.socials')}}</h3>
+                <button onclick="window.open('https://github.com/ciderapp/Cider')" class="md-btn sponsorBtn"><img style="width: 20.5px;" src="./assets/github.svg"/>{{$root.getLz('term.github')}}</button>
                 <button onclick="window.open('https://discord.gg/applemusic')" class="md-btn sponsorBtn"><img src="./assets/discord.svg"/>{{$root.getLz('term.discord')}}</button>
                 <button onclick="window.open('https://twitter.com/UseCider')" class="md-btn sponsorBtn"><img style="width: 20.5px;" src="./assets/twitter.svg"/>Twitter</button>
 
diff --git a/src/renderer/views/pages/settings.ejs b/src/renderer/views/pages/settings.ejs
index 87b23311..8474b7c5 100644
--- a/src/renderer/views/pages/settings.ejs
+++ b/src/renderer/views/pages/settings.ejs
@@ -132,7 +132,9 @@
                             <option value="dark.less">{{$root.getLz('settings.option.visual.theme.dark')}}</option>
                             <option v-for="theme in themes" :value="theme.file">{{ theme.name }}</option>
                         </select>
-                        <button class="md-btn md-btn-small md-btn-block" @click="installTheme()" style="margin-top: 8px">Install from GitHub URL</button>
+                        <button class="md-btn md-btn-small md-btn-block" @click="installTheme()" style="margin-top: 8px">
+                            {{$root.getLz('settings.option.visual.theme.github.download')}}
+                        </button>
                     </div>
                 </div>
                 <div class="md-option-line">
@@ -774,14 +776,14 @@
         methods: {
             installTheme() {
                 let self = this
-                bootbox.prompt("Enter the URL of the theme you want to install", (result) => {
+                bootbox.prompt(app.getLz('settings.prompt.visual.theme.github.URL'), (result) => {
                     if (result) {
                         ipcRenderer.once("theme-installed", (event, arg) => {
                             if (arg.success) {
                                 self.themes = ipcRenderer.sendSync("get-themes")
-                                notyf.success("Theme installed successfully");
+                                notyf.success(app.getLz('settings.notyf.visual.theme.install.success'));
                             } else {
-                                notyf.error("Theme installation failed");
+                                notyf.error(app.getLz('settings.notyf.visual.theme.install.error'));
                             }
                         });
                         ipcRenderer.invoke("get-github-theme", result)

From 2336b85291305200326fcaa69f751d50ce24336d Mon Sep 17 00:00:00 2001
From: vapormusic <vietanhfat@gmail.com>
Date: Sun, 13 Feb 2022 00:07:16 +0700
Subject: [PATCH 43/44] rpc library images ( need api to work first)

---
 src/main/plugins/discordrpc.ts                | 29 +++++++++++--------
 src/preload/cider-preload.js                  |  4 +--
 src/renderer/index.js                         |  2 +-
 .../views/components/mediaitem-list-item.ejs  |  2 +-
 4 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/main/plugins/discordrpc.ts b/src/main/plugins/discordrpc.ts
index 1a444b7f..49bb35df 100644
--- a/src/main/plugins/discordrpc.ts
+++ b/src/main/plugins/discordrpc.ts
@@ -202,22 +202,27 @@ export default class DiscordRichPresence {
      * Runs on app ready
      */
     onReady(_win: any): void {
+        let self = this
         this.connect((DiscordRichPresence._store.general.discord_rpc == 1) ? '911790844204437504' : '886578863147192350');
         console.debug(`[Plugin][${this.name}] Ready.`);
-        // ipcMain.on('updateRPCImage', (_event, imageurl) => {
-        //     fetch('https://api.cider.sh/v1/images' ,{ 
+        ipcMain.on('updateRPCImage', (_event, imageurl) => {
+            fetch('https://api.cider.sh/v1/images' ,{ 
 
-        //         method: 'POST',
-        //         body: JSON.stringify({url : imageurl}),
-        //         headers: { 
-        //             'Content-Type': 'application/json',
-        //             'User-Agent': 'Cider Development Environment'
-        //         },
-        //     })
-        //     .then(res => res.text())
-        //     .then(json => console.log(json))
+                method: 'POST',
+                body: JSON.stringify({url : imageurl}),
+                headers: { 
+                    'Content-Type': 'application/json',
+                    'User-Agent': _win.webContents.getUserAgent()
+                },
+            })
+            .then(res => res.json())
+            .then(function(json){
+                self._activity['largeImageKey'] = json.url
+                console.log(json.url)
+                self._client.setActivity(self._activity);
+            })
         
-        // })
+        })
     }
 
     /**
diff --git a/src/preload/cider-preload.js b/src/preload/cider-preload.js
index 42990ce2..f6317878 100644
--- a/src/preload/cider-preload.js
+++ b/src/preload/cider-preload.js
@@ -47,9 +47,9 @@ const MusicKitInterop = {
 			return;
 		} 
 		const id = nowPlayingItem?._songId ?? (nowPlayingItem?.songId ?? nowPlayingItem?.id)
-		if (id != null) {
+		if (id != null && id != -1) {
 			try{
-			const query = await mk.api.v3.music(`/v1${((nowPlayingItem?._songId ?? nowPlayingItem?.songId) != null) ? `/catalog/${mk.storefrontId}/` : `/me/library/`}songs/${id}?l=${app.mklang}`);
+			const query = await mk.api.v3.music(`/v1${(((nowPlayingItem?._songId ?? nowPlayingItem?.songId) != null) && ((nowPlayingItem?._songId ?? nowPlayingItem?.songId) != -1)) ? `/catalog/${mk.storefrontId}/` : `/me/library/`}songs/${id}?l=${app.mklang}`);
 			if (query?.data?.data[0]){
 					let attrs = query?.data?.data[0]?.attributes;
 					if (attrs?.name) { nowPlayingItem.attributes.name = attrs?.name ?? ''}
diff --git a/src/renderer/index.js b/src/renderer/index.js
index e6c2814e..004b1bf4 100644
--- a/src/renderer/index.js
+++ b/src/renderer/index.js
@@ -746,7 +746,7 @@ const app = new Vue({
                             previewURL = app.mk.nowPlayingItem.previewURL
                         } catch (e) {
                         }
-                        if (!previewURL) {
+                        if (previewURL == null && ((app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ??  app.mk.nowPlayingItem.relationships.catalog.data[0].id)) != -1)) {
                             app.mk.api.v3.music(`/v1/catalog/${app.mk.storefrontId}/songs/${app.mk.nowPlayingItem?._songId ?? (app.mk.nowPlayingItem["songId"] ??  app.mk.nowPlayingItem.relationships.catalog.data[0].id)}`).then((response) => {
                                 previewURL = response.data.data[0].attributes.previews[0].url
                                 if (previewURL)
diff --git a/src/renderer/views/components/mediaitem-list-item.ejs b/src/renderer/views/components/mediaitem-list-item.ejs
index c2df9efd..fc671c53 100644
--- a/src/renderer/views/components/mediaitem-list-item.ejs
+++ b/src/renderer/views/components/mediaitem-list-item.ejs
@@ -124,7 +124,7 @@
                     return
                 }
                 this.$root.inLibrary([this.item]).then(res => {
-                    this.addedToLibrary = res[0].attributes.inLibrary
+                    this.addedToLibrary = res[0]?.attributes?.inLibrary ?? false
                 })
                 return this.addedToLibrary
             },

From 7ca88f5a9f22db7228e95688318059c822b0c639 Mon Sep 17 00:00:00 2001
From: Bill Zhang <1158817754@qq.com>
Date: Sun, 13 Feb 2022 03:40:16 +0800
Subject: [PATCH 44/44] Update ZH_cn.jsonc (#438)

---
 src/i18n/zh_CN.jsonc | 48 ++++++++++++++++++++++++++++++++++++++++++--
 1 file changed, 46 insertions(+), 2 deletions(-)

diff --git a/src/i18n/zh_CN.jsonc b/src/i18n/zh_CN.jsonc
index f5f8b35b..730132fb 100644
--- a/src/i18n/zh_CN.jsonc
+++ b/src/i18n/zh_CN.jsonc
@@ -127,6 +127,26 @@
   "term.check": "检查",
   "term.aboutArtist": "关于{{artistName}}", // e.g. 'About Doja Cat'
   "term.updateCider": "更新 Cider",
+  "term.topResult": "热门搜索结果", // Search Results
+  "term.sharedPlaylists": "分享播放列表", // Search Results
+  "term.people": "个人档案", // Search Results
+  "term.newpreset.name": "新均衡器预设名", // Equalizer Preset
+  "term.addedpreset": "预设已添加",
+  "term.deletepreset.warn": "你确定要删除此预设吗?",
+  "term.deletedpreset": "预设已删除",
+  "term.defaultPresets": "默认预设",
+  "term.userPresets": "用户预设",
+  "term.requestError": "请求出现一个问题。",
+  "term.song.link.generate": "获取 song.link 共享URL...",
+  "term.musicVideos": "音乐视频", // Search page friendlyTypes
+  "term.stations": "电台",
+  //"term.curators": "Curators",
+  //"term.appleCurators": "Apple Curators",
+  "term.radioShows": "广播单集",
+  "term.recordLabels": "唱片公司",
+  "term.videoExtras": "视频特辑",
+  //"term.top": "Top",
+  "term.version": "版本",
   
   // Home
   "home.title": "主页",
@@ -198,15 +218,27 @@
   "action.tray.quit": "退出",
   "action.tray.show": "显示",
   "action.update": "更新",
+  "action.copy": "复制",
+  "action.newpreset": "新建预设...", // Equalizer Preset
+  "action.deletepreset": "删除预设",
   
   // Settings - General
   "settings.header.general": "通用",
   "settings.header.general.description": "调整 Cider 的通用设置",
+  "settings.option.general.language": "语言",
 
   // Language optgroups
+  "settings.option.general.language.main": "语言",
+  "settings.option.general.language.fun": "恶搞语言",
+  "settings.option.general.language.unsorted": "未分类",
 
   // Update Cider
   "settings.option.general.updateCider": "更新 Cider", // Button
+  "settings.option.general.updateCider.branch": "Cider 更新通道", // Dropdown
+  "settings.option.general.updateCider.branch.description": "选择接受 Cider 更新的通道",
+  "settings.option.general.updateCider.branch.main": "稳定",
+  "settings.option.general.updateCider.branch.develop": "测试",
+  
   
   // Settings - Audio
   "settings.header.audio": "音频",
@@ -229,6 +261,10 @@
   "settings.option.audio.enableAdvancedFunctionality.audioNormalization.description": "使所感知到的音频响度统一",
   "settings.option.audio.enableAdvancedFunctionality.audioSpatialization": "音频空间化", // Toggle
   "settings.option.audio.enableAdvancedFunctionality.audioSpatialization.description": "使所感知到的音频更有立体感 (注: 这不是杜比全景声)",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.standard": "标准",
+  "settings.option.audio.enableAdvancedFunctionality.ciderPPEStrength.aggressive": "激进",
+  "settings.warn.audio.enableAdvancedFunctionality.audioSpatialization.compatibility": "空间音频与数字增强引擎不兼容，请先停用数字增强引擎",
+  
   
   // Settings - Visual
   "settings.header.visual": "外观",
@@ -236,6 +272,7 @@
   "settings.option.visual.windowBackgroundStyle": "窗口背景样式", // Toggle
   "settings.header.visual.windowBackgroundStyle.none": "无",
   "settings.header.visual.windowBackgroundStyle.artwork": "专辑封面",
+    "settings.header.visual.windowBackgroundStyle.image": "图像",
   "settings.option.visual.animatedArtwork": "动态专辑封面", // Dropdown
   "settings.header.visual.animatedArtwork.always": "总是显示",
   "settings.header.visual.animatedArtwork.limited": "只在艺人页面和专辑封面显示",
@@ -251,6 +288,11 @@
   "settings.option.visual.hardwareAcceleration.description": "需要重启 Cider 才会生效",
   "settings.header.visual.hardwareAcceleration.default": "默认",
   "settings.header.visual.hardwareAcceleration.webGPU": "WebGPU",
+  "settings.header.visual.theme": "主题",
+  "settings.option.visual.theme.github.download": "通过GitHub URL安装",
+  "settings.prompt.visual.theme.github.URL": "请输入欲安装主题的URL",
+  "settings.notyf.visual.theme.install.success": "主题安装成功",
+  "settings.notyf.visual.theme.install.error": "主题安装失败",
 
   // Settings - Visual - Theme name
   "settings.option.visual.theme.default": "默认",
@@ -285,9 +327,11 @@
   
   // Settings - Experimental
   "settings.header.experimental": "实验性功能",
-  "settings.header.experimental.description": "调整Cider的实验性功能",
+  "settings.header.experimental.description": "调整 Cider 的实验性功能",
   "settings.option.experimental.compactUI": "紧凑型 UI", // Toggle
   "settings.option.experimental.close_button_hide": "点击关闭按钮时仅隐藏窗口",
+  "settings.option.experimental.copy_log": "复制日志至剪贴板",
+  //"settings.option.experimental.inline_playlists": "Inline Playlists and Albums",
   
   // Refer to term.disabled & term.enabled
   // Spatialization Menu
@@ -320,4 +364,4 @@
   
   //About
   "about.thanks": "郑重感谢 Cider Collective 以及为这个项目提供支持的贡献者。"
-}
\ No newline at end of file
+}