Fix clipboard bug

.github/workflows/build.yml

@@ -1,194 +1,40 @@
-name: Release build
+name: Build/release
+
 on: 
   push:
     branches:
       - stable
 
-env:
-  FORCE_COLOR: true
-
 jobs:
-    build-linux:
-        runs-on: ubuntu-latest
-
-        steps:
-            - uses: actions/setup-node@v3
-              with:
-                node-version: '18'
-
-            - name: Checkout code
-              uses: actions/checkout@v2
-
-            - name: Install Node dependencies
-              run: npm install
-
-            - name: Install Electron-Builder
-              run: npm install -g electron-builder
-
-            - name: Build
-              run: npm run build && electron-builder --linux && electron-builder --arm64 --linux && electron-builder --armv7l --linux
-              env:
-                GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            - name: Delete unpacked builds
-              run: rm -rf dist/linux-unpacked && rm -rf dist/linux-arm64-unpacked && rm -rf dist/linux-armv7l-unpacked
-            - name: Upload artifact
-              uses: actions/upload-artifact@v2
-              with:
-                  name: ArmCordLinux
-                  path: dist/
-
-
-    build-mac:
-        runs-on: macos-latest
-
-        steps:
-            - uses: actions/setup-node@v3
-              with:
-                node-version: '18'
-
-            - name: Checkout code
-              uses: actions/checkout@v2
-
-            - name: Install Node dependencies
-              run: npm install
-              
-            - name: Install Electron-Builder
-              run: npm install -g electron-builder
-
-            - name: Build
-              run: npm run build && electron-builder --macos
-              env:
-                GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            - name: Delete unpacked builds
-              run: rm -rf dist/macos-unpacked
-
-            - name: Upload artifact
-              uses: actions/upload-artifact@v2
-              with:
-                  name: ArmCordMac
-                  path: dist/
-
-    build-windows:
-        runs-on: windows-latest
-
-        steps:
-            - uses: actions/setup-node@v3
-              with:
-                node-version: '18'
-
-            - name: Checkout code
-              uses: actions/checkout@v2
-
-            - name: Install Node dependencies
-              run: npm install
-              
-            - name: Install Electron-Builder
-              run: npm install -g electron-builder
-
-            - name: Build
-              run: npm run build && electron-builder --windows
-              env:
-                GH_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            - name: Delete unpacked builds
-              run: Remove-Item -LiteralPath ".\dist\win-unpacked" -Force -Recurse
-            - name: Upload artifact
-              uses: actions/upload-artifact@v2
-              with:
-                  name: ArmCordWindows
-                  path: dist/
-            
-
   release:
-        runs-on: ubuntu-latest
-        needs: [build-linux, build-mac, build-windows]
+    runs-on: ${{ matrix.os }}
+
+    strategy:
+      matrix:
+        os: [macos-latest, ubuntu-latest, windows-latest]
 
     steps:
-            - name: Checkout code
-              uses: actions/checkout@v2
+      - name: Check out Git repository
+        uses: actions/checkout@v1
 
-            - uses: actions/download-artifact@v2
+      - name: Install Node.js, NPM and Yarn
+        uses: actions/setup-node@v1
         with:
-                  name: ArmCordMac
-                  path: macos
+          node-version: 16
 
-            - uses: actions/download-artifact@v2
+      - name: Build/release Electron app
+        uses: samuelmeuli/action-electron-builder@v1
         with:
-                  name: ArmCordWindows
-                  path: windows
-
-            - uses: actions/download-artifact@v2
+          # GitHub token, automatically provided to the action
+          # (No need to define this secret in the repo settings)
+          github_token: ${{ secrets.github_token }}
+          # skip npm run build as there's no script like that 
+          skip_build: false
+          # If the commit is tagged with a version (e.g. "v1.0.0"),
+          # release the app after building
+          release: ${{ startsWith(github.ref, 'refs/tags/v') }} #disabled for now as it caused problems (nvm)
+      - name: Archive production builds
+        uses: actions/upload-artifact@v2
         with:
