diff --git a/README.md b/README.md index c932f6c..2a9b019 100644 --- a/README.md +++ b/README.md @@ -3,7 +3,7 @@ **BetterDiscord** - PluginRepo _Coming soon if everything is ready_ -- [Download latest](https://github.com/Faelayis/RPC-Pc-Status-BetterDiscord/releases/download/v2.4.3/RPCPcStatus.plugin.js) +- [Download latest](https://github.com/Faelayis/RPC-Pc-Status-BetterDiscord/releases/download/v2.4.4/RPCPcStatus.plugin.js) Original [RPC-Pc-Status](https://github.com/Faelayis/RPC-Pc-Status#readme)
diff --git a/RPCPcStatus.plugin.js b/RPCPcStatus.plugin.js index 0b18fcd..cfb1314 100644 --- a/RPCPcStatus.plugin.js +++ b/RPCPcStatus.plugin.js @@ -1,6 +1,6 @@ /** * @name RPCPcStatus - * @version 2.4.3 + * @version 2.4.4 * @description Rich Presence Pc Status for your Discord * @authorLink https://discordapp.com/users/328731868096888833 * @author Faelayis @@ -34,7 +34,7 @@ const config = { "info": { "name": "RPCPcStatus", - "version": "2.4.3", + "version": "2.4.4", "description": "Rich Presence Pc Status for your Discord", "authorLink": "https://discordapp.com/users/328731868096888833", "authors": [{ @@ -12405,7 +12405,7 @@ function buildPlugin([BasePlugin, PluginApi]) { }, { title: "Fixed", type: "fixed", - items: ["Fix Update pre release create new file", "Settings premid are reset on restart discord", "Features show premid not working"] + items: ["Pre release update loop", " Update pre release create new file", "Settings premid are reset on restart discord", "Features show premid not working"] }, { title: "Improved", type: "improved", @@ -12451,19 +12451,20 @@ function buildPlugin([BasePlugin, PluginApi]) { } } async checkForUpdate() { - if (!this.settings.lastVersionSeen || 1 === function(a, b) { - a = a.toLowerCase().split(/[.-]/).map((x => /\d/.test(x[0]) ? x.padStart(10, "0") : x.padEnd(10, "0"))).join(""); - b = b.toLowerCase().split(/[.-]/).map((x => /\d/.test(x[0]) ? x.padStart(10, "0") : x.padEnd(10, "0"))).join(""); - if (a === b) return 0; - return a < b ? -1 : 1; - }(changelog.version, this.settings.lastChangelogVersionSeen || this.settings.lastVersionSeen)) { + if (!this.settings.lastVersionSeen || changelog.version !== this.settings.lastVersionSeen) { ZLibrary.Modals.showChangelogModal(changelog.title, changelog.version, changelog.changelog); this.settings.lastVersionSeen = changelog.version; - delete this.settings.lastChangelogVersionSeen; this.updateSettings(); } - if (1 === this.settings.updatechannel) ZLibrary.PluginUpdater.checkForUpdate?.("RPCPcStatus", changelog.version, "https://raw.githubusercontent.com/Faelayis/RPC-Pc-Status-BetterDiscord/main/pre-release/RPCPcStatus.plugin.js"); - else ZLibrary.PluginUpdater.checkForUpdate?.("RPCPcStatus", changelog.version, "https://raw.githubusercontent.com/Faelayis/RPC-Pc-Status-BetterDiscord/main/RPCPcStatus.plugin.js"); + if (1 === this.settings.updatechannel) ZLibrary.PluginUpdater.checkForUpdate?.("RPCPcStatus", changelog.version, "https://raw.githubusercontent.com/Faelayis/RPC-Pc-Status-BetterDiscord/main/pre-release/RPCPcStatus.plugin.js", versioner, comparator); + else ZLibrary.PluginUpdater.checkForUpdate?.("RPCPcStatus", changelog.version, "https://raw.githubusercontent.com/Faelayis/RPC-Pc-Status-BetterDiscord/main/RPCPcStatus.plugin.js", versioner, comparator); + function versioner(file) { + const semVer = new RegExp(/(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?/); + return file.match(semVer)[0] || "0.0.0"; + } + function comparator(current, remote) { + return current !== remote ? true : false; + } } formatRAM(freemem, totalmem, decimals = 0) { if (0 === freemem) return "0 Bytes"; diff --git a/package.json b/package.json index 224b8f5..9a965c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "rpc-pc-status-betterdiscord", - "version": "2.4.3", + "version": "2.4.4", "description": "", "main": "RPCPcStatus.plugin.js", "scripts": { diff --git a/pre-release/RPCPcStatus.plugin.js b/pre-release/RPCPcStatus.plugin.js index 243507c..cfb1314 100644 --- a/pre-release/RPCPcStatus.plugin.js +++ b/pre-release/RPCPcStatus.plugin.js @@ -1,6 +1,6 @@ /** * @name RPCPcStatus - * @version 2.4.4-beta.2 + * @version 2.4.4 * @description Rich Presence Pc Status for your Discord * @authorLink https://discordapp.com/users/328731868096888833 * @author Faelayis @@ -34,7 +34,7 @@ const config = { "info": { "name": "RPCPcStatus", - "version": "2.4.4-beta.2", + "version": "2.4.4", "description": "Rich Presence Pc Status for your Discord", "authorLink": "https://discordapp.com/users/328731868096888833", "authors": [{ @@ -12405,7 +12405,7 @@ function buildPlugin([BasePlugin, PluginApi]) { }, { title: "Fixed", type: "fixed", - items: ["Fix Update pre release create new file", "Settings premid are reset on restart discord", "Features show premid not working"] + items: ["Pre release update loop", " Update pre release create new file", "Settings premid are reset on restart discord", "Features show premid not working"] }, { title: "Improved", type: "improved", @@ -12451,19 +12451,20 @@ function buildPlugin([BasePlugin, PluginApi]) { } } async checkForUpdate() { - if (!this.settings.lastVersionSeen || 1 === function(a, b) { - a = a.toLowerCase().split(/[.-]/).map((x => /\d/.test(x[0]) ? x.padStart(10, "0") : x.padEnd(10, "0"))).join(""); - b = b.toLowerCase().split(/[.-]/).map((x => /\d/.test(x[0]) ? x.padStart(10, "0") : x.padEnd(10, "0"))).join(""); - if (a === b) return 0; - return a < b ? -1 : 1; - }(changelog.version, this.settings.lastChangelogVersionSeen || this.settings.lastVersionSeen)) { + if (!this.settings.lastVersionSeen || changelog.version !== this.settings.lastVersionSeen) { ZLibrary.Modals.showChangelogModal(changelog.title, changelog.version, changelog.changelog); this.settings.lastVersionSeen = changelog.version; - delete this.settings.lastChangelogVersionSeen; this.updateSettings(); } - if (1 === this.settings.updatechannel) ZLibrary.PluginUpdater.checkForUpdate?.("RPCPcStatus", changelog.version, "https://raw.githubusercontent.com/Faelayis/RPC-Pc-Status-BetterDiscord/main/pre-release/RPCPcStatus.plugin.js"); - else ZLibrary.PluginUpdater.checkForUpdate?.("RPCPcStatus", changelog.version, "https://raw.githubusercontent.com/Faelayis/RPC-Pc-Status-BetterDiscord/main/RPCPcStatus.plugin.js"); + if (1 === this.settings.updatechannel) ZLibrary.PluginUpdater.checkForUpdate?.("RPCPcStatus", changelog.version, "https://raw.githubusercontent.com/Faelayis/RPC-Pc-Status-BetterDiscord/main/pre-release/RPCPcStatus.plugin.js", versioner, comparator); + else ZLibrary.PluginUpdater.checkForUpdate?.("RPCPcStatus", changelog.version, "https://raw.githubusercontent.com/Faelayis/RPC-Pc-Status-BetterDiscord/main/RPCPcStatus.plugin.js", versioner, comparator); + function versioner(file) { + const semVer = new RegExp(/(0|[1-9]\d*)\.(0|[1-9]\d*)\.(0|[1-9]\d*)(?:-((?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*)(?:\.(?:0|[1-9]\d*|\d*[a-zA-Z-][0-9a-zA-Z-]*))*))?(?:\+([0-9a-zA-Z-]+(?:\.[0-9a-zA-Z-]+)*))?/); + return file.match(semVer)[0] || "0.0.0"; + } + function comparator(current, remote) { + return current !== remote ? true : false; + } } formatRAM(freemem, totalmem, decimals = 0) { if (0 === freemem) return "0 Bytes"; diff --git a/pre-release/package.json b/pre-release/package.json index ae2fff9..33bf3be 100644 --- a/pre-release/package.json +++ b/pre-release/package.json @@ -1,3 +1,3 @@ { - "version": "2.4.4-beta.2" + "version": "2.4.4" } diff --git a/src/package.json b/src/package.json index 436717a..66622c7 100644 --- a/src/package.json +++ b/src/package.json @@ -1,7 +1,7 @@ { "info": { "name": "RPCPcStatus", - "version": "2.4.3", + "version": "2.4.4", "description": "Rich Presence Pc Status for your Discord", "authorLink": "https://discordapp.com/users/328731868096888833", "authors": [