diff --git a/discord rpc/host/AEFT.jsx b/discord rpc/host/AEFT.jsx index b06ea85..bdf8abb 100644 --- a/discord rpc/host/AEFT.jsx +++ b/discord rpc/host/AEFT.jsx @@ -12,6 +12,10 @@ function state(){ try{ var x = app.project.activeItem.name; + if(app.project.renderQueue.rendering){ + return "Rendering" + } + if(app.project.activeItem instanceof CompItem) { comp = app.project.activeItem.name + " (" + app.project.activeItem.layers.length + ")"; x = app.project.activeItem.name + " (" + app.project.activeItem.layers.length + ")"; @@ -71,7 +75,7 @@ function largeImageText(){ function partySize(){ try{ - if(app.project.renderQueue.rendering == true){ + if(app.project.renderQueue.rendering){ var info; var item; diff --git a/discord rpc/js/index.js b/discord rpc/js/index.js index e19af90..e21a4e8 100644 --- a/discord rpc/js/index.js +++ b/discord rpc/js/index.js @@ -1,3 +1,9 @@ +/** + * + * i was gonna change functions into constants and lambdas but idk if they are being supported in older versions + * + * */ + const RPC = require('discord-rpc'); const client = new RPC.Client({ transport: 'ipc' }); @@ -22,6 +28,7 @@ var smallImage_enable = true; var timestamp_enable = true; var enabled_enable = true; + function loadJSX(fileName) { var csInterface = new CSInterface(); var extensionRoot = csInterface.getSystemPath(SystemPath.EXTENSION) + "/host/"; @@ -30,7 +37,17 @@ function loadJSX(fileName) { console.log(extensionRoot); } +// temporary solution i guess +function isDynamicLink() { + if (appID === "AEFT") { + csInterface.evalScript("app.activeViewer", x => { + if (x === "null") client.destroy(); + }); + } +} + client.on('ready', () => { + isDynamicLink(); send(); }) @@ -41,12 +58,12 @@ client.login({ loadJSX(appID + ".jsx"); getData(); -csInterface.addEventListener('com.discordrpc.restart', function(){ +csInterface.addEventListener('com.discordrpc.restart', () => { client.destroy(); window.location.reload(); }); -csInterface.addEventListener('com.discordrpc.settings', function(e){ +csInterface.addEventListener('com.discordrpc.settings', (e) => { var data = e.data; localStorage.setItem("settings", JSON.stringify(data)); @@ -62,7 +79,7 @@ csInterface.addEventListener('com.discordrpc.settings', function(e){ }); // if doesn't exist on first run -if (localStorage.getItem("settings") === null) { +if (!localStorage.getItem("settings")) { var data = { state: true, @@ -84,7 +101,7 @@ enabled_enable = parsed.enabled; settings_event.data = JSON.parse(settings_json); -csInterface.addEventListener('com.discordrpc.settings.request', function() { +csInterface.addEventListener('com.discordrpc.settings.request', () => { var data = { state: state_enable, diff --git a/discord rpc/js/settings.js b/discord rpc/js/settings.js index e2d2b0d..ab21fcd 100644 --- a/discord rpc/js/settings.js +++ b/discord rpc/js/settings.js @@ -8,12 +8,17 @@ csInterface.addEventListener('com.discordrpc.restart', function(){ window.location.reload(); }); +function reset_settings(){ + localStorage.clear(); + restart(); +} + function restart(){ csInterface.dispatchEvent(restart_event); window.location.reload(); - console.log("works"); } +// prob gonna be deleted later function install(x){ var adobe_path = (path.join(__dirname, "../")); @@ -44,7 +49,7 @@ function install(x){ default: return; } - ps.addCommand(`Start-Process Powershell -Verb runAs -WorkingDirectory '${adobe_path}' -Argument "Write-Host '${adobe_path}';cd '${adobe_path}';Invoke-WebRequest https://raw.githubusercontent.com/lolitee/adobe-discord-rpc/install-scripts/scripts/${type}.ps1 -OutFile ${type}.ps1 -UseBasicParsing; .\\${type}.ps1;"`) + ps.addCommand(`Start-Process Powershell -ExecutionPolicy Bypass -Verb runAs -WorkingDirectory '${adobe_path}' -Argument "Write-Host '${adobe_path}';cd '${adobe_path}';Invoke-WebRequest https://raw.githubusercontent.com/lolitee/adobe-discord-rpc/install-scripts/scripts/${type}.ps1 -OutFile ${type}.ps1 -UseBasicParsing; .\\${type}.ps1;"`) ps.invoke() .then(output => { console.log(output); diff --git a/discord rpc/lib/CSInterface.js b/discord rpc/lib/CSInterface.js index 4239391..9eb64d4 100644 --- a/discord rpc/lib/CSInterface.js +++ b/discord rpc/lib/CSInterface.js @@ -30,7 +30,7 @@ CSXSWindowType._MODELESS = "Modeless"; CSXSWindowType._MODAL_DIALOG = "ModalDialog"; /** EvalScript error message */ -EvalScript_ErrMessage = "EvalScript error."; +EvalScript_ErrMessage = "EvalScript error.";; /** * @class Version diff --git a/discord rpc/package.json b/discord rpc/package.json index 19b8d13..0fc9d37 100644 --- a/discord rpc/package.json +++ b/discord rpc/package.json @@ -1,6 +1,6 @@ { "name": "discord-rpc", - "version": "v0.0.4.2-beta", + "version": "v0.0.4.3-beta", "description": "", "main": "index.js", "directories": { diff --git a/discord rpc/package.json.bak b/discord rpc/package.json.bak deleted file mode 100644 index 6a5a37c..0000000 --- a/discord rpc/package.json.bak +++ /dev/null @@ -1,19 +0,0 @@ -{ - "name": "discord-rpc", - "version": "v0.0.4.1-beta", - "description": "", - "main": "index.js", - "directories": { - "lib": "lib" - }, - "scripts": { - "test": "echo \"Error: no test specified\" && exit 1" - }, - "author": "Tee", - "license": "ISC", - "dependencies": { - "axios": "^0.21.1", - "discord-rpc": "^3.1.4", - "node-powershell": "^4.0.0" - } -}