-                  name: ArmCordLinux
-                  path: linux
-
-            - uses: actions/download-artifact@v2
-              with:
-                  name: ArmCordLinuxArm64
-                  path: linux
-
-            - name: Get some values needed for the release
-              id: vars
-              shell: bash
-              run: |
-                echo "::set-output name=releaseTag::$(git describe --tags --abbrev=0)"
-
-            - uses: dev-drprasad/delete-tag-and-release@v0.2.0
-              with:
-                delete_release: true
-                tag_name: ${{ steps.vars.outputs.releaseTag }}
-              env:
-                GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-            - name: Create Release
-              uses: actions/github-script@v2
-              with:
-                github-token: ${{secrets.GITHUB_TOKEN}}
-                script: |
-                  console.log('environment', process.versions);
-                  
-                  const fs = require('fs').promises;
-                  
-                  const { repo: { owner, repo }, sha } = context;
-                  console.log({ owner, repo, sha });
-
-                  const release = await github.repos.createRelease({
-                    owner, repo,
-                    tag_name: process.env.releaseTag,
-                    draft: true,
-                    target_commitish: sha
-                  });
-
-                  console.log('created release', { release });
-              
-                  for (let file of await fs.readdir('linux')) {
-                    // do whatever filtering you want here, I'm just uploading all the files
-                    console.log('uploading', file);
-
-                    await github.repos.uploadReleaseAsset({
-                      owner, repo,
-                      release_id: release.data.id,
-                      name: file,
-                      data: await fs.readFile(`./linux/${file}`)
-                    });            
-                  }
-                  for (let file of await fs.readdir('windows')) {
-                    // do whatever filtering you want here, I'm just uploading all the files
-                    console.log('uploading', file);
-
-                    await github.repos.uploadReleaseAsset({
-                      owner, repo,
-                      release_id: release.data.id,
-                      name: file,
-                      data: await fs.readFile(`./windows/${file}`)
-                    });            
-                  }
-                  for (let file of await fs.readdir('macos')) {
-                    // do whatever filtering you want here, I'm just uploading all the files
-                    console.log('uploading', file);
-
-                    await github.repos.uploadReleaseAsset({
-                      owner, repo,
-                      release_id: release.data.id,
-                      name: file,
-                      data: await fs.readFile(`./macos/${file}`)
-                    });            
-                  }
+          name: dist folder
+          path: dist/**

.gitignore

@@ -3,4 +3,3 @@ out/
 dist
 ts-out/
 ts-out
-package-lock.json

README.md

@@ -1,6 +1,6 @@
 
 <div align="center">
-<img src="https://armcord.vercel.app/armcord_full_logo.png" width="520">
+<img src="https://armcord.vercel.app/armcord_full_logo.png" width="720">
  <br>ArmCord is a custom client designed to enhance your Discord experience while keeping everything lightweight. 
 </div>
 
@@ -35,22 +35,17 @@
  Check releases tab for precompiled packages for Linux, Windows and Mac OS. Alternatively use our Sourceforge mirror.  
  <a href="https://sourceforge.net/projects/armcord/files/latest/download"><img alt="Download ArmCord" src="https://a.fsdn.com/con/app/sf-download-button" width=276 height=48 srcset="https://a.fsdn.com/con/app/sf-download-button?button_size=2x 2x"></a>
 ### AUR Package
-ArmCord is also available on the Arch User Repository (AUR) [here](https://aur.archlinux.org/packages/armcord-bin/).
+Armcord is also available on the Arch User Repository (AUR) [here](https://aur.archlinux.org/packages/armcord-bin/).
 
 Install it via an AUR helper tool like `yay`.
 
 **Example:** `yay -S armcord-bin`
-### Snap package
-ArmCord is also available on the Snap store [here](https://snapcraft.io/armcord).   
-<a href="https://snapcraft.io/armcord">
-  <img alt="Get it from the Snap Store" src="https://snapcraft.io/static/images/badges/en/snap-store-black.svg" />
-</a>
+
 ### Manual:
  Alternatively you can run ArmCord from source (npm, nodejs required):    
  1. Clone ArmCord repo: `git clone https://github.com/ArmCord/ArmCord.git`    
  2. Run `npm install` to install dependencies   
- 3. Build with `npm run build`   
- 4. Compile/Package with `npm run package`    
+ 3. Compile/Package with `npm run package`    
 
 
 # FAQ
@@ -73,7 +68,6 @@ ArmCord is also available on the Snap store [here](https://snapcraft.io/armcord)
 [electron-discord-webapp](https://github.com/SpacingBat3/electron-discord-webapp)    
 [custom-electron-titlebar (css only)](https://github.com/AlexTorresSk/custom-electron-titlebar)    
 [electron-builder](https://electron.build)    
-[OpenAsar](https://github.com/GooseMod/OpenAsar)     
 # Sponsors
  [![JetBrains supports ArmCord with free licenses to their software to core developers](https://resources.jetbrains.com/storage/products/company/brand/logos/jb_beam.svg)](https://jb.gg/OpenSourceSupport)
 

package.json

@@ -4,7 +4,7 @@
   "description": "ArmCord is a custom client designed to enhance your Discord experience while keeping everything lightweight.",
   "main": "ts-out/main.js",
   "scripts": {
-    "build": "tsc && copyfiles -u 1 src/**/*.html src/**/**/*.css ts-out/ && copyfiles package.json ts-out/ && copyfiles assets/**/** ts-out/",
+    "build": "tsc && copyfiles -u 1 src/**/*.html src/**/**/*.css ts-out/ && copyfiles package.json ts-out/ && copyfiles assets/** ts-out/",
     "watch": "tsc -w",
     "start": "npm run build && electron ./ts-out/main.js",
     "package": "npm run build && electron-builder",
