Skip to content

Commit

Permalink
Equibop
Browse files Browse the repository at this point in the history
  • Loading branch information
thororen1234 committed Jul 13, 2024
1 parent 5b72ecb commit 7e6be51
Show file tree
Hide file tree
Showing 31 changed files with 103 additions and 103 deletions.
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/blank.yml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ body:
value: |
# READ THIS BEFORE OPENING AN ISSUE
This form is only meant for Vesktop/Equitop developers. If you don't know what you're doing,
This form is only meant for Vesktop/Equibop developers. If you don't know what you're doing,
please use the bug report or feature request templates instead.
- type: textarea
Expand Down
10 changes: 5 additions & 5 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 🐛 Bug / Crash Report
description: Create a bug or crash report for Equitop
description: Create a bug or crash report for Equibop
labels: [bug]
title: "[Bug] <title>"

Expand All @@ -9,9 +9,9 @@ body:
value: |
**Thanks 🩷 for taking the time to fill out this bug report! Before proceeding, please read the following**
Make sure a similar issue doesn't already exist by [searching the existing issues](https://github.com/Equicord/Equitop/issues?q=is%3Aissue) for keywords!
Make sure a similar issue doesn't already exist by [searching the existing issues](https://github.com/Equicord/Equibop/issues?q=is%3Aissue) for keywords!
Make sure both Equitop and Equicord are fully up to date. You can update Equicord by right-clicking the Equitop tray icon and pressing "Update Equicord"
Make sure both Equibop and Equicord are fully up to date. You can update Equicord by right-clicking the Equibop tray icon and pressing "Update Equicord"
**DO NOT REPORT** any of the following issues:
- Purely graphical glitches like flickering, scaling issues, etc: Issue with your gpu. Nothing we can do, update drivers or disable hardware acceleration
Expand Down Expand Up @@ -95,11 +95,11 @@ body:
id: agreement-check
attributes:
label: Request Agreement
description: We only accept reports for bugs that happen on supported and up to date Equitop releases
description: We only accept reports for bugs that happen on supported and up to date Equibop releases
options:
- label: I have searched the existing issues and found no similar issue
required: true
- label: I am using the latest Equitop and Equicord versions
- label: I am using the latest Equibop and Equicord versions
required: true
- label: This issue occurs on an official release (not just the AUR packages)
required: true
2 changes: 1 addition & 1 deletion .github/ISSUE_TEMPLATE/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@ blank_issues_enabled: false
contact_links:
- name: Equicord Support Server
url: https://discord.gg/5Xh2W87egW
about: If you need help regarding Equitop or Equicord, please join our support server!
about: If you need help regarding Equibop or Equicord, please join our support server!
8 changes: 4 additions & 4 deletions .github/ISSUE_TEMPLATE/feature-request.yml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
name: 🛠️ Feature Request
description: Request a feature for Equitop
description: Request a feature for Equibop
labels: [enhancement]
title: "[Feature Request] <title>"

