Merge branch 'Vencord:main' into main

.github/workflows/meta.yml

@@ -39,4 +39,4 @@ jobs:
                   git commit -m "metainfo: add entry for ${{ github.event.release.tag_name }}"
                   git push origin HEAD:main
               env:
-                  GITHUB_TOKEN: ${{ secrets.PERSONAL_TOKEN }}
+                  GH_TOKEN: ${{ secrets.ACCESS_TOKEN }}

package.json

@@ -1,6 +1,6 @@
 {
     "name": "not-nextop",
-    "version": "1.5.8",
+    "version": "1.6.0",
     "private": true,
     "description": "Not-Nextop is a custom Discord desktop app",
     "keywords": [],
@@ -34,27 +34,27 @@
     },
     "devDependencies": {
         "@fal-works/esbuild-plugin-global-externals": "^2.1.2",
-        "@stylistic/eslint-plugin": "^5.1.0",
-        "@types/node": "^24.0.10",
+        "@stylistic/eslint-plugin": "^5.3.1",
+        "@types/node": "^24.3.1",
         "@types/react": "18.3.1",
         "@vencord/types": "^1.11.5",
-        "dotenv": "^16.5.0",
-        "electron": "^37.2.0",
+        "dotenv": "^17.2.2",
+        "electron": "^38.0.0",
         "electron-builder": "^26.0.12",
-        "esbuild": "^0.25.5",
-        "eslint": "^9.30.1",
+        "esbuild": "^0.25.9",
+        "eslint": "^9.34.0",
         "eslint-import-resolver-alias": "^1.1.2",
         "eslint-plugin-path-alias": "^2.1.0",
-        "eslint-plugin-prettier": "^5.5.1",
+        "eslint-plugin-prettier": "^5.5.4",
         "eslint-plugin-simple-header": "^1.2.2",
         "eslint-plugin-simple-import-sort": "^12.1.1",
-        "eslint-plugin-unused-imports": "^4.1.4",
+        "eslint-plugin-unused-imports": "^4.2.0",
         "prettier": "^3.6.2",
         "source-map-support": "^0.5.21",
-        "tsx": "^4.20.3",
+        "tsx": "^4.20.5",
         "type-fest": "^4.41.0",
-        "typescript": "^5.8.3",
-        "typescript-eslint": "^8.35.1",
+        "typescript": "^5.9.2",
+        "typescript-eslint": "^8.42.0",
         "xml-formatter": "^3.6.6"
     },
     "packageManager": "pnpm@10.7.1",

src/main/autoStart.ts