@@ -26,7 +26,7 @@
     "@types/node": "^17.0.33",
     "@types/ws": "^8.5.3",
     "copyfiles": "^2.4.1",
-    "electron": "^18.2.4",
+    "electron": "^18.2.3",
     "electron-builder": "^23.0.3",
     "husky": "^8.0.1",
     "prettier": "^2.5.1",

src/content/css/discord.css

@@ -1,43 +1,15 @@
+.info-3pQQBb:last-child:before {
+    content: "ArmCord Version: 3.1.0" !important;
+    height: auto;
+    line-height: 16px;
+    text-align: center;
+    color: var(--text-muted);
+    font-size: 12px;
+    text-transform: none;
+}
 .notice-2HEN-u {
     display: none;
 }
 .sidebar-1tnWFu {
-    border-top-left-radius: 8px;
-}
-.scroller-3X7KbA {
-    padding: 0;
-    padding-top: 4px;
-}
-
-[class^="socialLinks-"] + [class^="info-"] {
-    padding-right: 0;
-}
-#ac-ver {
-    text-transform: none;
-    cursor: pointer;
-    color: var(--text-muted);
-}
-#ac-ver:hover {
-    text-decoration: underline;
-    color: var(--text-normal);
-}
-
-/* Server List Scrollbar - https://github.com/kckarnige/server-scroll */
-.none-2-_0dP {
-    scrollbar-width: auto !important;
-    overflow-y: scroll !important;
-    overflow-x: hidden !important;
-    margin-right: 2px;
-}
-
-.none-2-_0dP:hover::-webkit-scrollbar {
-    width: 0.29em !important;
-    border-radius: 25px;
-    height: 0px !important;
-    background: transparent !important;
-}
-
-.none-2-_0dP::-webkit-scrollbar-thumb {
-    background: var(--background-accent);
-    border-radius: 25px;
+    border-top-left-radius: 8px !important;
 }

src/content/css/setup.css

@@ -4,10 +4,8 @@
 :root {
     --background-primary: #282b30;
     --background-secondary: rgba(255, 255, 255, 0.1);
-    --background-modifier-hover: rgba(106, 116, 128, 0.16);
     --brand-experiment: #7289da;
-    --interactive-normal: #b9bbbe;
-    --interactive-hover: #dcddde;
+    --header-primary: #fff;
     --text-muted: #72767d;
     --font-primary: "Whitney";
 }
