diff --git a/.github/ISSUE_TEMPLATE/bug_report.yml b/.github/ISSUE_TEMPLATE/bug_report.yml index 251a237f6..6ac7d8754 100644 --- a/.github/ISSUE_TEMPLATE/bug_report.yml +++ b/.github/ISSUE_TEMPLATE/bug_report.yml @@ -71,4 +71,6 @@ body: - label: I am using Discord Stable or tried on Stable and this bug happens there as well - label: I installed Equicord via an official method (download from equicord.org or from source), not via something like AUR or Nix packages - label: This is not a support request + - label: I understand that if any of the above conditions are not met, this issue will be deleted and I will be banned from creating future issues without further warning + required: true - label: I am willing to submit a fix for this myself diff --git a/.github/ISSUE_TEMPLATE/feature_request.yml b/.github/ISSUE_TEMPLATE/feature_request.yml index 99b39f583..c251b61af 100644 --- a/.github/ISSUE_TEMPLATE/feature_request.yml +++ b/.github/ISSUE_TEMPLATE/feature_request.yml @@ -42,4 +42,6 @@ body: - label: I've searched existing issues and this hasn't been suggested before - label: This is a **core modification feature**, not a plugin request (those go in Discord) - label: This feature would benefit most users, not just a specific use case + - label: I understand that if any of the above conditions are not met, this issue will be deleted and I will be banned from creating future issues without further warning + required: true - label: I am willing to work on this myself diff --git a/.github/pull_request_template.md b/.github/pull_request_template.md index 89356ffa3..1117e99f8 100644 --- a/.github/pull_request_template.md +++ b/.github/pull_request_template.md @@ -1,6 +1,8 @@ ## Describe your Changes @@ -10,4 +12,5 @@ Also do not use AI in communication, it makes me ill ## Checklist before submitting - [ ] I have read the [CONTRIBUTING.md](./CONTRIBUTING.md) file and made sure this pull request complies with it -- [ ] This pull request was written by me, and not an AI agent +- [ ] This pull request was written by me, and not an AI agent. +- [ ] I understand that if any of the above conditions are not met, this pull request will be closed and I will be banned from future contributions without further warning diff --git a/package.json b/package.json index c40cc92ad..957c6e733 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "equicord", "private": "true", - "version": "1.15.3.0", + "version": "1.15.4.0", "description": "The other cutest Discord client mod", "homepage": "https://github.com/Equicord/Equicord#readme", "bugs": { diff --git a/src/Vencord.ts b/src/Vencord.ts index 21f288a66..ca1513488 100644 --- a/src/Vencord.ts +++ b/src/Vencord.ts @@ -18,7 +18,6 @@ // DO NOT REMOVE UNLESS YOU WISH TO FACE THE WRATH OF THE CIRCULAR DEPENDENCY DEMON!!!!!!! import "~plugins"; -import "./fixWeirdAppRegionBug.css"; export * as Api from "./api"; export * as Plugins from "./api/PluginManager"; diff --git a/src/fixWeirdAppRegionBug.css b/src/fixWeirdAppRegionBug.css deleted file mode 100644 index bb4bb663e..000000000 --- a/src/fixWeirdAppRegionBug.css +++ /dev/null @@ -1,4 +0,0 @@ -/* Works around a very strange issue where *something* (electron?) will inject body { app-region: drag } when using online themes */ -body { - app-region: no-drag; -} \ No newline at end of file diff --git a/src/plugins/usrbg/index.tsx b/src/plugins/usrbg/index.tsx index 8d1c40d72..f34f84ead 100644 --- a/src/plugins/usrbg/index.tsx +++ b/src/plugins/usrbg/index.tsx @@ -76,7 +76,7 @@ export default definePlugin({ ] }, { - find: '"VideoBackground-web"', + find: ".VIDEO_TILE_BACKGROUND,primaryColor:", predicate: () => settings.store.voiceBackground, replacement: { match: /backgroundColor:.{0,25},\{style:(?=\i\?)/, diff --git a/src/plugins/webPWA.browser/index.tsx b/src/plugins/webPWA.browser/index.tsx index 94ec9d491..452d2c6f4 100644 --- a/src/plugins/webPWA.browser/index.tsx +++ b/src/plugins/webPWA.browser/index.tsx @@ -26,6 +26,8 @@ function colorToHex(color: string) { return "#" + [...ctx.getImageData(0, 0, 1, 1).data.slice(0, 3)].map(n => n.toString(16).padStart(2, "0")).join(""); } +const icon = "https://discord.com/assets/favicon.ico"; + let linkEl: HTMLLinkElement | undefined; async function setManifest() { // need to wait for CSS changes to flush @@ -38,7 +40,6 @@ async function setManifest() { const endpoint = "https:" + window.GLOBAL_ENV.WEBAPP_ENDPOINT; const appUrl = endpoint + "/app"; // URL when PWA launches - const icon = document.querySelector('link[rel="icon"]')!.href; const styles = getComputedStyle(document.body); const manifest = { id: appUrl, @@ -122,6 +123,7 @@ export default definePlugin({ NotificationSettingsStore.addChangeListener(this.setBadge); GuildReadStateStore.addChangeListener(this.setBadge); RelationshipStore.addChangeListener(this.setBadge); + this.setBadge(); if (!IS_USERSCRIPT) { // keybinds diff --git a/src/plugins/webScreenShareFixes.web/index.ts b/src/plugins/webScreenShareFixes.web/index.ts index e215ba9e2..4e7dc6a23 100644 --- a/src/plugins/webScreenShareFixes.web/index.ts +++ b/src/plugins/webScreenShareFixes.web/index.ts @@ -31,8 +31,8 @@ export default definePlugin({ { find: "ApplicationStreamPreviewUploadManager", replacement: { - match: /(\i)\.removeAttribute\("srcObject"\)/, - replace: "$1.pause(),$1.srcObject=null" + match: /removeAttribute\("srcObject"\)(?<=(\i)\..+?)/, + replace: "pause(),$1.srcObject=null" } } ]