mirror of
https://github.com/smartfrigde/armcord.git
synced 2024-08-14 23:56:58 +00:00
Fix ArmCord not starting
This commit is contained in:
parent
bf85dfd710
commit
0d55c30810
3 changed files with 62 additions and 46 deletions
82
src/main.ts
82
src/main.ts
|
@ -1,9 +1,16 @@
|
||||||
// Modules to control application life and create native browser window
|
// Modules to control application life and create native browser window
|
||||||
import { app, BrowserWindow, ipcMain, shell, desktopCapturer, session } from "electron";
|
import {
|
||||||
|
app,
|
||||||
|
BrowserWindow,
|
||||||
|
ipcMain,
|
||||||
|
shell,
|
||||||
|
desktopCapturer,
|
||||||
|
session,
|
||||||
|
} from "electron";
|
||||||
import * as path from "path";
|
import * as path from "path";
|
||||||
import "v8-compile-cache";
|
import "v8-compile-cache";
|
||||||
import * as storage from "electron-json-storage";
|
import * as storage from "electron-json-storage";
|
||||||
import { saveSettings, getVersion, setup } from "./utils";
|
import { saveSettings, getVersion, setup, getConfigUnsafe } from "./utils";
|
||||||
import "./extensions/mods";
|
import "./extensions/mods";
|
||||||
import "./extensions/plugin";
|
import "./extensions/plugin";
|
||||||
import "./tray";
|
import "./tray";
|
||||||
|
@ -11,7 +18,6 @@ import "./shortcuts";
|
||||||
var contentPath: string = "null";
|
var contentPath: string = "null";
|
||||||
var frame: boolean;
|
var frame: boolean;
|
||||||
var channel: string;
|
var channel: string;
|
||||||
var titlebar: boolean;
|
|
||||||
export var mainWindow: BrowserWindow;
|
export var mainWindow: BrowserWindow;
|
||||||
var settings: any;
|
var settings: any;
|
||||||
|
|
||||||
|
@ -30,22 +36,21 @@ storage.has("settings", function (error, hasKey) {
|
||||||
storage.get("settings", function (error, data: any) {
|
storage.get("settings", function (error, data: any) {
|
||||||
if (error) throw error;
|
if (error) throw error;
|
||||||
console.log(data);
|
console.log(data);
|
||||||
titlebar = data.customTitlebar;
|
|
||||||
channel = data.channel;
|
channel = data.channel;
|
||||||
settings = data;
|
settings = data;
|
||||||
if ((titlebar = true)) {
|
|
||||||
frame = false;
|
|
||||||
} else {
|
|
||||||
frame = true;
|
|
||||||
}
|
|
||||||
});
|
});
|
||||||
|
var titlebar:any = getConfigUnsafe("customTitlebar")
|
||||||
|
console.log(!titlebar)
|
||||||
function createWindow() {
|
function createWindow() {
|
||||||
mainWindow = new BrowserWindow({
|
mainWindow = new BrowserWindow({
|
||||||
width: 300,
|
width: 300,
|
||||||
height: 350,
|
height: 350,
|
||||||
title: "ArmCord",
|
title: "ArmCord",
|
||||||
icon: "./assets/ac_icon_transparent.png",
|
darkTheme: true,
|
||||||
frame: frame,
|
icon: path.join(__dirname, "/assets/icon_transparent.png"),
|
||||||
|
frame: !titlebar,
|
||||||
|
autoHideMenuBar: true,
|
||||||
webPreferences: {
|
webPreferences: {
|
||||||
preload: path.join(__dirname, "preload/preload.js"),
|
preload: path.join(__dirname, "preload/preload.js"),
|
||||||
},
|
},
|
||||||
|
@ -81,9 +86,8 @@ function createWindow() {
|
||||||
mainWindow.setSize(800, 600);
|
mainWindow.setSize(800, 600);
|
||||||
});
|
});
|
||||||
ipcMain.on("restart", (event, arg) => {
|
ipcMain.on("restart", (event, arg) => {
|
||||||
app.relaunch();
|
app.relaunch();
|
||||||
app.exit();
|
app.exit();
|
||||||
|
|
||||||
});
|
});
|
||||||
|
|
||||||
ipcMain.on("saveSettings", (event, ...args) => {
|
ipcMain.on("saveSettings", (event, ...args) => {
|
||||||
|
@ -122,32 +126,32 @@ function createWindow() {
|
||||||
|
|
||||||
app.whenReady().then(() => {
|
app.whenReady().then(() => {
|
||||||
createWindow();
|
createWindow();
|
||||||
session
|
session
|
||||||
.fromPartition("some-partition")
|
.fromPartition("some-partition")
|
||||||
.setPermissionRequestHandler((webContents, permission, callback) => {
|
.setPermissionRequestHandler((webContents, permission, callback) => {
|
||||||
const url = webContents.getURL(); //unused?
|
const url = webContents.getURL(); //unused?
|
||||||
|
|
||||||
if (permission === "notifications") {
|
if (permission === "notifications") {
|
||||||
// Approves the permissions request
|
// Approves the permissions request
|
||||||
callback(true);
|
callback(true);
|
||||||
}
|
}
|
||||||
if (permission === "media") {
|
if (permission === "media") {
|
||||||
// Approves the permissions request
|
// Approves the permissions request
|
||||||
callback(true);
|
callback(true);
|
||||||
}
|
}
|
||||||
if (url.startsWith("discord://")) {
|
if (url.startsWith("discord://")) {
|
||||||
// Denies the permissions request
|
// Denies the permissions request
|
||||||
return callback(false);
|
return callback(false);
|
||||||
}
|
}
|
||||||
if (url.startsWith("discord.com/science")) {
|
if (url.startsWith("discord.com/science")) {
|
||||||
// Denies the permissions request
|
// Denies the permissions request
|
||||||
return callback(false);
|
return callback(false);
|
||||||
}
|
}
|
||||||
if (url.startsWith("discord.com/tracing")) {
|
if (url.startsWith("discord.com/tracing")) {
|
||||||
// Denies the permissions request
|
// Denies the permissions request
|
||||||
return callback(false);
|
return callback(false);
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
app.on("activate", function () {
|
app.on("activate", function () {
|
||||||
if (BrowserWindow.getAllWindows().length === 0) createWindow();
|
if (BrowserWindow.getAllWindows().length === 0) createWindow();
|
||||||
});
|
});
|
||||||
|
|
|
@ -1,8 +1,9 @@
|
||||||
import { app, Menu, Tray } from 'electron';
|
import { app, Menu, Tray } from 'electron';
|
||||||
import {mainWindow} from './main';
|
import {mainWindow} from './main';
|
||||||
|
import * as path from 'path'
|
||||||
let tray = null
|
let tray = null
|
||||||
app.whenReady().then(() => {
|
app.whenReady().then(() => {
|
||||||
tray = new Tray('./assets/ac_plug.png')
|
tray = new Tray(path.join(__dirname, "../", "/assets/ac_plug.png"))
|
||||||
const contextMenu = Menu.buildFromTemplate([
|
const contextMenu = Menu.buildFromTemplate([
|
||||||
{
|
{
|
||||||
label: "Open ArmCord",
|
label: "Open ArmCord",
|
||||||
|
@ -25,6 +26,6 @@ app.whenReady().then(() => {
|
||||||
},
|
},
|
||||||
]);
|
]);
|
||||||
|
|
||||||
tray.setToolTip('ArmCord' + process.env.npm_package_version)
|
tray.setToolTip('ArmCord ' + process.env.npm_package_version)
|
||||||
tray.setContextMenu(contextMenu)
|
tray.setContextMenu(contextMenu)
|
||||||
})
|
})
|
21
src/utils.ts
21
src/utils.ts
|
@ -1,5 +1,7 @@
|
||||||
import * as fs from "fs";
|
|
||||||
import * as storage from "electron-json-storage";
|
import * as storage from "electron-json-storage";
|
||||||
|
import * as fs from "fs";
|
||||||
|
import { app } from "electron";
|
||||||
|
|
||||||
//utillity functions that are used all over the codebase or just too obscure to be put in the file used in
|
//utillity functions that are used all over the codebase or just too obscure to be put in the file used in
|
||||||
export function addStyle(styleString: string) {
|
export function addStyle(styleString: string) {
|
||||||
const style = document.createElement("style");
|
const style = document.createElement("style");
|
||||||
|
@ -21,6 +23,7 @@ export function setup() {
|
||||||
channel: "stable",
|
channel: "stable",
|
||||||
firstRun: "done",
|
firstRun: "done",
|
||||||
armcordCSP: true,
|
armcordCSP: true,
|
||||||
|
mods: "none"
|
||||||
},
|
},
|
||||||
function (error) {
|
function (error) {
|
||||||
if (error) throw error;
|
if (error) throw error;
|
||||||
|
@ -51,8 +54,16 @@ export function saveSettings(
|
||||||
}
|
}
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
export async function getConfigUnsafe(object: string) {
|
||||||
export function getVersion() {
|
const userDataPath = app.getPath("userData");
|
||||||
const pkgjson = fs.readFileSync("./package.json", "utf8");
|
const storagePath = userDataPath + "/storage/";
|
||||||
return JSON.parse(pkgjson).version;
|
let rawdata = fs.readFileSync(storagePath + "settings.json", "utf-8");
|
||||||
|
let returndata = JSON.parse(rawdata);
|
||||||
|
console.log(returndata[object]);
|
||||||
|
return returndata[object]
|
||||||
}
|
}
|
||||||
|
export function getVersion() {
|
||||||
|
//to-do better way of doing this
|
||||||
|
return '3.0.1';
|
||||||
|
}
|
||||||
|
|
Loading…
Reference in a new issue