@@ -40,6 +40,7 @@ function makeAutoStartLinux(): AutoStart {
                 Exec=${commandLine}
                 StartupNotify=false
                 Terminal=false
+                Icon=vesktop
             `;
 
             mkdirSync(dir, { recursive: true });

src/main/constants.ts

@@ -34,7 +34,7 @@ export const VENCORD_FILES_DIR =
     (require("./settings") as typeof import("./settings")).State.store.vencordDir ||
     join(SESSION_DATA_DIR, "vencordFiles");
 
-export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Vencord/Vesktop)`;
+export const USER_AGENT = `Vesktop/${app.getVersion()} (https://github.com/Not-Nexulien/Not-Nextop)`;
 
 // dimensions shamelessly stolen from Discord Desktop :3
 export const MIN_WIDTH = 940;

src/main/index.ts

@@ -126,10 +126,10 @@ function init() {
 
 if (!app.requestSingleInstanceLock({ IS_DEV })) {
     if (IS_DEV) {
-        console.log("Vesktop is already running. Quitting previous instance...");
+        console.log("Not-Nextop is already running. Quitting previous instance...");
         init();
     } else {
-        console.log("Vesktop is already running. Quitting...");
+        console.log("Not-Nextop is already running. Quitting...");
         app.quit();
     }
 } else {

src/main/mainWindow.ts

@@ -94,7 +94,7 @@ function initTray(win: BrowserWindow) {
             click: createAboutWindow
         },
         {
-            label: "Repair Vencord",
+            label: "Repair Not-Nexulien",
             async click() {
                 await downloadVencordFiles();
                 app.relaunch();
@@ -102,7 +102,7 @@ function initTray(win: BrowserWindow) {
             }
         },
         {
-            label: "Reset Vesktop",
+            label: "Reset Not-Nextop",
             async click() {
                 await clearData(win);
             }
@@ -127,15 +127,15 @@ function initTray(win: BrowserWindow) {
     ]);
 
     tray = new Tray(ICON_PATH);
-    tray.setToolTip("Vesktop");
+    tray.setToolTip("Not-Nextop");
     tray.setContextMenu(trayMenu);
     tray.on("click", onTrayClick);
 }
 
 async function clearData(win: BrowserWindow) {
     const { response } = await dialog.showMessageBox(win, {
-        message: "Are you sure you want to reset Vesktop?",
-        detail: "This will log you out, clear caches and reset all your settings!\n\nVesktop will automatically restart after this operation.",
+        message: "Are you sure you want to reset Not-Nextop?",
+        detail: "This will log you out, clear caches and reset all your settings!\n\nNot-Nextop will automatically restart after this operation.",
         buttons: ["Yes", "No"],
         cancelId: MessageBoxChoice.Cancel,
         defaultId: MessageBoxChoice.Default,
@@ -164,24 +164,24 @@ function initMenuBar(win: BrowserWindow) {
 
     const subMenu = [
         {
-            label: "About Vesktop",
+            label: "About Not-Nextop",
             click: createAboutWindow
         },
         {
-            label: "Force Update Vencord",
+            label: "Force Update Not-Nexulien",
             async click() {
                 await downloadVencordFiles();
                 app.relaunch();
                 app.quit();
             },
-            toolTip: "Vesktop will automatically restart after this operation"
+            toolTip: "Not-Nextop will automatically restart after this operation"
         },
         {
-            label: "Reset Vesktop",
+            label: "Reset Not-Nextop",
             async click() {
                 await clearData(win);
             },
-            toolTip: "Vesktop will automatically restart after this operation"
+            toolTip: "Not-Nextop will automatically restart after this operation"
         },
         {
             label: "Relaunch",
@@ -248,7 +248,7 @@ function initMenuBar(win: BrowserWindow) {
 
     const menuItems = [
         {
-            label: "Vesktop",
+            label: "Not-Nextop",
             role: "appMenu",
             submenu: subMenu.filter(isTruthy)
         },

src/main/settings.ts

@@ -34,6 +34,6 @@ function loadSettings<T extends object = any>(file: string, name: string) {
     return store;
 }
 
-export const Settings = loadSettings<TSettings>(SETTINGS_FILE, "Vesktop settings");
-export const VencordSettings = loadSettings<any>(VENCORD_SETTINGS_FILE, "Vencord settings");
-export const State = loadSettings<TState>(STATE_FILE, "Vesktop state");
+export const Settings = loadSettings<TSettings>(SETTINGS_FILE, "Not-Nextop settings");
+export const VencordSettings = loadSettings<any>(VENCORD_SETTINGS_FILE, "Not-Nextop settings");
+export const State = loadSettings<TState>(STATE_FILE, "Not-Nextop state");

src/main/utils/vencordLoader.ts

@@ -44,7 +44,7 @@ export async function githubGet(endpoint: string) {
 }
 
 export async function downloadVencordFiles() {
-    const release = await githubGet("/repos/not-nexulien/Not-Nexulien/releases/latest");
+    const release = await githubGet("/repos/Not-Nexulien/Not-Nexulien/releases/latest");
 
     const { assets }: ReleaseData = await release.json();
 

src/renderer/components/settings/Settings.tsx

@@ -179,15 +179,10 @@ export default ErrorBoundary.wrap(
     function SettingsUI() {
         return (
             <Forms.FormSection>
-<<<<<<< HEAD
-                <Text variant="heading-lg/semibold" style={{ color: "var(--header-primary)" }} tag="h2">
-                    Not-Nextop Settings
-=======
                 {/* FIXME: Outdated type */}
                 {/* @ts-expect-error Outdated type */}
                 <Text variant="heading-xl/semibold" color="header-primary" className="vcd-settings-title">
-                    Vesktop Settings
->>>>>>> 27293d4ae9db3a395325f7993cf3cc74a21e0122
+                    Not-Nextop Settings
                 </Text>
                 <SettingsSections />
             </Forms.FormSection>

static/views/about.html

@@ -1,5 +1,5 @@
 <head>
-    <title>About Vesktop</title>
+    <title>About Not-Nextop</title>
 
     <link rel="stylesheet" href="./style.css" type="text/css" />
 
@@ -21,23 +21,17 @@
 </head>
 
 <body>
-    <h1 id="title">Vesktop v{{APP_VERSION}}</h1>
-    <p>Vesktop is a cross platform Discord Desktop client, aiming to give you a better Discord experience</p>
+    <h1 id="title">Not-Nextop v{{APP_VERSION}}</h1>
+    <p>Not-Nextop is a cross platform Discord Desktop client, aiming to give you a better Discord experience</p>
 
     <section>
         <h2>Links</h2>
         <ul>
             <li>
-                <a href="https://vesktop.vencord.dev/wiki" target="_blank">Vesktop Wiki</a>
+                <a href="https://github.com/Not-Nexulien/Not-Nextop" target="_blank">Source Code</a>
             </li>
             <li>
-                <a href="https://vencord.dev" target="_blank">Vencord Website</a>
-            </li>
-            <li>
-                <a href="https://github.com/Vencord/Vesktop" target="_blank">Source Code</a>
-            </li>
-            <li>
-                <a href="https://github.com/Vencord/Vesktop/issues" target="_blank">Report bugs / Request features</a>
+                <a href="https://github.com/Not-Nexulien/Not-Nextop/issues" target="_blank">Report bugs / Request features</a>
             </li>
         </ul>
     </section>
@@ -45,7 +39,7 @@
     <section>
         <h2>License</h2>
         <p>
-            Vesktop is licensed under the
+            Not-Nextop is licensed under the
             <a href="https://www.gnu.org/licenses/gpl-3.0.txt" target="_blank">GNU General Public License v3.0</a>.
             <br />
             This is free software, and you are welcome to redistribute it under certain conditions; see the license for
@@ -55,7 +49,7 @@
 
     <section>
         <h2>Acknowledgements</h2>
-        <p>These awesome libraries empower Vesktop</p>
+        <p>These awesome libraries empower Not-Nextop</p>
         <ul>
             <li>
                 <a href="https://github.com/electron/electron" target="_blank">Electron</a>
@@ -76,11 +70,12 @@
             </li>
             <li>
                 And many
-                <a href="https://github.com/Vencord/Vesktop/blob/main/pnpm-lock.yaml" target="_blank"
+                <a href="https://github.com/Not-Nexulien/Not-Nextop/blob/main/pnpm-lock.yaml" target="_blank"
                     >more open source libraries</a
                 >
             </li>
         </ul>
+        <p>And thanks <a href="https://github.com/Vencord/Vesktop" target="_blank">Vesktop</a> for the original project.</p>
     </section>
 </body>