Expand All @@ -9,9 +9,9 @@ body:
value: |
**Thanks 🩷 for taking the time to fill out this request! Before proceeding, please read the following**
Make sure a similar request doesn't already exist by [searching the existing issues](https://github.com/Equicord/Equitop/issues?q=is%3Aissue) for keywords!
Make sure a similar request doesn't already exist by [searching the existing issues](https://github.com/Equicord/Equibop/issues?q=is%3Aissue) for keywords!
This form is only meant for **Equitop feature requests**.
This form is only meant for **Equibop feature requests**.
For plugin requests or Vencord feature requests, suggest them on the discord instead: https://discord.gg/5Xh2W87egW
- type: input
Expand Down Expand Up @@ -62,7 +62,7 @@ body:
id: agreement-check
attributes:
label: Request Agreement
description: This form is only for Equitop feature requests. If the following don't apply, re-read the introduction text
description: This form is only for Equibop feature requests. If the following don't apply, re-read the introduction text
options:
- label: I have searched the existing issues and found no similar issue
required: true
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/meta.yml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
git config user.name "github-actions[bot]"
git config user.email "github-actions[bot]@users.noreply.github.com"
git checkout -b ci/meta-update
git add meta/com.thororen.equitop.metainfo.xml
git add meta/com.thororen.equibop.metainfo.xml
git commit -m "Insert release changes for ${{ github.event.release.tag_name }}"
git push origin ci/meta-update --force
gh pr create -B main -H ci/meta-update -t "Metainfo for ${{ github.event.release.tag_name }}" -b "This PR updates the metainfo for release ${{ github.event.release.tag_name }}. @thororen1234"
Expand Down
2 changes: 1 addition & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@
"[jsonc]": {
"editor.defaultFormatter": "esbenp.prettier-vscode"
},
"cSpell.words": ["Vesktop", "Equitop"]
"cSpell.words": ["Vesktop", "Equibop"]
}
36 changes: 18 additions & 18 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
# Equitop [<img src="https://avatars.githubusercontent.com/u/150590884" width="225" align="right" alt="Equitop">](https://github.com/Equicord/Equitop)
# Equibop [<img src="https://avatars.githubusercontent.com/u/150590884" width="225" align="right" alt="Equibop">](https://github.com/Equicord/Equibop)

