Skip to content

Commit

Permalink
fixed some bugs
Browse files Browse the repository at this point in the history
  • Loading branch information
teeteeteeteetee committed Feb 5, 2022
1 parent 437f0ec commit d3f1a9c
Show file tree
Hide file tree
Showing 6 changed files with 35 additions and 28 deletions.
6 changes: 5 additions & 1 deletion discord rpc/host/AEFT.jsx
Expand Up @@ -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 + ")";
Expand Down Expand Up @@ -71,7 +75,7 @@ function largeImageText(){

function partySize(){
try{
if(app.project.renderQueue.rendering == true){
if(app.project.renderQueue.rendering){
var info;
var item;

Expand Down
25 changes: 21 additions & 4 deletions 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' });
Expand All @@ -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/";
Expand All @@ -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();
})

Expand All @@ -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));
Expand All @@ -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,
Expand All @@ -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,
Expand Down
9 changes: 7 additions & 2 deletions discord rpc/js/settings.js
Expand Up @@ -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, "../"));
Expand Down Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion discord rpc/lib/CSInterface.js
Expand Up @@ -30,7 +30,7 @@ CSXSWindowType._MODELESS = "Modeless";
CSXSWindowType._MODAL_DIALOG = "ModalDialog";

/** EvalScript error message */
EvalScript_ErrMessage = "EvalScript error.";
EvalScript_ErrMessage = "EvalScript error.";;

/**
* @class Version
Expand Down
2 changes: 1 addition & 1 deletion 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": {
Expand Down
19 changes: 0 additions & 19 deletions discord rpc/package.json.bak

This file was deleted.

0 comments on commit d3f1a9c

Please sign in to comment.