Merge branch 'dev' into feat/translation
This commit is contained in:
commit
9cc9c57f11
|
@ -131,11 +131,16 @@ if (!IS_VANILLA) {
|
||||||
|
|
||||||
process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord");
|
process.env.DATA_DIR = join(app.getPath("userData"), "..", "Vencord");
|
||||||
|
|
||||||
// Monkey patch commandLine to disable WidgetLayering: Fix DevTools context menus https://github.com/electron/electron/issues/38790
|
// Monkey patch commandLine to:
|
||||||
|
// - disable WidgetLayering: Fix DevTools context menus https://github.com/electron/electron/issues/38790
|
||||||
|
// - disable UseEcoQoSForBackgroundProcess: Work around Discord unloading when in background
|
||||||
const originalAppend = app.commandLine.appendSwitch;
|
const originalAppend = app.commandLine.appendSwitch;
|
||||||
app.commandLine.appendSwitch = function (...args) {
|
app.commandLine.appendSwitch = function (...args) {
|
||||||
if (args[0] === "disable-features" && !args[1]?.includes("WidgetLayering")) {
|
if (args[0] === "disable-features") {
|
||||||
args[1] += ",WidgetLayering";
|
const disabledFeatures = new Set((args[1] ?? "").split(","));
|
||||||
|
disabledFeatures.add("WidgetLayering");
|
||||||
|
disabledFeatures.add("UseEcoQoSForBackgroundProcess");
|
||||||
|
args[1] += [...disabledFeatures].join(",");
|
||||||
}
|
}
|
||||||
return originalAppend.apply(this, args);
|
return originalAppend.apply(this, args);
|
||||||
};
|
};
|
||||||
|
|
|
@ -93,17 +93,13 @@ export default definePlugin({
|
||||||
{
|
{
|
||||||
find: ".PANEL]:14",
|
find: ".PANEL]:14",
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /(?<=\i=\(0,\i\.default\)\(\i\);)return 0===\i.length/,
|
match: /(?<=(\i)=\(0,\i\.default\)\(\i\);)return 0===\i.length\?/,
|
||||||
replace: "$& && $self.getBadges(arguments[0]?.displayProfile).length===0"
|
replace: "$1.unshift(...$self.getBadges(arguments[0].displayProfile));$&"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
{
|
{
|
||||||
find: ".description,delay:",
|
find: ".description,delay:",
|
||||||
replacement: [
|
replacement: [
|
||||||
{
|
|
||||||
match: /...(\i)\}=\(0,\i\.useUserProfileAnalyticsContext\)\(\);/,
|
|
||||||
replace: "$&arguments[0].badges?.unshift(...$self.getBadges($1));"
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
// alt: "", aria-hidden: false, src: originalSrc
|
// alt: "", aria-hidden: false, src: originalSrc
|
||||||
match: /alt:" ","aria-hidden":!0,src:(?=.{0,20}(\i)\.icon)/,
|
match: /alt:" ","aria-hidden":!0,src:(?=.{0,20}(\i)\.icon)/,
|
||||||
|
|
|
@ -60,6 +60,7 @@ export default definePlugin({
|
||||||
// FIXME: remove once change merged to stable
|
// FIXME: remove once change merged to stable
|
||||||
{
|
{
|
||||||
find: "Messages.ACTIVITY_SETTINGS",
|
find: "Messages.ACTIVITY_SETTINGS",
|
||||||
|
noWarn: true,
|
||||||
replacement: {
|
replacement: {
|
||||||
get match() {
|
get match() {
|
||||||
switch (Settings.plugins.Settings.settingsLocation) {
|
switch (Settings.plugins.Settings.settingsLocation) {
|
||||||
|
|
|
@ -1,5 +0,0 @@
|
||||||
# ResurrectHome
|
|
||||||
|
|
||||||
Brings back the phased out [Server Home](https://support.discord.com/hc/en-us/articles/6156116949911-Server-Home-Beta) feature!
|
|
||||||
|
|
||||||
![](https://github.com/Vendicated/Vencord/assets/61953774/98d5d667-bbb9-48b8-872d-c9b3980f6506)
|
|
|
@ -1,195 +0,0 @@
|
||||||
/*
|
|
||||||
* Vencord, a modification for Discord's desktop app
|
|
||||||
* Copyright (c) 2023 Vendicated and contributors
|
|
||||||
*
|
|
||||||
* 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 <https://www.gnu.org/licenses/>.
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { findGroupChildrenByChildId } from "@api/ContextMenu";
|
|
||||||
import { definePluginSettings } from "@api/Settings";
|
|
||||||
import ErrorBoundary from "@components/ErrorBoundary";
|
|
||||||
import { Devs } from "@utils/constants";
|
|
||||||
import definePlugin, { OptionType } from "@utils/types";
|
|
||||||
import { findByPropsLazy } from "@webpack";
|
|
||||||
import { Button, Menu, Tooltip, useEffect, useState } from "@webpack/common";
|
|
||||||
|
|
||||||
const ChannelRowClasses = findByPropsLazy("modeConnected", "modeLocked", "icon");
|
|
||||||
|
|
||||||
let currentShouldViewServerHome = false;
|
|
||||||
const shouldViewServerHomeStates = new Set<React.Dispatch<React.SetStateAction<boolean>>>();
|
|
||||||
|
|
||||||
function ViewServerHomeButton() {
|
|
||||||
return (
|
|
||||||
<Tooltip text="View Server Home">
|
|
||||||
{tooltipProps => (
|
|
||||||
<Button
|
|
||||||
{...tooltipProps}
|
|
||||||
look={Button.Looks.BLANK}
|
|
||||||
size={Button.Sizes.NONE}
|
|
||||||
innerClassName={ChannelRowClasses.icon}
|
|
||||||
onClick={e => {
|
|
||||||
e.preventDefault();
|
|
||||||
|
|
||||||
currentShouldViewServerHome = true;
|
|
||||||
for (const setState of shouldViewServerHomeStates) {
|
|
||||||
setState(true);
|
|
||||||
}
|
|
||||||
}}
|
|
||||||
|
|
||||||
>
|
|
||||||
<svg width="20" height="20" viewBox="0 0 24 24">
|
|
||||||
<path fill="currentColor" d="m2.4 8.4 8.38-6.46a2 2 0 0 1 2.44 0l8.39 6.45a2 2 0 0 1-.79 3.54l-.32.07-.82 8.2a2 2 0 0 1-1.99 1.8H16a1 1 0 0 1-1-1v-5a3 3 0 0 0-6 0v5a1 1 0 0 1-1 1H6.31a2 2 0 0 1-1.99-1.8L3.5 12l-.32-.07a2 2 0 0 1-.79-3.54Z" />
|
|
||||||
</svg>
|
|
||||||
</Button>
|
|
||||||
)}
|
|
||||||
</Tooltip>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
|
|
||||||
function useForceServerHome() {
|
|
||||||
const { forceServerHome } = settings.use(["forceServerHome"]);
|
|
||||||
const [shouldViewServerHome, setShouldViewServerHome] = useState(currentShouldViewServerHome);
|
|
||||||
|
|
||||||
useEffect(() => {
|
|
||||||
shouldViewServerHomeStates.add(setShouldViewServerHome);
|
|
||||||
|
|
||||||
return () => {
|
|
||||||
shouldViewServerHomeStates.delete(setShouldViewServerHome);
|
|
||||||
};
|
|
||||||
}, []);
|
|
||||||
|
|
||||||
return shouldViewServerHome || forceServerHome;
|
|
||||||
}
|
|
||||||
|
|
||||||
function useDisableViewServerHome() {
|
|
||||||
useEffect(() => () => {
|
|
||||||
currentShouldViewServerHome = false;
|
|
||||||
for (const setState of shouldViewServerHomeStates) {
|
|
||||||
setState(false);
|
|
||||||
}
|
|
||||||
}, []);
|
|
||||||
}
|
|
||||||
|
|
||||||
const settings = definePluginSettings({
|
|
||||||
forceServerHome: {
|
|
||||||
type: OptionType.BOOLEAN,
|
|
||||||
description: "Force the Server Guide to be the Server Home tab when it is enabled.",
|
|
||||||
default: false
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
export default definePlugin({
|
|
||||||
name: "ResurrectHome",
|
|
||||||
description: "Re-enables the Server Home tab when there isn't a Server Guide. Also has an option to force the Server Home over the Server Guide, which is accessible through right-clicking a server.",
|
|
||||||
authors: [Devs.Dolfies, Devs.Nuckyz],
|
|
||||||
settings,
|
|
||||||
|
|
||||||
patches: [
|
|
||||||
// Force home deprecation override
|
|
||||||
{
|
|
||||||
find: "GuildFeatures.GUILD_HOME_DEPRECATION_OVERRIDE",
|
|
||||||
all: true,
|
|
||||||
replacement: [
|
|
||||||
{
|
|
||||||
match: /\i\.hasFeature\(\i\.GuildFeatures\.GUILD_HOME_DEPRECATION_OVERRIDE\)/g,
|
|
||||||
replace: "true"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
},
|
|
||||||
// Disable feedback prompts
|
|
||||||
{
|
|
||||||
find: "GuildHomeFeedbackExperiment.definition.id",
|
|
||||||
replacement: [
|
|
||||||
{
|
|
||||||
match: /return{showFeedback:.+?,setOnDismissedFeedback:(\i)}/,
|
|
||||||
replace: "return{showFeedback:false,setOnDismissedFeedback:$1}"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
// This feature was never finished, so the patch is disabled
|
|
||||||
|
|
||||||
// Enable guild feed render mode selector
|
|
||||||
// {
|
|
||||||
// find: "2022-01_home_feed_toggle",
|
|
||||||
// replacement: [
|
|
||||||
// {
|
|
||||||
// match: /showSelector:!1/,
|
|
||||||
// replace: "showSelector:true"
|
|
||||||
// }
|
|
||||||
// ]
|
|
||||||
// },
|
|
||||||
|
|
||||||
// Fix focusMessage clearing previously cached messages and causing a loop when fetching messages around home messages
|
|
||||||
{
|
|
||||||
find: '"MessageActionCreators"',
|
|
||||||
replacement: {
|
|
||||||
match: /focusMessage\(\i\){.+?(?=focus:{messageId:(\i)})/,
|
|
||||||
replace: "$&after:$1,"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// Force Server Home instead of Server Guide
|
|
||||||
{
|
|
||||||
find: "61eef9_2",
|
|
||||||
replacement: {
|
|
||||||
match: /getMutableGuildChannelsForGuild\(\i\);return\(0,\i\.useStateFromStores\).+?\]\)(?=}function)/,
|
|
||||||
replace: m => `${m}&&!$self.useForceServerHome()`
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// Add View Server Home Button to Server Guide
|
|
||||||
{
|
|
||||||
find: "487e85_1",
|
|
||||||
replacement: {
|
|
||||||
match: /(?<=text:(\i)\?\i\.\i\.Messages\.SERVER_GUIDE:\i\.\i\.Messages\.GUILD_HOME,)/,
|
|
||||||
replace: "trailing:$self.ViewServerHomeButton({serverGuide:$1}),"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
// Disable view Server Home override when the Server Home is unmouted
|
|
||||||
{
|
|
||||||
find: "69386d_5",
|
|
||||||
replacement: {
|
|
||||||
match: /location:"69386d_5".+?;/,
|
|
||||||
replace: "$&$self.useDisableViewServerHome();"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
],
|
|
||||||
|
|
||||||
ViewServerHomeButton: ErrorBoundary.wrap(({ serverGuide }: { serverGuide?: boolean; }) => {
|
|
||||||
if (serverGuide !== true) return null;
|
|
||||||
|
|
||||||
return <ViewServerHomeButton />;
|
|
||||||
}),
|
|
||||||
|
|
||||||
useForceServerHome,
|
|
||||||
useDisableViewServerHome,
|
|
||||||
|
|
||||||
contextMenus: {
|
|
||||||
"guild-context"(children, props) {
|
|
||||||
const { forceServerHome } = settings.use(["forceServerHome"]);
|
|
||||||
|
|
||||||
if (!props?.guild) return;
|
|
||||||
|
|
||||||
const group = findGroupChildrenByChildId("hide-muted-channels", children);
|
|
||||||
|
|
||||||
group?.unshift(
|
|
||||||
<Menu.MenuCheckboxItem
|
|
||||||
key="force-server-home"
|
|
||||||
id="force-server-home"
|
|
||||||
label="Force Server Home"
|
|
||||||
checked={forceServerHome}
|
|
||||||
action={() => settings.store.forceServerHome = !forceServerHome}
|
|
||||||
/>
|
|
||||||
);
|
|
||||||
}
|
|
||||||
}
|
|
||||||
});
|
|
|
@ -40,9 +40,16 @@ const settings = definePluginSettings({
|
||||||
default: true,
|
default: true,
|
||||||
description: "Show role colors in the voice chat user list",
|
description: "Show role colors in the voice chat user list",
|
||||||
restartNeeded: true
|
restartNeeded: true
|
||||||
|
},
|
||||||
|
reactorsList: {
|
||||||
|
type: OptionType.BOOLEAN,
|
||||||
|
default: true,
|
||||||
|
description: "Show role colors in the reactors list",
|
||||||
|
restartNeeded: true
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|
||||||
export default definePlugin({
|
export default definePlugin({
|
||||||
name: "RoleColorEverywhere",
|
name: "RoleColorEverywhere",
|
||||||
authors: [Devs.KingFish, Devs.lewisakura, Devs.AutumnVN],
|
authors: [Devs.KingFish, Devs.lewisakura, Devs.AutumnVN],
|
||||||
|
@ -99,6 +106,14 @@ export default definePlugin({
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
predicate: () => settings.store.voiceUsers,
|
predicate: () => settings.store.voiceUsers,
|
||||||
|
},
|
||||||
|
{
|
||||||
|
find: ".reactorDefault",
|
||||||
|
replacement: {
|
||||||
|
match: /\.openUserContextMenu\)\((\i),(\i),\i\).{0,250}tag:"strong"/,
|
||||||
|
replace: "$&,style:{color:$self.getColor($2?.id,$1)}"
|
||||||
|
},
|
||||||
|
predicate: () => settings.store.reactorsList,
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
settings,
|
settings,
|
||||||
|
|
|
@ -74,15 +74,28 @@ interface ConnectionPlatform {
|
||||||
icon: { lightSVG: string, darkSVG: string; };
|
icon: { lightSVG: string, darkSVG: string; };
|
||||||
}
|
}
|
||||||
|
|
||||||
const profilePopoutComponent = ErrorBoundary.wrap((props: { user: User, displayProfile, compactSpacing; }) =>
|
const profilePopoutComponent = ErrorBoundary.wrap(
|
||||||
<ConnectionsComponent id={props.user.id} theme={getProfileThemeProps(props).theme} compactSpacing={props.compactSpacing} />
|
(props: { user: User; displayProfile?: any; simplified?: boolean; }) => (
|
||||||
|
<ConnectionsComponent
|
||||||
|
{...props}
|
||||||
|
id={props.user.id}
|
||||||
|
theme={getProfileThemeProps(props).theme}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
{ noop: true }
|
||||||
);
|
);
|
||||||
|
|
||||||
const profilePanelComponent = ErrorBoundary.wrap(({ id }: { id: string; }) =>
|
const profilePanelComponent = ErrorBoundary.wrap(
|
||||||
<ConnectionsComponent id={id} theme={ThemeStore.theme} />
|
(props: { id: string; simplified?: boolean; }) => (
|
||||||
|
<ConnectionsComponent
|
||||||
|
{...props}
|
||||||
|
theme={ThemeStore.theme}
|
||||||
|
/>
|
||||||
|
),
|
||||||
|
{ noop: true }
|
||||||
);
|
);
|
||||||
|
|
||||||
function ConnectionsComponent({ id, theme, compactSpacing }: { id: string, theme: string, compactSpacing?: boolean; }) {
|
function ConnectionsComponent({ id, theme, simplified }: { id: string, theme: string, simplified?: boolean; }) {
|
||||||
const profile = UserProfileStore.getUserProfile(id);
|
const profile = UserProfileStore.getUserProfile(id);
|
||||||
if (!profile)
|
if (!profile)
|
||||||
return null;
|
return null;
|
||||||
|
@ -91,7 +104,18 @@ function ConnectionsComponent({ id, theme, compactSpacing }: { id: string, theme
|
||||||
if (!connections?.length)
|
if (!connections?.length)
|
||||||
return null;
|
return null;
|
||||||
|
|
||||||
const Container = compactSpacing ? "div" : Section;
|
const connectionsContainer = (
|
||||||
|
<Flex style={{
|
||||||
|
marginTop: !simplified ? "8px" : undefined,
|
||||||
|
gap: getSpacingPx(settings.store.iconSpacing),
|
||||||
|
flexWrap: "wrap"
|
||||||
|
}}>
|
||||||
|
{connections.map(connection => <CompactConnectionComponent connection={connection} theme={theme} />)}
|
||||||
|
</Flex>
|
||||||
|
);
|
||||||
|
|
||||||
|
if (simplified)
|
||||||
|
return connectionsContainer;
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Container>
|
<Container>
|
||||||
|
@ -102,14 +126,8 @@ function ConnectionsComponent({ id, theme, compactSpacing }: { id: string, theme
|
||||||
>
|
>
|
||||||
Connections
|
Connections
|
||||||
</Text>
|
</Text>
|
||||||
<Flex style={{
|
{connectionsContainer}
|
||||||
marginTop: "8px",
|
</Section>
|
||||||
gap: getSpacingPx(settings.store.iconSpacing),
|
|
||||||
flexWrap: "wrap"
|
|
||||||
}}>
|
|
||||||
{connections.map(connection => <CompactConnectionComponent connection={connection} theme={theme} />)}
|
|
||||||
</Flex>
|
|
||||||
</Container>
|
|
||||||
);
|
);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -134,7 +152,7 @@ function CompactConnectionComponent({ connection, theme }: { connection: Connect
|
||||||
<Tooltip
|
<Tooltip
|
||||||
text={
|
text={
|
||||||
<span className="vc-sc-tooltip">
|
<span className="vc-sc-tooltip">
|
||||||
{connection.name}
|
<span className="vc-sc-connection-name">{connection.name}</span>
|
||||||
{connection.verified && <VerifiedIcon />}
|
{connection.verified && <VerifiedIcon />}
|
||||||
<TooltipIcon height={16} width={16} />
|
<TooltipIcon height={16} width={16} />
|
||||||
</span>
|
</span>
|
||||||
|
@ -195,7 +213,7 @@ export default definePlugin({
|
||||||
find: "autoFocusNote:!0})",
|
find: "autoFocusNote:!0})",
|
||||||
replacement: {
|
replacement: {
|
||||||
match: /{autoFocusNote:!1}\)}\)(?<=user:(\i),bio:null==(\i)\?.+?)/,
|
match: /{autoFocusNote:!1}\)}\)(?<=user:(\i),bio:null==(\i)\?.+?)/,
|
||||||
replace: "$&,$self.profilePopoutComponent({ user: $1, displayProfile: $2, compactSpacing: true })"
|
replace: "$&,$self.profilePopoutComponent({ user: $1, displayProfile: $2, simplified: true })"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
],
|
],
|
||||||
|
|
|
@ -9,3 +9,11 @@
|
||||||
gap: 0.25em;
|
gap: 0.25em;
|
||||||
align-items: center;
|
align-items: center;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
.vc-sc-connection-name {
|
||||||
|
word-break: break-all;
|
||||||
|
}
|
||||||
|
|
||||||
|
.vc-sc-tooltip svg {
|
||||||
|
min-width: 16px;
|
||||||
|
}
|
||||||
|
|
|
@ -69,13 +69,6 @@ export default definePlugin({
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
{
|
|
||||||
find: "=!1,canUsePremiumCustomization:",
|
|
||||||
replacement: {
|
|
||||||
match: /(\i)\.premiumType/,
|
|
||||||
replace: "$self.patchPremiumType($1)||$&"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
{
|
{
|
||||||
find: "BannerLoadingStatus:function",
|
find: "BannerLoadingStatus:function",
|
||||||
replacement: {
|
replacement: {
|
||||||
|
|
Loading…
Reference in a new issue