@@ -22,11 +20,14 @@
 html,
 body {
     overflow: hidden;
+
     margin: 0;
     padding-top: 30px;
     width: 100%;
     height: 100%;
+
     background: var(--background-primary);
+
     display: flex;
     flex-direction: column;
     justify-content: center;
@@ -96,20 +97,21 @@ body {
     flex-direction: row;
     justify-content: center;
     align-items: center;
-    content: var(--logo-svg);
-    width: 292px;
 }
-
-.titlebar #window-controls-container #maximize {
-    display: none;
+#logo p:first-child {
+    color: #7289da;
+    margin: 0;
+    font-weight: normal;
+    font-family: Helvetica, sans-serif;
+    font-size: 32px;
 }
-
-.titlebar #window-controls-container #spacer {
-    float: left;
-    height: 100%;
-    width: 33%;
+#logo p:last-child {
+    color: white;
+    margin: 0;
+    font-weight: normal;
+    font-family: Discordinated;
+    font-size: 32px;
 }
-
 /* }}} */
 
 /* Buttons {{{ */
@@ -119,16 +121,19 @@ body {
     justify-content: center;
     align-items: center;
     gap: 1rem;
+
     user-select: all !important;
+
     margin-top: 10px;
     margin-bottom: 10px;
 }
 button {
     background: var(--brand-experiment);
     color: var(--header-primary);
-    outline: none;
+
     border: none;
     border-radius: 4px;
+
     padding: 8px 20px;
 }
 button:hover {

src/content/css/splash.css

@@ -112,7 +112,3 @@ video {
     color: var(--text-muted);
     white-space: pre;
 }
-
-img.logo {
-    width: 272px;
-}

src/content/css/tabs.css

@@ -1,3 +1,10 @@
+@import url("https://armcord.smartfridge.space/logofont.css");
+:root {
+    --window-buttons: var(--header-secondary);
+    --cord-color: var(--header-primary);
+    --armcord-color: #7289da;
+    --titlebar-color: var(--background-tertiary);
+}
 .tabs {
     display: block;
     top: 0;

src/content/css/titlebar.css

@@ -1,3 +1,10 @@
+@import url("https://armcord.smartfridge.space/logofont.css");
+:root {
+    --window-buttons: var(--header-secondary);
+    --cord-color: var(--header-primary);
+    --armcord-color: #7289da;
+    --titlebar-color: var(--background-tertiary);
+}
 .titlebar {
     display: block;
     top: 0;
@@ -11,6 +18,7 @@
     clear: both;
     height: 30px;
     line-height: 30px;
+    background-color: #202225;
     -webkit-app-region: drag;
     width: 100%;
     user-select: none;
@@ -18,10 +26,12 @@
     position: fixed;
     z-index: 99999;
 }
-
-.container-2RRFHK {
-    padding-top: 30px;
-    top: -30px;
+.titlebar #window-title {
+    width: 30%;
+    height: 100%;
+    line-height: 30px;
+    float: left;
+    padding: 0 0 0 1em;
 }
 
 .titlebar #window-controls-container {
@@ -29,6 +39,7 @@
     width: 150px;
     height: 100%;
     line-height: 30px;
+    background-color: #202225;
     -webkit-app-region: no-drag;
 }
 
@@ -37,115 +48,61 @@
 .titlebar #window-controls-container #quit {
     float: left;
     height: 100%;
-    width: 33.1%;
+    width: 33%;
     text-align: center;
-    color: var(--interactive-normal);
+    color: #f7f7f7;
     cursor: default;
 }
-.titlebar #window-controls-container #spacer {
-    pointer-events: none;
-}
 
-/* ArmCord on Linux */
-[armcord-platform="linux"] .titlebar #window-controls-container #minimize:hover {
+.titlebar #window-controls-container #minimize:hover {
     background-color: #99aab5;
 }
-[armcord-platform="linux"] .titlebar #window-controls-container #maximize:hover {
+.titlebar #window-controls-container #maximize:hover {
     background-color: #99aab5;
 }
