forked from Vencord/Vesktop
-
Notifications
You must be signed in to change notification settings - Fork 9
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main'
- Loading branch information
Showing
31 changed files
with
605 additions
and
424 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -24,7 +24,7 @@ | |
| "updateMeta": "tsx scripts/utils/updateMeta.mts", | ||
| "updateArrpcDB": "node ./node_modules/arrpc/update_db.js", | ||
| "postinstall": "pnpm updateArrpcDB" | ||
| }, | ||
| }, | ||
| "dependencies": { | ||
| "arrpc": "github:OpenAsar/arrpc#2234e9c9111f4c42ebcc3aa6a2215bfd979eef77", | ||
| "axios": "^1.7.7", | ||
|
|
@@ -36,28 +36,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": { | ||
|
|
@@ -76,6 +76,12 @@ | |
| "package.json", | ||
| "LICENSE" | ||
| ], | ||
| "protocols": { | ||
| "name": "Discord", | ||
| "schemes": [ | ||
| "discord" | ||
| ] | ||
| }, | ||
| "beforePack": "scripts/build/sandboxFix.js", | ||
| "linux": { | ||
| "icon": "build/icon.icns", | ||
|
|
@@ -116,7 +122,8 @@ | |
| "GenericName": "Internet Messenger", | ||
| "Type": "Application", | ||
| "Categories": "Network;InstantMessaging;Chat;", | ||
| "Keywords": "discord;equibop;vesktop;vencord;equicord;electron;chat;" | ||
| "Keywords": "discord;equibop;vesktop;vencord;equicord;electron;chat;", | ||
| "MimeType": "x-scheme-handler/discord" | ||
| } | ||
| }, | ||
| "mac": { | ||
|
|
@@ -194,4 +201,4 @@ | |
| "[email protected]": "patches/[email protected]" | ||
| } | ||
| } | ||
| } | ||
| } | ||
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| 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]; |
Oops, something went wrong.