From 03082d3d7fd9a02a5c6f65265110a752abcf2248 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Wed, 20 Apr 2022 16:52:37 +0200 Subject: [PATCH 1/6] Arm64 build + delete latest prerelease --- .github/workflows/dev.yml | 25 +++++++++++++++++++++---- 1 file changed, 21 insertions(+), 4 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 4b9502f..174dcff 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -23,13 +23,18 @@ jobs: run: npm install -g electron-builder - name: Build - run: npm run build && electron-builder --linux zip + run: npm run build && electron-builder --linux zip && electron-builder --arm64 --linux zip - name: Upload artifact uses: actions/upload-artifact@v2 with: name: ArmCordLinux.zip path: dist/ArmCord-3.1.0.zip + - name: Upload artifact + uses: actions/upload-artifact@v2 + with: + name: ArmCordLinuxArm64.zip + path: dist/ArmCord-3.1.0-arm64.zip build-mac: runs-on: macos-latest @@ -108,6 +113,11 @@ jobs: with: name: ArmCordLinux.zip path: linux + + - uses: actions/download-artifact@v2 + with: + name: ArmCordLinuxArm64.zip + path: linux - run: | ls ls windows @@ -118,18 +128,25 @@ jobs: shell: bash run: | echo "::set-output name=sha_short::$(git rev-parse --short HEAD)" - + - uses: dev-drprasad/delete-tag-and-release@v0.2.0 + with: + delete_release: true + tag_name: devbuild + repo: ArmCord/ArmCord + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Create the release uses: softprops/action-gh-release@v1 env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} with: - tag_name: ${{ steps.vars.outputs.sha_short }} + tag_name: devbuild name: Dev Build ${{ steps.vars.outputs.sha_short }} draft: false prerelease: true body_path: .github/release.md files: | linux/ArmCord-3.1.0.zip + linux/ArmCord-3.1.0-arm64.zip macos/ArmCord-3.1.0-mac.zip - windows/ArmCord-3.1.0-win.zip \ No newline at end of file + windows/ArmCord-3.1.0-win.zip From 009f6ba19abbf290cb4331edcaa04fca709238c5 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Wed, 20 Apr 2022 16:53:50 +0200 Subject: [PATCH 2/6] Fix github token not loading --- .github/workflows/dev.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 174dcff..58e5294 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -133,8 +133,8 @@ jobs: delete_release: true tag_name: devbuild repo: ArmCord/ArmCord - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + env: + GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - name: Create the release uses: softprops/action-gh-release@v1 env: From aac52167f1441d9d4e74d03958b0ce1280bc0ed5 Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Wed, 20 Apr 2022 17:15:51 +0200 Subject: [PATCH 3/6] Add dev build notice --- .github/release.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/.github/release.md b/.github/release.md index 639ec3e..693ce20 100644 --- a/.github/release.md +++ b/.github/release.md @@ -1,2 +1,3 @@ -# Thanks for checking out ArmCord dev build! -Make sure to join our [Discord server](https://discord.gg/uaW5vMY3V6) to share opinions, or to chat with ArmCord developers! \ No newline at end of file +# Thanks for checking out ArmCord dev builds! +These builds are unstable and not ready for full release. They contain new experimental features and changes. We provide no official support for them. +Make sure to join our [Discord server](https://discord.gg/uaW5vMY3V6) to share opinions, or to chat with ArmCord developers! From 61104a166e1e525eae5b9836a6f60ce43d1963aa Mon Sep 17 00:00:00 2001 From: smartfridge <37928912+smartfrigde@users.noreply.github.com> Date: Wed, 20 Apr 2022 17:32:54 +0200 Subject: [PATCH 4/6] Make dev workflow only trigger on dev branch --- .github/workflows/dev.yml | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.github/workflows/dev.yml b/.github/workflows/dev.yml index 58e5294..509146f 100644 --- a/.github/workflows/dev.yml +++ b/.github/workflows/dev.yml @@ -1,5 +1,8 @@ name: Dev build -on: [push] +on: + push: + branches: + - dev env: FORCE_COLOR: true From 97e8fb5e699a48697ad529c7c243c63c0e65f529 Mon Sep 17 00:00:00 2001 From: smartfrigde <37928912+smartfrigde@users.noreply.github.com> Date: Wed, 20 Apr 2022 20:30:52 +0200 Subject: [PATCH 5/6] Fix setup not working, css additions --- src/content/css/discord.css | 3 +++ src/utils.ts | 7 ++++++- 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/src/content/css/discord.css b/src/content/css/discord.css index 1b49a8b..70e11a0 100644 --- a/src/content/css/discord.css +++ b/src/content/css/discord.css @@ -10,3 +10,6 @@ .notice-2HEN-u { display: none; } +.sidebar-1tnWFu { + border-top-left-radius: 8px !important; +} diff --git a/src/utils.ts b/src/utils.ts index 6b12f38..163f830 100644 --- a/src/utils.ts +++ b/src/utils.ts @@ -83,7 +83,7 @@ export async function getConfig(object: string) { const settingsFile = storagePath + "settings.json"; let rawdata = fs.readFileSync(settingsFile, "utf-8"); let returndata = JSON.parse(rawdata); - console.log(returndata[object]); + console.log(object + ": " + returndata[object]); return returndata[object]; } catch (e) { console.log("Config probably doesn't exist yet. Returning setup value."); @@ -124,7 +124,12 @@ export async function checkIfConfigExists() { const userDataPath = app.getPath("userData"); const storagePath = path.join(userDataPath, "/storage/"); const settingsFile = storagePath + "settings.json"; + if (!fs.existsSync(settingsFile)) { + if (!fs.existsSync(storagePath)) { + fs.mkdirSync(storagePath); + console.log("Created missing storage folder"); + } console.log("First run of the ArmCord. Starting setup."); setup(); contentPath = path.join(__dirname, "/content/setup.html"); From 4b4e72ccf42f8ab26e211b19c1397648719afbdf Mon Sep 17 00:00:00 2001 From: smartfrigde <37928912+smartfrigde@users.noreply.github.com> Date: Wed, 20 Apr 2022 20:43:38 +0200 Subject: [PATCH 6/6] Readme fixes and weblate mention --- README.md | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/README.md b/README.md index 29f378e..dcaaa55 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,7 @@ # How to run/install it? ### Recommended: - Check releases tab for precompiled packages for Linux, Windows and ~~Mac OS~~ (Mac OS is broken see [#48](https://github.com/ArmCord/ArmCord/issues/48)). Alternatively use our Sourceforge mirror. + Check releases tab for precompiled packages for Linux, Windows and Mac OS. Alternatively use our Sourceforge mirror. Download ArmCord ### AUR Package Armcord is also available on the Arch User Repository (AUR) [here](https://aur.archlinux.org/packages/armcord-bin/). @@ -51,14 +51,15 @@ Install it via an AUR helper tool like `yay`. # FAQ ## 1. Will I get banned from using it? - -You are breaking Discord ToS if you decided to use client mods. But no one ever got banned from using ArmCord or any of the client mods included. If you wish to remove mods, check our documentation. + - You are breaking Discord ToS if you decided to use client mods. But no one ever got banned from using ArmCord or any of the client mods included. If you wish to remove mods, check our documentation. ## 2. How does this work? - -We are using official web app and adding some magic powder to make it all work! + - We are using official web app and adding some magic powder to make it all work! ## 3. Can I use this on other architectures or operating systems? - -Yes! ArmCord should work normally under Windows, Mac OS and Linux as long as it has NodeJS, npm and Electron support. - + - Yes! ArmCord should work normally under Windows, Mac OS and Linux as long as it has NodeJS, npm and Electron support. +## 4. Where can I translate this? + - Translations are done using our [Weblate page](https://hosted.weblate.org/projects/armcord/armcord/). They're pushed to this [repo](https://github.com/ArmCord/i18n). # Credits [ArmCord UI Elements and few features](https://github.com/kckarnige) [Cumcord](https://github.com/Cumcord/Cumcord)