From c41081089b144145365cd29bdf8f1d462dc31ec7 Mon Sep 17 00:00:00 2001
From: "Mr. Stallion" <mrstallion@nobody.nowhere.fauxdomain.ext>
Date: Sun, 3 Sep 2023 20:06:48 -0700
Subject: [PATCH 1/2] minor
---
CHANGELOG.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index bad2650..a1004ec 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
# Changelog
-## 1.24.0
+## 1.24.1
* Hotfix to address issue with multiple tabs
## 1.24.0
From 7bad3767503bdd8acab40eee43ff0485a80aeaba Mon Sep 17 00:00:00 2001
From: "Mr. Stallion" <mrstallion@nobody.nowhere.fauxdomain.ext>
Date: Sun, 3 Sep 2023 20:27:52 -0700
Subject: [PATCH 2/2] minor
---
CHANGELOG.md | 3 +++
docs/_config.yml | 2 +-
electron/Index.vue | 4 +++-
electron/chat.ts | 7 -------
electron/index.html | 1 -
electron/package.json | 2 +-
electron/secure-store.ts | 21 +++++++++------------
package.json | 2 +-
8 files changed, 18 insertions(+), 24 deletions(-)
diff --git a/CHANGELOG.md b/CHANGELOG.md
index a1004ec..1d37013 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,8 @@
# Changelog
+## 1.24.2
+* Hotfix to address connectivity issues
+
## 1.24.1
* Hotfix to address issue with multiple tabs
diff --git a/docs/_config.yml b/docs/_config.yml
index 02f941f..16b2a51 100644
--- a/docs/_config.yml
+++ b/docs/_config.yml
@@ -51,7 +51,7 @@ changelog: https://github.com/hearmeneigh/fchat-rising/blob/master/CHANGELOG.md
installurl: https://github.com/hearmeneigh/fchat-rising/wiki
download:
- version: 1.24.1
+ version: 1.24.2
url: https://github.com/hearmeneigh/fchat-rising/releases/latest/download/F-Chat-Rising-%PLATFORM_TAIL%
diff --git a/electron/Index.vue b/electron/Index.vue
index 9bcaf6c..0f5bbd6 100644
--- a/electron/Index.vue
+++ b/electron/Index.vue
@@ -115,6 +115,7 @@
import Axios from 'axios';
import * as electron from 'electron';
import * as remote from '@electron/remote';
+ import settings from 'electron-settings';
import log from 'electron-log'; //tslint:disable-line:match-default-export-name
import * as fs from 'fs';
import * as path from 'path';
@@ -201,7 +202,8 @@
// }
// >('keytar/build/Release/keytar.node');
- const keyStore = new SecureStore('fchat-rising-accounts');
+ settings.configure({ electron: remote as any });
+ const keyStore = new SecureStore('fchat-rising-accounts', remote, settings);
// const keyStore = import('keytar');
//
diff --git a/electron/chat.ts b/electron/chat.ts
index b8e5e74..fb12063 100644
--- a/electron/chat.ts
+++ b/electron/chat.ts
@@ -1,4 +1,3 @@
-console.log('CHAT FIRST');
/**
* @license
* MIT License
@@ -37,18 +36,12 @@ console.log('CHAT FIRST');
import * as electron from 'electron';
-console.log('CHAT GOT HERE');
-
import * as remote from '@electron/remote';
const webContents = remote.getCurrentWebContents();
-console.log('CHAT GOT HERE 2');
-
// tslint:disable-next-line:no-require-imports no-submodule-imports
require('@electron/remote/main').enable(webContents);
-console.log('CHAT GOT HERE 3');
-
import Axios from 'axios';
import {exec, execSync} from 'child_process';
import * as path from 'path';
diff --git a/electron/index.html b/electron/index.html
index 1659e23..0a2a100 100644
--- a/electron/index.html
+++ b/electron/index.html
@@ -12,4 +12,3 @@
<script type="text/javascript" src="chat.js"></script>
</body>
</html>
-<!-- <div style="color: #ffffff; font-size: 25pt; text-align: center; opacity: 0.4; margin-top: 5em;">Loading F-Chat Rising...</div> -->
diff --git a/electron/package.json b/electron/package.json
index 1f29e4d..6136b25 100644
--- a/electron/package.json
+++ b/electron/package.json
@@ -1,6 +1,6 @@
{
"name": "fchat",
- "version": "1.24.1",
+ "version": "1.24.2",
"author": "The F-List Team and Mister Stallion (Esq.)",
"description": "F-List.net Chat Client",
"main": "main.js",
diff --git a/electron/secure-store.ts b/electron/secure-store.ts
index 0b65f0b..6446ee8 100644
--- a/electron/secure-store.ts
+++ b/electron/secure-store.ts
@@ -1,8 +1,5 @@
-import * as electronRemote from '@electron/remote';
-import settings from 'electron-settings';
-
export class SecureStore {
- constructor(protected storeName: string) {
+ constructor(protected storeName: string, protected electronRemote: any, protected settings: any) {
}
private getKey(domain: string, account: string): string {
@@ -10,36 +7,36 @@ export class SecureStore {
}
async setPassword(domain: string, account: string, password: string): Promise<void> {
- if ((electronRemote as any).safeStorage.isEncryptionAvailable() === false) {
+ if ((this.electronRemote as any).safeStorage.isEncryptionAvailable() === false) {
return;
}
- const buffer = (electronRemote as any).safeStorage.encryptString(password);
+ const buffer = (this.electronRemote as any).safeStorage.encryptString(password);
- await settings.set(this.getKey(domain, account), buffer.toString('binary'));
+ await this.settings.set(this.getKey(domain, account), buffer.toString('binary'));
}
async deletePassword(domain: string, account: string): Promise<void> {
- if ((electronRemote as any).safeStorage.isEncryptionAvailable() === false) {
+ if ((this.electronRemote as any).safeStorage.isEncryptionAvailable() === false) {
return;
}
- await settings.unset(this.getKey(domain, account));
+ await this.settings.unset(this.getKey(domain, account));
}
async getPassword(domain: string, account: string): Promise<string | null> {
- if ((electronRemote as any).safeStorage.isEncryptionAvailable() === false) {
+ if ((this.electronRemote as any).safeStorage.isEncryptionAvailable() === false) {
return null;
}
- const pw = await settings.get(this.getKey(domain, account));
+ const pw = await this.settings.get(this.getKey(domain, account));
if (!pw) {
return null;
}
const buffer = Buffer.from(pw.toString(), 'binary');
- const decrypted = (electronRemote as any).safeStorage.decryptString(buffer);
+ const decrypted = (this.electronRemote as any).safeStorage.decryptString(buffer);
return decrypted;
}
diff --git a/package.json b/package.json
index 8ea7524..1262531 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
{
"name": "f-list-rising",
- "version": "1.24.1",
+ "version": "1.24.2",
"author": "The F-List Team and and Mister Stallion (Esq.)",
"description": "A heavily modded F-Chat 3.0 client for F-List",
"license": "MIT",