Skip to content

Commit

Permalink
Merge branch 'main' into threaded-arrpc
Browse files Browse the repository at this point in the history
  • Loading branch information
pendo324 committed Feb 6, 2025
2 parents 744d7ed + d75ab4a commit 51a9f02
Show file tree
Hide file tree
Showing 33 changed files with 930 additions and 520 deletions.
6 changes: 2 additions & 4 deletions .github/ISSUE_TEMPLATE/bug_report.yml
Original file line number Diff line number Diff line change
Expand Up @@ -112,10 +112,8 @@ body:
attributes:
label: Debug Logs
description: Run vesktop from the command line. Include the relevant command line output here. If there are any lines that seem relevant, try googling them or searching existing issues
value: |
```
Replace this text with your crash-log. Do not remove the backticks
```
placeholder: Paste your crash-log here.
render: shell
validations:
required: true

Expand Down
15 changes: 15 additions & 0 deletions meta/dev.vencord.Vesktop.metainfo.xml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,21 @@
</screenshot>
</screenshots>
<releases>
<release version="1.5.5" date="2025-02-06" type="stable">
<url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.5</url>
<description>
<p>What's Changed</p>
<ul>
<li>Now remembers your previous Screenshare resolution &amp; FPS</li>
<li>You can now disable the splash screen in Vesktop Settings</li>
<li>Now supports deep links (opening Discord Message Links in Vesktop) by @Covkie</li>
<li>Now supports discord:// uri scheme, allowing it to open things like invites from your Browser even while closed by @Covkie</li>
<li>Added 4k resolution to screenshare by @makindotcc</li>
<li>Fixed some performance issues caused by a recent Discord update</li>
<li>Updated Electron to v34 &amp; chromium to v132, bringing new features and fixes</li>
</ul>
</description>
</release>
<release version="1.5.4" date="2024-12-05" type="stable">
<url>https://github.com/Vencord/Vesktop/releases/tag/v1.5.4</url>
<description>
Expand Down
27 changes: 17 additions & 10 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "vesktop",
"version": "1.5.4",
"version": "1.5.5",
"private": true,
"description": "Vesktop is a custom Discord desktop app",
"keywords": [],
Expand Down Expand Up @@ -34,28 +34,28 @@
},
"devDependencies": {
"@fal-works/esbuild-plugin-global-externals": "^2.1.2",
"@stylistic/eslint-plugin": "^2.13.0",
"@types/node": "^22.10.7",
"@types/react": "^18.3.12",
"@stylistic/eslint-plugin": "^3.0.1",
"@types/node": "^22.13.1",
"@types/react": "18.3.12",
"@vencord/types": "^1.8.4",
"dotenv": "^16.4.7",
"electron": "^34.0.1",
"electron": "^34.1.0",
"electron-builder": "^25.1.8",
"esbuild": "^0.24.2",
"eslint": "^9.18.0",
"eslint": "^9.19.0",
"eslint-import-resolver-alias": "^1.1.2",
"eslint-plugin-path-alias": "^2.1.0",
"eslint-plugin-prettier": "^5.2.3",
"eslint-plugin-simple-header": "^1.2.1",
"eslint-plugin-simple-header": "^1.2.2",
"eslint-plugin-simple-import-sort": "^12.1.1",
"eslint-plugin-unused-imports": "^4.1.4",
"prettier": "^3.4.2",
"source-map-support": "^0.5.21",
"tsx": "^4.19.2",
"type-fest": "^4.33.0",
"typescript": "^5.7.3",
"typescript-eslint": "^8.21.0",
"xml-formatter": "^3.6.3"
"typescript-eslint": "^8.23.0",
"xml-formatter": "^3.6.4"
},
"packageManager": "[email protected]",
"engines": {
Expand All @@ -73,6 +73,12 @@
"package.json",
"LICENSE"
],
"protocols": {
"name": "Discord",
"schemes": [
"discord"
]
},
"beforePack": "scripts/build/sandboxFix.js",
"linux": {
"icon": "build/icon.icns",
Expand Down Expand Up @@ -113,7 +119,8 @@
"GenericName": "Internet Messenger",
"Type": "Application",
"Categories": "Network;InstantMessaging;Chat;",
"Keywords": "discord;vencord;electron;chat;"
"Keywords": "discord;vencord;electron;chat;",
"MimeType": "x-scheme-handler/discord"
}
},
"mac": {
Expand Down
17 changes: 15 additions & 2 deletions patches/[email protected]
Original file line number Diff line number Diff line change
@@ -1,14 +1,27 @@
diff --git a/src/process/index.js b/src/process/index.js
index 97ea6514b54dd9c5df588c78f0397d31ab5f882a..c2bdbd6aaa5611bc6ff1d993beeb380b1f5ec575 100644
index 389b0845256a34b4536d6da99edb00d17f13a6b4..f17a0ac687e9110ebfd33cb91fd2f6250d318643 100644
--- a/src/process/index.js
+++ b/src/process/index.js
@@ -5,8 +5,7 @@ import fs from 'node:fs';
@@ -5,8 +5,20 @@ import fs from 'node:fs';
import { dirname, join } from 'path';
import { fileURLToPath } from 'url';

-const __dirname = dirname(fileURLToPath(import.meta.url));
-const DetectableDB = JSON.parse(fs.readFileSync(join(__dirname, 'detectable.json'), 'utf8'));
+const DetectableDB = require('./detectable.json');
+DetectableDB.push(
+ {
+ aliases: ["Obs"],
+ executables: [
+ { is_launcher: false, name: "obs", os: "linux" },
+ { is_launcher: false, name: "obs.exe", os: "win32" },
+ { is_launcher: false, name: "obs.app", os: "darwin" }
+ ],
+ hook: true,
+ id: "STREAMERMODE",
+ name: "OBS"
+ }
+);

import * as Natives from './native/index.js';
const Native = Natives[process.platform];
Loading

0 comments on commit 51a9f02

Please sign in to comment.