Skip to content

Commit 913fc30

Browse files
insertishinsertish
committed
feat: only allow one instance / fmt code
closes #82
1 parent 1bc45e0 commit 913fc30

12 files changed

+774
-871
lines changed

‎.prettierrc.js

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
module.exports = {
2+
tabWidth: 4,
3+
trailingComma: "all",
4+
jsxBracketSameLine: true
5+
};

‎.vscode/settings.json

+4
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
{
2+
"editor.defaultFormatter": "esbenp.prettier-vscode",
3+
"editor.formatOnSave": true
4+
}

‎package.json

+77-76
Original file line numberDiff line numberDiff line change
@@ -1,82 +1,83 @@
11
{
2-
"name": "revolt-desktop",
3-
"version": "1.0.3",
4-
"description": "Revolt desktop app",
5-
"private": true,
6-
"author": {
7-
"name": "Paul Makles",
8-
"url": "https://insrt.uk",
9-
"email": "[email protected]"
10-
},
11-
"homepage": "https://revolt.chat",
12-
"main": "bundle/main.js",
13-
"scripts": {
14-
"build:bundle": "tsc",
15-
"watch:bundle": "tsc-watch",
16-
"start": "electron .",
17-
"eb": "electron-builder",
18-
"ci": "electron-builder --publish onTagOrDraft",
19-
"release": "dotenv -e .env electron-builder --publish always",
20-
"build:linux:tar": "electron-builder -l tar.gz",
21-
"build:linux:unpacked": "electron-builder -l dir",
22-
"build:linux:appimage": "electron-builder -l AppImage",
23-
"build:mac": "electron-builder --mac --universal",
24-
"build:windows:nsis": "electron-builder -w nsis",
25-
"build:windows:appx": "electron-builder -w appx",
26-
"test:linux:appimage": "dist/Revolt-1.0.1.AppImage",
27-
"clean": "rimraf dist"
28-
},
29-
"repository": "revoltchat/desktop",
30-
"devDependencies": {
31-
"@types/auto-launch": "^5.0.2",
32-
"@types/discord-rpc": "^4.0.1",
33-
"dotenv-cli": "^5.0.0",
34-
"electron": "^17.1.0",
35-
"electron-builder": "^22.14.13",
36-
"node-gyp": "^9.0.0",
37-
"rimraf": "^3.0.2",
38-
"tsc-watch": "^4.6.0",
39-
"typescript": "^4.5.5"
40-
},
41-
"build": {
42-
"appId": "chat.revolt.app",
43-
"productName": "Revolt",
44-
"mac": {
45-
"target": [
46-
"zip"
47-
],
48-
"category": "public.app-category.social-networking"
2+
"name": "revolt-desktop",
3+
"version": "1.0.4",
4+
"description": "Revolt desktop app",
5+
"private": true,
6+
"author": {
7+
"name": "Paul Makles",
8+
"url": "https://insrt.uk",
9+
"email": "[email protected]"
4910
},
50-
"linux": {
51-
"target": [
52-
"AppImage",
53-
"tar.gz"
54-
],
55-
"category": "Network"
11+
"homepage": "https://revolt.chat",
12+
"main": "bundle/main.js",
13+
"scripts": {
14+
"build:bundle": "tsc",
15+
"watch:bundle": "tsc-watch",
16+
"start": "electron .",
17+
"eb": "electron-builder",
18+
"ci": "electron-builder --publish onTagOrDraft",
19+
"release": "dotenv -e .env electron-builder --publish always",
20+
"build:linux:tar": "electron-builder -l tar.gz",
21+
"build:linux:unpacked": "electron-builder -l dir",
22+
"build:linux:appimage": "electron-builder -l AppImage",
23+
"build:mac": "electron-builder --mac --universal",
24+
"build:windows:nsis": "electron-builder -w nsis",
25+
"build:windows:appx": "electron-builder -w appx",
26+
"clean": "rimraf dist",
27+
"fmt": "prettier --write 'src/**/*.{js,jsx,ts,tsx}'"
5628
},
57-
"win": {
58-
"target": [
59-
"nsis",
60-
"appx"
61-
]
29+
"repository": "revoltchat/desktop",
30+
"devDependencies": {
31+
"@types/auto-launch": "^5.0.2",
32+
"@types/discord-rpc": "^4.0.1",
33+
"dotenv-cli": "^5.0.0",
34+
"electron": "^17.1.0",
35+
"electron-builder": "^22.14.13",
36+
"node-gyp": "^9.0.0",
37+
"prettier": "^2.6.2",
38+
"rimraf": "^3.0.2",
39+
"tsc-watch": "^4.6.0",
40+
"typescript": "^4.5.5"
6241
},
63-
"appx": {
64-
"displayName": "Revolt Chat",
65-
"applicationId": "revolt.chat",
66-
"identityName": "40345RevoltCommunications.revolt.chat",
67-
"publisher": "CN=B040CC7E-0016-4AF5-957F-F8977A6CFA3B",
68-
"publisherDisplayName": "Revolt Communications"
42+
"build": {
43+
"appId": "chat.revolt.app",
44+
"productName": "Revolt",
45+
"mac": {
46+
"target": [
47+
"zip"
48+
],
49+
"category": "public.app-category.social-networking"
50+
},
51+
"linux": {
52+
"target": [
53+
"AppImage",
54+
"tar.gz"
55+
],
56+
"category": "Network"
57+
},
58+
"win": {
59+
"target": [
60+
"nsis",
61+
"appx"
62+
]
63+
},
64+
"appx": {
65+
"displayName": "Revolt Chat",
66+
"applicationId": "revolt.chat",
67+
"identityName": "40345RevoltCommunications.revolt.chat",
68+
"publisher": "CN=B040CC7E-0016-4AF5-957F-F8977A6CFA3B",
69+
"publisherDisplayName": "Revolt Communications"
70+
},
71+
"publish": {
72+
"provider": "github"
73+
}
6974
},
70-
"publish": {
71-
"provider": "github"
72-
}
73-
},
74-
"dependencies": {
75-
"auto-launch": "^5.0.5",
76-
"discord-rpc": "^4.0.1",
77-
"electron-store": "^8.0.1",
78-
"electron-updater": "^4.6.5",
79-
"electron-window-state": "^5.0.3"
80-
},
81-
"packageManager": "[email protected]"
75+
"dependencies": {
76+
"auto-launch": "^5.0.5",
77+
"discord-rpc": "^4.0.1",
78+
"electron-store": "^8.0.1",
79+
"electron-updater": "^4.6.5",
80+
"electron-window-state": "^5.0.3"
81+
},
82+
"packageManager": "[email protected]"
8283
}

‎package/revolt-desktop-git

Submodule revolt-desktop-git updated from 0a87f32 to 077f04f

‎src/app.ts

+31-30
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,15 @@
1-
import { contextBridge, ipcRenderer } from 'electron';
1+
import { contextBridge, ipcRenderer } from "electron";
22

33
type NonFunctionPropertyNames<T> = {
44
[K in keyof T]: T[K] extends Function ? never : K;
5-
}[keyof T];
5+
}[keyof T];
66

7-
export type Build = 'stable' | 'nightly' | 'dev';
7+
export type Build = "stable" | "nightly" | "dev";
88
export type ConfigData = Pick<Config, NonFunctionPropertyNames<Config>>;
99

1010
class Config {
1111
frame: boolean = true;
12-
build: Build = 'stable';
12+
build: Build = "stable";
1313
discordRPC: boolean = true;
1414
hardwareAcceleration: boolean = true;
1515

@@ -20,37 +20,38 @@ class Config {
2020
set(key: string, value: any) {
2121
// @ts-expect-error
2222
this[key] = value;
23-
ipcRenderer.send('set', { [key]: value })
23+
ipcRenderer.send("set", { [key]: value });
2424
}
2525
}
2626

2727
let config = new Config();
28-
ipcRenderer.on('config', (_, data) => config.apply(data));
28+
ipcRenderer.on("config", (_, data) => config.apply(data));
2929

3030
contextBridge.exposeInMainWorld("isNative", true);
31-
contextBridge.exposeInMainWorld("nativeVersion", "1.0.3");
32-
contextBridge.exposeInMainWorld(
33-
"native", {
34-
min: () => ipcRenderer.send('min'),
35-
max: () => ipcRenderer.send('max'),
36-
close: () => ipcRenderer.send('close'),
37-
reload: () => ipcRenderer.send('reload'),
38-
relaunch: () => ipcRenderer.send('relaunch'),
39-
40-
getConfig: () => config,
41-
set: (k: string, v: any) => config.set(k, v),
42-
43-
getAutoStart: () => new Promise(resolve => {
44-
ipcRenderer.send('getAutoStart')
45-
ipcRenderer.on('autoStart', (_, arg) => resolve(arg))
31+
contextBridge.exposeInMainWorld("nativeVersion", "1.0.4");
32+
contextBridge.exposeInMainWorld("native", {
33+
min: () => ipcRenderer.send("min"),
34+
max: () => ipcRenderer.send("max"),
35+
close: () => ipcRenderer.send("close"),
36+
reload: () => ipcRenderer.send("reload"),
37+
relaunch: () => ipcRenderer.send("relaunch"),
38+
39+
getConfig: () => config,
40+
set: (k: string, v: any) => config.set(k, v),
41+
42+
getAutoStart: () =>
43+
new Promise((resolve) => {
44+
ipcRenderer.send("getAutoStart");
45+
ipcRenderer.on("autoStart", (_, arg) => resolve(arg));
4646
}),
47-
enableAutoStart: () => new Promise(resolve => {
48-
ipcRenderer.send('setAutoStart', true)
49-
ipcRenderer.on('autoStart', (_, arg) => resolve(arg))
47+
enableAutoStart: () =>
48+
new Promise((resolve) => {
49+
ipcRenderer.send("setAutoStart", true);
50+
ipcRenderer.on("autoStart", (_, arg) => resolve(arg));
5051
}),
51-
disableAutoStart: () => new Promise(resolve => {
52-
ipcRenderer.send('setAutoStart', false)
53-
ipcRenderer.on('autoStart', (_, arg) => resolve(arg))
54-
})
55-
}
56-
);
52+
disableAutoStart: () =>
53+
new Promise((resolve) => {
54+
ipcRenderer.send("setAutoStart", false);
55+
ipcRenderer.on("autoStart", (_, arg) => resolve(arg));
56+
}),
57+
});

‎src/lib/autoLaunch.ts

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
import AutoLaunch from 'auto-launch';
1+
import AutoLaunch from "auto-launch";
22

33
export const autoLaunch = new AutoLaunch({
4-
name: 'Revolt',
4+
name: "Revolt",
55
});

‎src/lib/config.ts

+28-25
Original file line numberDiff line numberDiff line change
@@ -1,35 +1,35 @@
1-
import type { ConfigData } from '../app';
1+
import type { ConfigData } from "../app";
22

3-
import { autoLaunch } from './autoLaunch';
4-
import { connectRPC } from './discordRPC';
5-
import Store from 'electron-store';
6-
import { app } from 'electron';
3+
import { autoLaunch } from "./autoLaunch";
4+
import { connectRPC } from "./discordRPC";
5+
import Store from "electron-store";
6+
import { app } from "electron";
77

88
export const store = new Store<{ config: Partial<ConfigData> }>();
99

1010
export async function firstRun() {
11-
if (store.get('firstrun', false)) return;
12-
13-
// Enable auto start by default on Windows / Mac OS.
14-
if (process.platform === 'win32' || process.platform === 'darwin') {
15-
const enabled = await autoLaunch.isEnabled();
16-
if (!enabled) {
17-
await autoLaunch.enable();
18-
}
19-
}
11+
if (store.get("firstrun", false)) return;
12+
13+
// Enable auto start by default on Windows / Mac OS.
14+
if (process.platform === "win32" || process.platform === "darwin") {
15+
const enabled = await autoLaunch.isEnabled();
16+
if (!enabled) {
17+
await autoLaunch.enable();
18+
}
19+
}
2020

21-
store.set('firstrun', true);
21+
store.set("firstrun", true);
2222
}
2323

2424
export function getConfig(): ConfigData {
2525
const defaults: ConfigData = {
26-
build: 'stable',
27-
frame: process.platform !== 'win32',
26+
build: "stable",
27+
frame: process.platform !== "win32",
2828
discordRPC: false,
2929
hardwareAcceleration: true,
3030
};
3131

32-
return Object.assign({} as any, defaults, store.get('config'));
32+
return Object.assign({} as any, defaults, store.get("config"));
3333
}
3434

3535
export function onStart() {
@@ -45,11 +45,14 @@ export function onStart() {
4545
}
4646

4747
export function getBuildURL() {
48-
const build: 'stable' | 'nightly' | 'dev' = getConfig().build;
49-
50-
switch (build) {
51-
case 'dev': return 'http://local.revolt.chat:3001';
52-
case 'nightly': return 'https://nightly.revolt.chat';
53-
default: return 'https://app.revolt.chat';
54-
}
48+
const build: "stable" | "nightly" | "dev" = getConfig().build;
49+
50+
switch (build) {
51+
case "dev":
52+
return "http://local.revolt.chat:3001";
53+
case "nightly":
54+
return "https://nightly.revolt.chat";
55+
default:
56+
return "https://app.revolt.chat";
57+
}
5558
}

‎src/lib/discordRPC.ts

+18-15
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,34 @@
1-
import { Client } from 'discord-rpc';
2-
import { getConfig } from './config';
1+
import { Client } from "discord-rpc";
2+
import { getConfig } from "./config";
33

44
export var rpc: Client;
55

66
export async function connectRPC() {
77
if (!getConfig().discordRPC) return;
88

99
try {
10-
rpc = new Client({ transport: 'ipc' });
10+
rpc = new Client({ transport: "ipc" });
1111

12-
rpc.on('ready', () =>
12+
rpc.on("ready", () =>
1313
rpc.setActivity({
14-
state: 'revolt.chat',
15-
details: 'Chatting with others',
16-
largeImageKey: 'qr',
17-
largeImageText: 'Communication is critical – use Revolt.',
14+
state: "revolt.chat",
15+
details: "Chatting with others",
16+
largeImageKey: "qr",
17+
largeImageText: "Communication is critical – use Revolt.",
1818
buttons: [
19-
{ label: 'Join Public Beta', url: 'https://revolt.chat/publicbeta' },
20-
{ label: 'Website', url: 'https://revolt.chat' }
21-
]
22-
})
23-
)
19+
{
20+
label: "Join Public Beta",
21+
url: "https://revolt.chat/publicbeta",
22+
},
23+
{ label: "Website", url: "https://revolt.chat" },
24+
],
25+
}),
26+
);
2427

2528
// @ts-ignore
26-
rpc.on('disconnected', reconnect)
29+
rpc.on("disconnected", reconnect);
2730

28-
rpc.login({ clientId: '872068124005007420' });
31+
rpc.login({ clientId: "872068124005007420" });
2932
} catch (err) {
3033
reconnect();
3134
}

0 commit comments

Comments
 (0)