diff --git a/.eslintrc.json b/.eslintrc.json
index 0eb6689f2..9bbe4f5c5 100644
--- a/.eslintrc.json
+++ b/.eslintrc.json
@@ -109,46 +109,6 @@
"unused-imports/no-unused-imports": "error",
- "path-alias/no-relative": "error",
-
- "@typescript-eslint/no-restricted-imports": [
- "error",
- {
- "paths": [
- // shrug, couldn't find a better way since the pattern one doesn't work:
- // ["utils", "!utils/*"]
- {
- "name": "./utils",
- "message": "Do not import from index. This might cause issues. Import from the specific file instead.",
- "allowTypeImports": true
- },
- {
- "name": "../utils",
- "message": "Do not import from index. This might cause issues. Import from the specific file instead.",
- "allowTypeImports": true
- },
- {
- "name": "../../utils",
- "message": "Do not import from index. This might cause issues. Import from the specific file instead.",
- "allowTypeImports": true
- },
- {
- "name": "../../../utils",
- "message": "Do not import from index. This might cause issues. Import from the specific file instead.",
- "allowTypeImports": true
- },
- {
- "name": "../../../../utils",
- "message": "Do not import from index. This might cause issues. Import from the specific file instead.",
- "allowTypeImports": true
- },
- {
- "name": "../../../../../utils",
- "message": "Do not import from index. This might cause issues. Import from the specific file instead.",
- "allowTypeImports": true
- }
- ]
- }
- ]
+ "path-alias/no-relative": "error"
}
}
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index 48948290a..f7c7363f6 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -33,9 +33,22 @@ jobs:
- name: Build web
run: pnpm buildWeb --standalone
+ - name: Sign firefox extension
+ run: |
+ pnpx web-ext sign --api-key $WEBEXT_USER --api-secret $WEBEXT_SECRET --channel=listed
+ env:
+ WEBEXT_USER: ${{ secrets.WEBEXT_USER }}
+ WEBEXT_SECRET: ${{ secrets.WEBEXT_SECRET }}
+
- name: Build
run: pnpm build --standalone
+ - name: Rename extensions for more user friendliness
+ run: |
+ mv dist/*.xpi dist/Vencord-for-Firefox.xpi
+ mv dist/extension-v3.zip dist/Vencord-for-Chrome-and-Edge.zip
+ rm -rf dist/extension-v2-unpacked
+
- name: Get some values needed for the release
id: release_values
run: |
diff --git a/.npmrc b/.npmrc
new file mode 100644
index 000000000..319e41e69
--- /dev/null
+++ b/.npmrc
@@ -0,0 +1 @@
+strict-peer-dependencies=false
diff --git a/README.md b/README.md
index 2b9e86559..7be2d4722 100644
--- a/README.md
+++ b/README.md
@@ -19,7 +19,8 @@ If you're a power user who wants to contribute and make plugins or just want to
## Installing on Browser
-Install [the browser extension](https://github.com/Vendicated/Vencord/releases/latest/download/extension.zip) or [UserScript](https://github.com/Vendicated/Vencord/releases/download/devbuild/Vencord.user.js). Please note that they aren't automatically updated for now, so you will regularely have to reinstall it.
+Install the browser extension for [](https://github.com/Vendicated/Vencord/releases/latest/download/Vencord-for-Chrome-and-Edge.zip), [](https://github.com/Vendicated/Vencord/releases/latest/download/Vencord-for-Firefox.xpi) or [UserScript](https://github.com/Vendicated/Vencord/releases/download/devbuild/Vencord.user.js). Please note that they aren't automatically updated for now, so you will regularely have to reinstall it.
+
You may also build them from source, to do that do the same steps as in the manual regular install method,
except run `pnpm buildWeb` instead of `pnpm build`, and your outputs will be in the dist folder
diff --git a/browser/background.js b/browser/background.js
new file mode 100644
index 000000000..5c99dd8f6
--- /dev/null
+++ b/browser/background.js
@@ -0,0 +1,48 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Linnea Gräf
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see {text} ;
+}
+
+function Validators({ themeLinks }: { themeLinks: string[]; }) {
+ if (!themeLinks.length) return null;
+
+ return (
+ <>
+ Validator
+ This section will tell you whether your themes can successfully be loaded
+
+ {themeLinks.map(link => (
+
+
+ {link}
+
+
+ ))}
+
+
+ );
+}
+
+export default ErrorBoundary.wrap(function () {
+ const settings = useSettings();
+ const ref = React.useRef();
+
+ function onBlur() {
+ settings.themeLinks = [...new Set(
+ ref.current!.value
+ .trim()
+ .split(/\n+/)
+ .map(s => s.trim())
+ .filter(Boolean)
+ )];
+ }
+
+ return (
+ <>
+
+ Paste links to .css / .theme.css files here
+ One link per line
+ Be careful to use the raw links or github.io links!
+ Find Themes:
+
+
+ If using the BD site, click on "Source" somewhere below the Download button
+ In the GitHub repository of your theme, find X.theme.css / X.css, click on it, then click the "Raw" button
+
+ If the theme has configuration that requires you to edit the file:
+
+ • Make a github account
+ • Click the fork button on the top right
+ • Edit the file
+ • Use the link to your own repository instead
+
+
+
+ Themes
+
+ (IpcEvents.GET_SETTINGS_DIR), "Loading...");
const settings = useSettings();
+ const [donateImage] = React.useState(
+ Math.random() > 0.5
+ ? "https://cdn.discordapp.com/emojis/1026533090627174460.png"
+ : "https://media.discordapp.net/stickers/1039992459209490513.png"
+ );
+
return (
-
{IS_WEB ? (
@@ -75,6 +81,9 @@ function VencordSettings() {
+
+ Hint: You can change the position of this settings section in the settings of the "Settings" plugin!
+
settings.useQuickCss = v}
@@ -104,8 +113,11 @@ function VencordSettings() {
}
+interface DonateCardProps {
+ image: string;
+}
-function DonateCard() {
+function DonateCard({ image }: DonateCardProps) {
return (
diff --git a/src/components/VencordSettings/index.tsx b/src/components/VencordSettings/index.tsx
index 37dab8f50..b49e4b49c 100644
--- a/src/components/VencordSettings/index.tsx
+++ b/src/components/VencordSettings/index.tsx
@@ -24,6 +24,7 @@ import cssText from "~fileContent/settingsStyles.css";
import BackupRestoreTab from "./BackupRestoreTab";
import PluginsTab from "./PluginsTab";
+import ThemesTab from "./ThemesTab";
import Updater from "./Updater";
import VencordSettings from "./VencordTab";
@@ -47,7 +48,7 @@ interface SettingsTab {
const SettingsTabs: Record = {
VencordSettings: { name: "Vencord", component: () => Coming soon to a Vencord near you! },
+ VencordThemes: { name: "Themes", component: () => ;
+let forceUpdate: () => void;
+
+function MemberCount() {
+ const guildId = getCurrentChannel().guild_id;
+ const c = counts[guildId];
+
+ forceUpdate = useForceUpdater();
+
+ if (!c) return null;
+
+ let total = String(c[0]);
+ if (total === "0" && c[1] > 0) {
+ total = "Loading...";
+ }
+
+ return (
+
+
+ {props => (
+
+ {c[1]}
+
+ )}
+
+
+ {props => (
+
+ {total}
+
+ )}
+
+
+ );
+}
+
+export default definePlugin({
+ name: "MemberCount",
+ description: "Shows the amount of online & total members in the server member list",
+ authors: [Devs.Ven],
+
+ patches: [{
+ find: ".isSidebarVisible,",
+ replacement: {
+ match: /(var (.)=.\.className.+?children):\[(.\.useMemo[^}]+"aria-multiselectable")/,
+ replace: "$1:[$2.startsWith('members')?Vencord.Plugins.plugins.MemberCount.render():null,$3"
+ }
+ }],
+
+ onGuildMemberListUpdate({ guildId, groups, memberCount, id }) {
+ // eeeeeh - sometimes it has really wrong counts??? like 10 times less than actual
+ // but if we only listen to everyone updates, sometimes we never get the count?
+ // this seems to work but isn't optional
+ if (id !== "everyone" && counts[guildId]) return;
+
+ let count = 0;
+ for (const group of groups) {
+ if (group.id !== "offline")
+ count += group.count;
+ }
+ counts[guildId] = [memberCount, count];
+ forceUpdate?.();
+ },
+
+ start() {
+ FluxDispatcher.subscribe("GUILD_MEMBER_LIST_UPDATE", this.onGuildMemberListUpdate);
+ },
+
+ stop() {
+ FluxDispatcher.unsubscribe("GUILD_MEMBER_LIST_UPDATE", this.onGuildMemberListUpdate);
+ },
+
+ render: () => (
+
+
+ )
+});
diff --git a/src/plugins/serverListIndicators.tsx b/src/plugins/serverListIndicators.tsx
new file mode 100644
index 000000000..e1c0829e5
--- /dev/null
+++ b/src/plugins/serverListIndicators.tsx
@@ -0,0 +1,135 @@
+/*
+ * Vencord, a modification for Discord's desktop app
+ * Copyright (c) 2022 Sofia Lima
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see
+ {onlineFriends} online
+
+ );
+}
+
+function ServersIndicator() {
+ forceUpdateGuildCount = useForceUpdater();
+
+ return (
+
+ {guildCount} servers
+
+ );
+}
+
+export default definePlugin({
+ name: "ServerListIndicators",
+ description: "Add online friend count or server count in the server list",
+ authors: [Devs.dzshn],
+ dependencies: ["ServerListAPI"],
+
+ options: {
+ mode: {
+ description: "mode",
+ type: OptionType.SELECT,
+ options: [
+ { label: "Only online friend count", value: IndicatorType.FRIEND, default: true },
+ { label: "Only server count", value: IndicatorType.SERVER },
+ { label: "Both server and online friend counts", value: IndicatorType.BOTH },
+ ]
+ }
+ },
+
+ renderIndicator: () => {
+ const { mode } = Settings.plugins.ServerListIndicators;
+ return
+
+ {!!(mode & IndicatorType.FRIEND) &&
+ ;
+ },
+
+ handlePresenceUpdate() {
+ onlineFriends = 0;
+ const relations = RelationshipStore.getRelationships();
+ for (const id of Object.keys(relations)) {
+ const type = relations[id];
+ // FRIEND relationship type
+ if (type === 1 && PresenceStore.getStatus(id) !== "offline") {
+ onlineFriends += 1;
+ }
+ }
+ forceUpdateFriendCount?.();
+ },
+
+ handleGuildUpdate() {
+ guildCount = GuildStore.getGuildCount();
+ forceUpdateGuildCount?.();
+ },
+
+ start() {
+ this.handlePresenceUpdate();
+ this.handleGuildUpdate();
+ addServerListElement(ServerListRenderPosition.Above, this.renderIndicator);
+ FluxDispatcher.subscribe("PRESENCE_UPDATES", this.handlePresenceUpdate);
+ FluxDispatcher.subscribe("GUILD_CREATE", this.handleGuildUpdate);
+ FluxDispatcher.subscribe("GUILD_DELETE", this.handleGuildUpdate);
+ },
+
+ stop() {
+ removeServerListElement(ServerListRenderPosition.Above, this.renderIndicator);
+ FluxDispatcher.unsubscribe("PRESENCE_UPDATES", this.handlePresenceUpdate);
+ FluxDispatcher.unsubscribe("GUILD_CREATE", this.handleGuildUpdate);
+ FluxDispatcher.unsubscribe("GUILD_DELETE", this.handleGuildUpdate);
+ }
+});
diff --git a/src/plugins/settings.tsx b/src/plugins/settings.tsx
index 975c3992c..e5afbbcc7 100644
--- a/src/plugins/settings.tsx
+++ b/src/plugins/settings.tsx
@@ -16,9 +16,11 @@
* along with this program. If not, see >(
+export function onceDefined>(
target: T, property: P, callback: (v: P extends keyof T ? T[P] : any) => void
): void {
const propertyAsAny = property as any;
diff --git a/src/utils/quickCss.ts b/src/utils/quickCss.ts
index 1f9f235f5..de4eaefbc 100644
--- a/src/utils/quickCss.ts
+++ b/src/utils/quickCss.ts
@@ -21,6 +21,7 @@ import { addSettingsListener, Settings } from "@api/settings";
import IpcEvents from "./IpcEvents";
let style: HTMLStyleElement;
+let themesStyle: HTMLStyleElement;
export async function toggle(isEnabled: boolean) {
if (!style) {
@@ -35,7 +36,22 @@ export async function toggle(isEnabled: boolean) {
style.disabled = !isEnabled;
}
+async function initThemes() {
+ if (!themesStyle) {
+ themesStyle = document.createElement("style");
+ themesStyle.id = "vencord-themes";
+ document.head.appendChild(themesStyle);
+ }
+
+ const { themeLinks } = Settings;
+ const links = themeLinks.map(link => `@import url("${link.trim()}");`).join("\n");
+ themesStyle.textContent = links;
+}
+
document.addEventListener("DOMContentLoaded", () => {
toggle(Settings.useQuickCss);
addSettingsListener("useQuickCss", toggle);
+
+ initThemes();
+ addSettingsListener("themeLinks", initThemes);
});
diff --git a/src/webpack/common.tsx b/src/webpack/common.tsx
index 318cd02fe..7c4575792 100644
--- a/src/webpack/common.tsx
+++ b/src/webpack/common.tsx
@@ -50,6 +50,7 @@ export let UserStore: Stores.UserStore;
export let SelectedChannelStore: Stores.SelectedChannelStore;
export let SelectedGuildStore: any;
export let ChannelStore: Stores.ChannelStore;
+export let RelationshipStore: Stores.RelationshipStore;
export const Forms = {} as {
FormTitle: Components.FormTitle;
@@ -64,6 +65,7 @@ export let Tooltip: Components.Tooltip;
export let Router: any;
export let TextInput: any;
export let Text: (props: TextProps) => JSX.Element;
+export const TextArea = findByCodeLazy("handleSetRef", "textArea") as React.ComponentType>;
export const Select = LazyComponent(() => findByCode("optionClassName", "popoutPosition", "autoFocus", "maxVisibleItems"));
export const Slider = LazyComponent(() => findByCode("closestMarkerIndex", "stickToMarkers"));
@@ -156,6 +158,7 @@ waitFor("getSortedPrivateChannels", m => ChannelStore = m);
waitFor("getCurrentlySelectedChannelId", m => SelectedChannelStore = m);
waitFor("getLastSelectedGuildId", m => SelectedGuildStore = m);
waitFor("getGuildCount", m => GuildStore = m);
+waitFor("getRelationshipType", m => RelationshipStore = m);
waitFor(["Hovers", "Looks", "Sizes"], m => Button = m);
waitFor(filters.byCode("helpdeskArticleId"), m => Switch = m);