[![Equicord](https://img.shields.io/badge/Equicord-green?style=flat)](https://github.com/Equicord/Equitop)
[![Tests](https://github.com/Equicord/Equitop/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/Equicord/Equitop/actions/workflows/test.yml)
[![Equicord](https://img.shields.io/badge/Equicord-green?style=flat)](https://github.com/Equicord/Equibop)
[![Tests](https://github.com/Equicord/Equibop/actions/workflows/test.yml/badge.svg?branch=main)](https://github.com/Equicord/Equibop/actions/workflows/test.yml)
[![Discord](https://img.shields.io/discord/1207691698386501634.svg?color=768AD4&label=Discord&logo=discord&logoColor=white)](https://discord.gg/5Xh2W87egW)

Equitop is a fork of [Vesktop](https://github.com/Vencord/Vesktop).
Equibop is a fork of [Vesktop](https://github.com/Vencord/Vesktop).

You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, changes, chat or even support.<br></br>

Expand All @@ -28,31 +28,31 @@ You can join our [discord server](https://discord.gg/5Xh2W87egW) for commits, ch

If you don't know the difference, pick the Installer.

- [Installer](https://github.com/Equicord/Equitop/releases/latest/download/Equitop-Setup-2.0.0.exe)
- [Installer](https://github.com/Equicord/Equibop/releases/latest/download/Equibop-Setup-2.0.0.exe)
- Portable
- [x64 / amd64](<(https://github.com/Equicord/Equitop/releases/latest/download/Equitop-2.0.0-win.zip)>)
- [arm64](https://github.com/Equicord/Equitop/releases/download/v2.0.0/Equitop-2.0.0-arm64-win.zip)
- [x64 / amd64](<(https://github.com/Equicord/Equibop/releases/latest/download/Equibop-2.0.0-win.zip)>)
- [arm64](https://github.com/Equicord/Equibop/releases/download/v2.0.0/Equibop-2.0.0-arm64-win.zip)

### Mac

If you don't know the difference, pick the Intel build.

- [Equitop.dmg](https://github.com/Equicord/Equitop/releases/download/v2.0.0/Equitop-2.0.0-universal.dmg)
- [Equibop.dmg](https://github.com/Equicord/Equibop/releases/download/v2.0.0/Equibop-2.0.0-universal.dmg)

### Linux

If you don't know the difference, pick amd64.

- amd64 / x86_64
- [AppImage](https://github.com/Equicord/Equitop/releases/latest/download/Equitop-2.0.0.AppImage)
- [Ubuntu/Debian (.deb)](https://github.com/Equicord/Equitop/releases/latest/download/equitop_2.0.0_amd64.deb)
- [Fedora/RHEL (.rpm)](https://github.com/Equicord/Equitop/releases/latest/download/equitop-2.0.0.x86_64.rpm)
- [tarball](https://github.com/Equicord/Equitop/releases/latest/download/equitop-2.0.0.tar.gz)
- [AppImage](https://github.com/Equicord/Equibop/releases/latest/download/Equibop-2.0.0.AppImage)
- [Ubuntu/Debian (.deb)](https://github.com/Equicord/Equibop/releases/latest/download/equibop_2.0.0_amd64.deb)
- [Fedora/RHEL (.rpm)](https://github.com/Equicord/Equibop/releases/latest/download/equibop-2.0.0.x86_64.rpm)
- [tarball](https://github.com/Equicord/Equibop/releases/latest/download/equibop-2.0.0.tar.gz)
- arm64 / aarch64
- [AppImage](https://github.com/Equicord/Equitop/releases/latest/download/Equitop-2.0.0-arm64.AppImage)
- [Ubuntu/Debian (.deb)](https://github.com/Equicord/Equitop/releases/latest/download/equitop_2.0.0_arm64.deb)
- [Fedora/RHEL (.rpm)](https://github.com/Equicord/Equitop/releases/latest/download/equitop-2.0.0.aarch64.rpm)
- [tarball](https://github.com/Equicord/Equitop/releases/latest/download/equitop-2.0.0-arm64.tar.gz)
- [AppImage](https://github.com/Equicord/Equibop/releases/latest/download/Equibop-2.0.0-arm64.AppImage)
- [Ubuntu/Debian (.deb)](https://github.com/Equicord/Equibop/releases/latest/download/equibop_2.0.0_arm64.deb)
- [Fedora/RHEL (.rpm)](https://github.com/Equicord/Equibop/releases/latest/download/equibop-2.0.0.aarch64.rpm)
- [tarball](https://github.com/Equicord/Equibop/releases/latest/download/equibop-2.0.0-arm64.tar.gz)

## Building from Source

Expand All @@ -62,8 +62,8 @@ Packaging will create builds in the dist/ folder
> On Windows, if you run the test script, you will get test errors about venmic, you can ignore these as it's a linux only module.
```sh
git clone https://github.com/Equicord/Equitop
cd Equitop
git clone https://github.com/Equicord/Equibop
cd Equibop

# Install Dependencies
pnpm i
Expand Down
8 changes: 4 additions & 4 deletions build/installer.nsh
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
!macro preInit
SetRegView 64
WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\equitop"
WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\equitop"
WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\equibop"
WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\equibop"
SetRegView 32
WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\equitop"
WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\equitop"
WriteRegExpandStr HKLM "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\equibop"
WriteRegExpandStr HKCU "${INSTALL_REGISTRY_KEY}" InstallLocation "$LocalAppData\equibop"
!macroend
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<component type="desktop-application">
<!--Created with jdAppStreamEdit 7.1-->
<id>com.thororen.equitop</id>
<name>Equitop</name>
<id>com.thororen.equibop</id>
<name>Equibop</name>
<summary>Snappier Discord app with Equicord</summary>
<developer_name>Equicord Contributors</developer_name>
<launchable type="desktop-id">com.thororen.equitop.desktop</launchable>
<launchable type="desktop-id">com.thororen.equibop.desktop</launchable>
<metadata_license>CC0-1.0</metadata_license>
<project_license>GPL-3.0</project_license>
<project_group>Equicord</project_group>
Expand Down Expand Up @@ -129,11 +129,11 @@
<url>https://github.com/Vencord/Vesktop/releases/tag/v0.1.0</url>
</release>
</releases>
<url type="homepage">https://github.com/Equicord/Equitop</url>
<url type="bugtracker">https://github.com/Equicord/Equitop/issues</url>
<url type="help">https://github.com/Equicord/Equitop/issues</url>
<url type="homepage">https://github.com/Equicord/Equibop</url>
<url type="bugtracker">https://github.com/Equicord/Equibop/issues</url>
<url type="help">https://github.com/Equicord/Equibop/issues</url>
<url type="donation">https://github.com/sponsors/Vendicated</url>
<url type="vcs-browser">https://github.com/Equicord/Equitop</url>
<url type="vcs-browser">https://github.com/Equicord/Equibop</url>
<categories>
<category>InstantMessaging</category>
<category>Network</category>
Expand All @@ -157,7 +157,7 @@
</content_rating>
<keywords>
<keyword>Discord</keyword>
<keyword>Equitop</keyword>
<keyword>Equibop</keyword>
<keyword>Equicord</keyword>
<keyword>Vencord</keyword>
<keyword>Vesktop</keyword>
Expand Down
12 changes: 6 additions & 6 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
{
"name": "equitop",
"name": "equibop",
"version": "2.0.0",
"private": true,
"description": "A fork of Vesktop pre-packaged with Equicord",
"keywords": [],
"homepage": "https://github.com/Equicord/Equitop",
"homepage": "https://github.com/Equicord/Equibop",
"license": "GPL-3.0",
"author": "Equicord",
"main": "dist/js/main.js",
Expand Down Expand Up @@ -62,8 +62,8 @@
"pnpm": ">=8"
},
"build": {
"appId": "com.thororen.equitop",
"productName": "Equitop",
"appId": "com.thororen.equibop",
"productName": "Equibop",
"files": [
"!*",
"!node_modules",
Expand Down Expand Up @@ -108,11 +108,11 @@
}
],
"desktop": {
"Name": "Equitop",
"Name": "Equibop",
"GenericName": "Internet Messenger",
"Type": "Application",
"Categories": "Network;InstantMessaging;Chat;",
"Keywords": "discord;equitop;vesktop;vencord;equicord;electron;chat;"
"Keywords": "discord;equibop;vesktop;vencord;equicord;electron;chat;"
}
},
"mac": {
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/build.mts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ await Promise.all([
}),
createContext({
...CommonOpts,
globalName: "Equitop",
globalName: "Equibop",
entryPoints: ["src/renderer/index.ts"],
outfile: "dist/js/renderer.js",
format: "iife",
Expand Down
2 changes: 1 addition & 1 deletion scripts/build/sandboxFix.js
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ SCRIPT_DIR="$( cd "$( dirname "\${BASH_SOURCE[0]}" )" && pwd )"
IS_STEAMOS=0
if [[ "$SteamOS" == "1" && "$SteamGamepadUI" == "1" ]]; then
echo "Running Equitop on SteamOS, disabling sandbox"
echo "Running Equibop on SteamOS, disabling sandbox"
IS_STEAMOS=1
fi
Expand Down
6 changes: 3 additions & 3 deletions scripts/utils/updateMeta.mts
Original file line number Diff line number Diff line change
Expand Up @@ -43,14 +43,14 @@ function generateDescription(description: string, descriptionNode: Element) {
}
}

const latestReleaseInformation = await fetch("https://api.github.com/repos/Equicord/Equitop/releases/latest", {
const latestReleaseInformation = await fetch("https://api.github.com/repos/Equicord/Equibop/releases/latest", {
headers: {
Accept: "application/vnd.github+json",
"X-Github-Api-Version": "2022-11-28"
}
}).then(res => res.json());

const metaInfo = await fs.readFile("./meta/com.thororen.equitop.metainfo.xml", "utf-8");
const metaInfo = await fs.readFile("./meta/com.thororen.equibop.metainfo.xml", "utf-8");

const parser = new DOMParser().parseFromString(metaInfo, "text/xml");

Expand Down Expand Up @@ -90,4 +90,4 @@ const output = xmlFormat(new XMLSerializer().serializeToString(parser), {
indentation: " "
});

await fs.writeFile("./meta/com.thororen.equitop.metainfo.xml", output, "utf-8");
await fs.writeFile("./meta/com.thororen.equibop.metainfo.xml", output, "utf-8");
2 changes: 1 addition & 1 deletion src/main/arrpc.ts
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ export async function initArRPC() {
mainWin.webContents
// Safety: Result of JSON.stringify should always be safe to equal
// Also, just to be super super safe, invite is regex validated above
.executeJavaScript(`Equitop.openInviteModal(${JSON.stringify(invite)})`)
.executeJavaScript(`Equibop.openInviteModal(${JSON.stringify(invite)})`)
.then(callback);
});
} catch (e) {
Expand Down
6 changes: 3 additions & 3 deletions src/main/autoStart.ts
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ interface AutoStart {
function makeAutoStartLinux(): AutoStart {
const configDir = process.env.XDG_CONFIG_HOME || join(process.env.HOME!, ".config");
const dir = join(configDir, "autostart");
const file = join(dir, "equitop.desktop");
const file = join(dir, "equibop.desktop");

// IM STUPID
const legacyName = join(dir, "equicord.desktop");
Expand All @@ -34,8 +34,8 @@ function makeAutoStartLinux(): AutoStart {
const desktopFile = `
[Desktop Entry]
Type=Application
Name=Equitop
Comment=Equitop autostart script
Name=Equibop
Comment=Equibop autostart script
Exec=${commandLine}
StartupNotify=false
Terminal=false
Expand Down
8 changes: 4 additions & 4 deletions src/main/constants.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,16 +8,16 @@ import { app } from "electron";
import { existsSync, mkdirSync, readdirSync, renameSync, rmdirSync } from "fs";
import { dirname, join } from "path";

const equitopDir = dirname(process.execPath);
const equibopDir = dirname(process.execPath);

export const PORTABLE =
process.platform === "win32" &&
!process.execPath.toLowerCase().endsWith("electron.exe") &&
!existsSync(join(equitopDir, "Uninstall Equitop.exe"));
!existsSync(join(equibopDir, "Uninstall Equibop.exe"));

const LEGACY_DATA_DIR = join(app.getPath("appData"), "EquicordDesktop", "EquicordDesktop");
export const DATA_DIR =
process.env.EQUICORD_USER_DATA_DIR || (PORTABLE ? join(equitopDir, "Data") : join(app.getPath("userData")));
process.env.EQUICORD_USER_DATA_DIR || (PORTABLE ? join(equibopDir, "Data") : join(app.getPath("userData")));

mkdirSync(DATA_DIR, { recursive: true });

Expand Down Expand Up @@ -51,7 +51,7 @@ export const VENCORD_FILES_DIR =
(require("./settings") as typeof import("./settings")).State.store.vencordDir ||
join(SESSION_DATA_DIR, "equicordFiles");

export const USER_AGENT = `Equitop/${app.getVersion()} (https://github.com/Equicord/Equitop)`;
export const USER_AGENT = `Equibop/${app.getVersion()} (https://github.com/Equicord/Equibop)`;

// dimensions shamelessly stolen from Discord Desktop :3
export const MIN_WIDTH = 940;
Expand Down
6 changes: 3 additions & 3 deletions src/main/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ function init() {
});

app.whenReady().then(async () => {
if (process.platform === "win32") app.setAppUserModelId("com.thororen.equitop");
if (process.platform === "win32") app.setAppUserModelId("com.thororen.equibop");

registerScreenShareHandler();
registerMediaPermissionsHandler();
Expand All @@ -94,10 +94,10 @@ function init() {

if (!app.requestSingleInstanceLock({ IS_DEV })) {
if (IS_DEV) {
console.log("Equitop is already running. Quitting previous instance...");
console.log("Equibop is already running. Quitting previous instance...");
init();
} else {
console.log("Equitop is already running. Quitting...");
console.log("Equibop is already running. Quitting...");
app.quit();
}
} else {
Expand Down
Loading

0 comments on commit 7e6be51

Please sign in to comment.