-[armcord-platform="linux"] .titlebar #window-controls-container #quit:hover {
+.titlebar #window-controls-container #quit:hover {
     background-color: #f04747;
 }
-
-/* ArmCord on Windows */
-[armcord-platform="win32"] .titlebar #window-controls-container #minimize:hover {
-    background-color: var(--background-modifier-hover);
-    transition: 0.2s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #maximize:hover {
-    background-color: var(--background-modifier-hover);
-    transition: 0.2s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #minimize:hover #minimize-icon {
-    background-color: var(--interactive-hover);
-    transition: 0.2s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #maximize:hover #maximize-icon {
-    background-color: var(--interactive-hover);
-    transition: 0.2s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #quit:hover {
-    background-color: #e81123;
-    transition: 0.2s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #quit:hover #quit-icon {
-    background-color: #ffffff;
-    transition: 0.1s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #minimize {
-    background-color: transparent;
-    transition: 0.1s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #maximize {
-    background-color: transparent;
-    transition: 0.1s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #quit {
-    background-color: transparent;
-    transition: 0.1s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #quit:active {
-    background-color: #f1707a;
-    transition: 0.1s ease;
-}
-[armcord-platform="win32"] .titlebar #window-controls-container #quit:active #quit-icon {
-    background-color: #000000cc;
-    transition: 0.1s ease;
-}
-
-.titlebar #window-controls-container #quit-icon {
-    background-color: var(--interactive-normal);
-    display: list-item;
+.titlebar #window-controls-container #quit {
+    background-color: #f7f7f7;
     -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
     mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M6.279 5.5L11 10.221l-.779.779L5.5 6.279.779 11 0 10.221 4.721 5.5 0 .779.779 0 5.5 4.721 10.221 0 11 .779 6.279 5.5z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
 }
-.titlebar #window-controls-container #minimize-icon {
-    background-color: var(--interactive-normal);
-    display: list-item;
+.titlebar #window-controls-container #minimize {
+    background-color: #f7f7f7;
     -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 4.399V5.5H0V4.399h11z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
     mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 4.399V5.5H0V4.399h11z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
 }
-.titlebar #window-controls-container #maximize-icon {
-    background-color: var(--interactive-normal);
-    display: list-item;
+.titlebar #window-controls-container #maximize {
+    background-color: #f7f7f7;
     -webkit-mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 0v11H0V0h11zM9.899 1.101H1.1V9.9h8.8V1.1z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
     mask: url("data:image/svg+xml;charset=utf-8,%3Csvg width='11' height='11' viewBox='0 0 11 11' fill='none' xmlns='http://www.w3.org/2000/svg'%3E%3Cpath d='M11 0v11H0V0h11zM9.899 1.101H1.1V9.9h8.8V1.1z' fill='%23000'/%3E%3C/svg%3E")
         no-repeat 50% 50%;
 }
-
-[isMaximized] .titlebar #window-controls-container #maximize-icon {
-    background-color: var(--interactive-normal);
-    display: list-item;
-    -webkit-mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30' width='11' height='11'%3E%3Cstyle%3E%3C/style%3E%3Cpath fill-rule='evenodd' d='m6 0h24v24h-6v6h-24v-24h6zm3 6h15v15h3v-18h-18zm-6 21h18v-18h-18z'/%3E%3C/svg%3E")
-        no-repeat 50% 50%;
-    mask: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30' width='11' height='11'%3E%3Cstyle%3E%3C/style%3E%3Cpath fill-rule='evenodd' d='m6 0h24v24h-6v6h-24v-24h6zm3 6h15v15h3v-18h-18zm-6 21h18v-18h-18z'/%3E%3C/svg%3E")
-        no-repeat 50% 50%;
+.window-title:after {
+    content: "Cord";
+    color: var(--cord-color) !important;
+    font-weight: normal;
+    font-size: 14px;
+    font-family: Discordinated;
+}
+.window-title:before {
+    content: "ARM";
+    color: var(--armcord-color);
+    font-weight: normal;
+    font-size: 14px;
+    font-family: Helvetica, sans-serif;
 }
-
 .window-title {
-    content: var(--wordmark-svg);
-    height: 10px;
-    margin-left: initial;
-    transform: translate(9px, 9.5px);
-    float: left;
-    padding: 0;
+    font-size: 0px !important;
+    margin-left: initial !important;
+    transform: translate(10px, 0px);
 }
-
 .withFrame-haYltI {
     height: 30px !important;
 }

src/content/setup.html

@@ -15,7 +15,10 @@
                 <p>You appear to be offline. Please connect to the internet and restart ArmCord Setup.</p>
             </div>
             <div id="setup">
-                <div id="logo" class="hidden"></div>
+                <div id="logo" class="hidden">
+                    <p>ARM</p>
+                    <p>Cord</p>
+                </div>
                 <div id="page1" class="hidden">
                     <p>Select the type of setup you want to perform.</p>
                     <div id="buttons">
@@ -55,7 +58,7 @@
                             <option value="flicker">Flicker (Heavily WIP)</option>
                         </select>
                     </div>
-                    <p class="text-center">
+                    <p>
                         Why not all of them? Having many client mods at the same time can cause issues. If you really
                         want to do it though, check our documentation ;)
                     </p>
@@ -67,9 +70,6 @@
         </div>
 
         <script>
-            document.onload = function () {
-                ipcRenderer.send("win-unmaximize");
-            };
             // Accessors {{{
             let options = {};
 

src/main.ts

@@ -14,7 +14,7 @@ export var tabs: boolean;
 
 if (process.platform == "linux") {
     if (process.env.$XDG_SESSION_TYPE == "wayland") {
-        console.log("Wayland specific patches applied.");
+        console.log("Wayland specific patches applied.")
         app.commandLine.appendSwitch("ozone-platform=wayland");
         if (process.env.$XDG_CURRENT_DESKTOP == "GNOME") {
             app.commandLine.appendSwitch("enable-features=UseOzonePlatform,WaylandWindowDecorations");

src/preload/preload.ts

@@ -7,8 +7,6 @@ import {injectTitlebar} from "./titlebar";
 import {sleep, addStyle, injectJS} from "../utils";
 import {ipcRenderer} from "electron";
 import {injectTabs} from "./tabs";
-var version = ipcRenderer.sendSync("get-app-version", "app-version");
-
 declare global {
     interface Window {
         armcord: any;
@@ -50,39 +48,3 @@ if (window.location.href.indexOf("splash.html") > -1) {
         }
     });
 }
-/*
-MIT License
-
-Copyright (c) 2022 GooseNest
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
-*/
-// Settings info version injection
-setInterval(() => {
-    const host = document.getElementsByClassName("info-3pQQBb")[0];
-    if (!host || document.querySelector("#ac-ver")) return;
-    const el = document.createElement("span");
-    el.id = "ac-ver";
-    el.classList.add("text-xs-normal-3SiVjE", "line-18uChy");
-
-    el.textContent = `\nArmCord Version: ${version}`;
-    el.onclick = () => ipcRenderer.send("openSettingsWindow");
-
-    host.append(el);
-}, 2000);

src/preload/titlebar.ts

@@ -2,17 +2,15 @@ import {ipcRenderer} from "electron";
 import {addStyle} from "../utils";
 import * as fs from "fs";
 import * as path from "path";
-import {platform} from "node:process";
 export function injectTitlebar() {
     document.addEventListener("DOMContentLoaded", function (event) {
         var elem = document.createElement("div");
         elem.innerHTML = `<nav class="titlebar">
           <div class="window-title" id="window-title"></div>
           <div id="window-controls-container">
-              <div id="spacer"></div>
-              <div id="minimize"><div id="minimize-icon"></div></div>
-              <div id="maximize"><div id="maximize-icon"></div></div>
-              <div id="quit"><div id="quit-icon"></div></div>
+              <div id="minimize"></div>
+              <div id="maximize"></div>
+              <div id="quit"></div>
           </div>
         </nav>`;
         elem.classList.add("withFrame-haYltI");
@@ -21,11 +19,8 @@ export function injectTitlebar() {
         } else {
             document.getElementById("app-mount")!.prepend(elem);
         }
-        const titlebarcssPath = path.join(__dirname, "../", "/content/css/titlebar.css");
-        const wordmarkcssPath = path.join(__dirname, "../", "/content/css/logos.css");
-        addStyle(fs.readFileSync(titlebarcssPath, "utf8"));
-        addStyle(fs.readFileSync(wordmarkcssPath, "utf8"));
-        document.body.setAttribute("armcord-platform", platform);
+        const cssPath = path.join(__dirname, "../", "/content/css/titlebar.css");
+        addStyle(fs.readFileSync(cssPath, "utf8"));
 
         var minimize = document.getElementById("minimize");
         var maximize = document.getElementById("maximize");
@@ -38,10 +33,8 @@ export function injectTitlebar() {
         maximize!.addEventListener("click", () => {
             if (ipcRenderer.sendSync("win-isMaximized") == true) {
                 ipcRenderer.send("win-unmaximize");
-                document.body.removeAttribute("isMaximized");
             } else {
                 ipcRenderer.send("win-maximize");
-                document.body.setAttribute("isMaximized", "");
             }
         });
 

src/socket.ts

@@ -119,36 +119,37 @@ export default async function startServer() {
         ["Fosscord", new URL("https://dev.fosscord.com/app")]
     ] as const;
     
-    let wss = null,
-        wsPort = 6463;
-    for (const port of range(6463, 6472)) {
+    let wss = null, wsPort = 6463;
+    for(const port of range(6463, 6472)) {
         wss = await getServer(port);
-        if (wss !== null) {
-            void wsLog("ArmCord is listening at " + port.toString());
+        if(wss !== null) {
+            void wsLog("ArmCord is listening at " + (port.toString()));
             wsPort = port;
             break;
         }
     }
-    if (wss === null) return;
+    if(wss === null) return;
     let lock = false;
-    wss.on("connection", (wss, request) => {
-        const origin = request.headers.origin ?? "https://discord.com";
+    wss.on('connection', (wss, request) => {
+        const origin = request.headers.origin??'https://discord.com';
         let known = false;
-        for (const instance of knownInstancesList) {
-            if (instance[1].origin === origin) known = true;
+        for(const instance of knownInstancesList) {
+            if(instance[1].origin === origin)
+                known = true;
         }
-        if (!known) return;
+        if(!known) return;
         wss.send(JSON.stringify(messages.handShake));
-        wss.once("message", (data, isBinary) => {
-            if (lock) return;
+        wss.once('message', (data, isBinary) => {
+            if(lock) return;
             lock = true;
-            let parsedData: unknown = data;
-            if (!isBinary) parsedData = data.toString();
-            if (isJsonSyntaxCorrect(parsedData as string)) parsedData = JSON.parse(parsedData as string);
-            if (isInviteResponse(parsedData)) {
+            let parsedData:unknown = data;
+            if(!isBinary)
+                parsedData = data.toString();
+            if(isJsonSyntaxCorrect(parsedData as string))
+                parsedData = JSON.parse(parsedData as string);
+            if(isInviteResponse(parsedData)) {
                 // Replies to browser, so it finds the communication successful.
-                wss.send(
-                    JSON.stringify({
+                wss.send(JSON.stringify({
                     cmd: parsedData.cmd,
                     data: {
                         invite: null,
@@ -156,30 +157,26 @@ export default async function startServer() {
                     },
                     evt: null,
                     nonce: parsedData.nonce
-                    })
-                );
-                createInviteWindow();
+                }));
+                createInviteWindow()
                 const child = inviteWindow;
-                if (child === undefined) return;
-                void child.loadURL(origin + "/invite/" + parsedData.args.code);
+                if(child === undefined) return;
+                void child.loadURL(origin+'/invite/'+parsedData.args.code);
                 child.webContents.once("did-finish-load", () => {
                     child.show();
                 });
                 child.webContents.once("will-navigate", () => {
                     lock = false;
                     child.close();
-                });
+                })
                 child.on("close", (e) => {
                     lock = false;
-                });
+                })
                 // Blocks requests to ArmCord's WS, to prevent loops.
-                child.webContents.session.webRequest.onBeforeRequest(
-                    {
-                        urls: ["ws://127.0.0.1:" + wsPort.toString() + "/*"]
-                    },
-                    (_details, callback) => callback({cancel: true})
-                );
+                child.webContents.session.webRequest.onBeforeRequest({
+                    urls: ['ws://127.0.0.1:'+wsPort.toString()+'/*']
+                }, (_details,callback) => callback({cancel: true}));
             }
-        });
-    });
+        })
+    })
 }

src/tray.ts

@@ -1,11 +1,11 @@
-import {app, Menu, Tray} from "electron";
-import {mainWindow} from "./window";
-import {getConfig} from "./utils";
+import { app, Menu, Tray } from "electron";
+import { mainWindow } from "./window";
+import { getConfig } from "./utils";
 import * as path from "path";
-import {createSettingsWindow} from "./settings/main";
+import { createSettingsWindow } from "./settings/main";
 let tray: any = null;
 app.whenReady().then(async () => {
-    if ((await getConfig("windowStyle")) == "discord") {
+    if (await getConfig("windowStyle") == "discord") {
         tray = new Tray(path.join(__dirname, "../", "/assets/dsc-tray.png"));
         const contextMenu = Menu.buildFromTemplate([
             {
@@ -25,11 +25,10 @@ app.whenReady().then(async () => {
         tray.setToolTip("Discord");
         tray.setContextMenu(contextMenu);
     } else {
-        var trayIcon = (await getConfig("trayIcon")) ?? "ac_plug_colored";
-        tray = new Tray(path.join(__dirname, "../", `/assets/${trayIcon}.png`));
+        tray = new Tray(path.join(__dirname, "../", "/assets/ac_plug.png"));
         const contextMenu = Menu.buildFromTemplate([
             {
-                label: "ArmCord"
+                label: "ArmCord",
             },
             {
                 type: "separator"

src/utils.ts

@@ -139,7 +139,7 @@ export async function checkIfConfigExists() {
             contentPath = path.join(__dirname, "/ts-out/content/setup.html");
         }
     } else {
-        if ((await getConfig("doneSetup")) == false) {
+        if (await getConfig("doneSetup") == false) {
             console.log("First run of the ArmCord. Starting setup.");
             setup();
             isSetup = true;

src/window.ts

@@ -6,7 +6,7 @@ import {BrowserWindow, shell, app, ipcMain, dialog, clipboard} from "electron";
 import path from "path";
 import {checkIfConfigIsBroken, firstRun, getConfig, contentPath, isSetup} from "./utils";
 import {registerIpc} from "./ipc";
-import startServer from "./socket";
+import startServer from "./socket"
 import contextMenu from "electron-context-menu";
 import os from "os";
 export var icon: string;
@@ -23,7 +23,8 @@ contextMenu({
 async function doAfterDefiningTheWindow() {
     checkIfConfigIsBroken();
     registerIpc();
-    mainWindow.webContents.userAgent = `Mozilla/5.0 (X11; ${os.type()} ${os.arch()}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36`; //fake useragent for screenshare to work
+    mainWindow.webContents.userAgent =
+        `Mozilla/5.0 (X11; ${os.type()} ${os.arch()}) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/98.0.4758.102 Safari/537.36`; //fake useragent for screenshare to work
     mainWindow.webContents.setWindowOpenHandler(({url}) => {
         shell.openExternal(url);
         return {action: "deny"};
@@ -42,8 +43,8 @@ async function doAfterDefiningTheWindow() {
         }
     });
     console.log(contentPath);
-    if ((await getConfig("inviteWebsocket")) == true) {
-        startServer();
+    if (await getConfig("inviteWebsocket") == true) {
+        startServer()
     }
     
     try {
@@ -190,5 +191,5 @@ export function createInviteWindow() {
             spellcheck: true
         }
     });
-    inviteWindow.hide();
+    inviteWindow.hide()
 }