ryanamay/ModularVencord
1
0
Fork 0
mirror of https://github.com/Vendicated/Vencord.git synced 2024-09-19 22:20:34 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

Merge branch 'main' into plugin/memberListActivities

Browse source
This commit is contained in:
D3SOX 2024-02-16 09:07:43 +01:00
commit 11a1c81916
No known key found for this signature in database
GPG key ID: 39EC1673FC37B048
9 changed files with 135 additions and 86 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/plugins/imageZoom/components/Magnifier.tsx
View file

@ -123,14 +123,13 @@ export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSiz
waitFor(() => instance.state.readyState === "READY", () => { waitFor(() => instance.state.readyState === "READY", () => {
const elem = document.getElementById(ELEMENT_ID) as HTMLDivElement; const elem = document.getElementById(ELEMENT_ID) as HTMLDivElement;
element.current = elem; element.current = elem;
elem.firstElementChild!.setAttribute("draggable", "false"); elem.querySelector("img,video")?.setAttribute("draggable", "false");
if (instance.props.animated) { if (instance.props.animated) {
originalVideoElementRef.current = elem!.querySelector("video")!; originalVideoElementRef.current = elem!.querySelector("video")!;
originalVideoElementRef.current.addEventListener("timeupdate", syncVideos); originalVideoElementRef.current.addEventListener("timeupdate", syncVideos);
setReady(true);
} else {
setReady(true);
} }
setReady(true);
}); });
document.addEventListener("keydown", onKeyDown); document.addEventListener("keydown", onKeyDown);
document.addEventListener("keyup", onKeyUp); document.addEventListener("keyup", onKeyUp);
@ -155,7 +154,9 @@ export const Magnifier: React.FC<MagnifierProps> = ({ instance, size: initialSiz
if (!ready) return null; if (!ready) return null;
const box = element.current!.getBoundingClientRect(); const box = element.current?.getBoundingClientRect();
if (!box) return null;
return ( return (
<div <div

2
src/plugins/imageZoom/index.tsx
View file

@ -171,7 +171,7 @@ export default definePlugin({
find: "handleImageLoad=", find: "handleImageLoad=",
replacement: [ replacement: [
{ {
match: /showThumbhashPlaceholder:\i,/, match: /placeholderVersion:\i,/,
replace: "...$self.makeProps(this),$&" replace: "...$self.makeProps(this),$&"
}, },

100
src/plugins/messageLinkEmbeds/index.tsx
View file

@ -29,15 +29,17 @@ import {
ChannelStore, ChannelStore,
FluxDispatcher, FluxDispatcher,
GuildStore, GuildStore,
IconUtils,
MessageStore, MessageStore,
Parser, Parser,
PermissionsBits,
PermissionStore, PermissionStore,
RestAPI, RestAPI,
Text, Text,
TextAndImagesSettingsStores, TextAndImagesSettingsStores,
UserStore UserStore
} from "@webpack/common"; } from "@webpack/common";
import { Channel, Guild, Message } from "discord-types/general"; import { Channel, Message } from "discord-types/general";
const messageCache = new Map<string, { const messageCache = new Map<string, {
message?: Message; message?: Message;
@ -49,8 +51,9 @@ const AutoModEmbed = findComponentByCodeLazy(".withFooter]:", "childrenMessageCo
const ChannelMessage = findComponentByCodeLazy("renderSimpleAccessories)"); const ChannelMessage = findComponentByCodeLazy("renderSimpleAccessories)");
const SearchResultClasses = findByPropsLazy("message", "searchResult"); const SearchResultClasses = findByPropsLazy("message", "searchResult");
const EmbedClasses = findByPropsLazy("embedAuthorIcon", "embedAuthor", "embedAuthor");
const messageLinkRegex = /(?<!<)https?:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/(\d{17,20}|@me)\/(\d{17,20})\/(\d{17,20})/g; const messageLinkRegex = /(?<!<)https?:\/\/(?:\w+\.)?discord(?:app)?\.com\/channels\/(?:\d{17,20}|@me)\/(\d{17,20})\/(\d{17,20})/g;
const tenorRegex = /^https:\/\/(?:www\.)?tenor\.com\//; const tenorRegex = /^https:\/\/(?:www\.)?tenor\.com\//;
interface Attachment { interface Attachment {
@ -63,7 +66,6 @@ interface Attachment {
interface MessageEmbedProps { interface MessageEmbedProps {
message: Message; message: Message;
channel: Channel; channel: Channel;
guildID: string;
} }
const messageFetchQueue = new Queue(); const messageFetchQueue = new Queue();
@ -226,19 +228,19 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
let match = null as RegExpMatchArray | null; let match = null as RegExpMatchArray | null;
while ((match = messageLinkRegex.exec(message.content!)) !== null) { while ((match = messageLinkRegex.exec(message.content!)) !== null) {
const [_, guildID, channelID, messageID] = match; const [_, channelID, messageID] = match;
if (embeddedBy.includes(messageID)) { if (embeddedBy.includes(messageID)) {
continue; continue;
} }
const linkedChannel = ChannelStore.getChannel(channelID); const linkedChannel = ChannelStore.getChannel(channelID);
if (!linkedChannel || (guildID !== "@me" && !PermissionStore.can(1024n /* view channel */, linkedChannel))) { if (!linkedChannel || (!linkedChannel.isPrivate() && !PermissionStore.can(PermissionsBits.VIEW_CHANNEL, linkedChannel))) {
continue; continue;
} }
const { listMode, idList } = settings.store; const { listMode, idList } = settings.store;
const isListed = [guildID, channelID, message.author.id].some(id => id && idList.includes(id)); const isListed = [linkedChannel.guild_id, channelID, message.author.id].some(id => id && idList.includes(id));
if (listMode === "blacklist" && isListed) continue; if (listMode === "blacklist" && isListed) continue;
if (listMode === "whitelist" && !isListed) continue; if (listMode === "whitelist" && !isListed) continue;
@ -265,8 +267,7 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
const messageProps: MessageEmbedProps = { const messageProps: MessageEmbedProps = {
message: withEmbeddedBy(linkedMessage, [...embeddedBy, message.id]), message: withEmbeddedBy(linkedMessage, [...embeddedBy, message.id]),
channel: linkedChannel, channel: linkedChannel
guildID
}; };
const type = settings.store.automodEmbeds; const type = settings.store.automodEmbeds;
@ -280,59 +281,64 @@ function MessageEmbedAccessory({ message }: { message: Message; }) {
return accessories.length ? <>{accessories}</> : null; return accessories.length ? <>{accessories}</> : null;
} }
function ChannelMessageEmbedAccessory({ message, channel, guildID }: MessageEmbedProps): JSX.Element | null { function getChannelLabelAndIconUrl(channel: Channel) {
const isDM = guildID === "@me"; if (channel.isDM()) return ["Direct Message", IconUtils.getUserAvatarURL(UserStore.getUser(channel.recipients[0]))];
if (channel.isGroupDM()) return ["Group DM", IconUtils.getChannelIconURL(channel)];
return ["Server", IconUtils.getGuildIconURL(GuildStore.getGuild(channel.guild_id))];
}
const guild = !isDM && GuildStore.getGuild(channel.guild_id); function ChannelMessageEmbedAccessory({ message, channel }: MessageEmbedProps): JSX.Element | null {
const dmReceiver = UserStore.getUser(ChannelStore.getChannel(channel.id).recipients?.[0]); const dmReceiver = UserStore.getUser(ChannelStore.getChannel(channel.id).recipients?.[0]);
const [channelLabel, iconUrl] = getChannelLabelAndIconUrl(channel);
return <Embed return (
embed={{ <Embed
rawDescription: "", embed={{
color: "var(--background-secondary)", rawDescription: "",
author: { color: "var(--background-secondary)",
name: <Text variant="text-xs/medium" tag="span"> author: {
<span>{isDM ? "Direct Message - " : (guild as Guild).name + " - "}</span> name: <Text variant="text-xs/medium" tag="span">
{isDM <span>{channelLabel} - </span>
? Parser.parse(`<@${dmReceiver.id}>`) {Parser.parse(channel.isDM() ? `<@${dmReceiver.id}>` : `<#${channel.id}>`)}
: Parser.parse(`<#${channel.id}>`) </Text>,
} iconProxyURL: iconUrl
</Text>, }
iconProxyURL: guild }}
? `https://${window.GLOBAL_ENV.CDN_HOST}/icons/${guild.id}/${guild.icon}.png` renderDescription={() => (
: `https://${window.GLOBAL_ENV.CDN_HOST}/avatars/${dmReceiver.id}/${dmReceiver.avatar}` <div key={message.id} className={classes(SearchResultClasses.message, settings.store.messageBackgroundColor && SearchResultClasses.searchResult)}>
} <ChannelMessage
}} id={`message-link-embeds-${message.id}`}
renderDescription={() => ( message={message}
<div key={message.id} className={classes(SearchResultClasses.message, settings.store.messageBackgroundColor && SearchResultClasses.searchResult)}> channel={channel}
<ChannelMessage subscribeToComponentDispatch={false}
id={`message-link-embeds-${message.id}`} />
message={message} </div>
channel={channel} )}
subscribeToComponentDispatch={false} />
/> );
</div>
)}
/>;
} }
function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null { function AutomodEmbedAccessory(props: MessageEmbedProps): JSX.Element | null {
const { message, channel, guildID } = props; const { message, channel } = props;
const compact = TextAndImagesSettingsStores.MessageDisplayCompact.useSetting(); const compact = TextAndImagesSettingsStores.MessageDisplayCompact.useSetting();
const isDM = guildID === "@me";
const images = getImages(message); const images = getImages(message);
const { parse } = Parser; const { parse } = Parser;
const [channelLabel, iconUrl] = getChannelLabelAndIconUrl(channel);
return <AutoModEmbed return <AutoModEmbed
channel={channel} channel={channel}
childrenAccessories={ childrenAccessories={
<Text color="text-muted" variant="text-xs/medium" tag="span"> <Text color="text-muted" variant="text-xs/medium" tag="span" className={`${EmbedClasses.embedAuthor} ${EmbedClasses.embedMargin}`}>
{isDM {iconUrl && <img src={iconUrl} className={EmbedClasses.embedAuthorIcon} alt="" />}
? parse(`<@${ChannelStore.getChannel(channel.id).recipients[0]}>`) <span>
: parse(`<#${channel.id}>`) <span>{channelLabel} - </span>
} {channel.isDM()
<span>{isDM ? " - Direct Message" : " - " + GuildStore.getGuild(channel.guild_id)?.name}</span> ? Parser.parse(`<@${ChannelStore.getChannel(channel.id).recipients[0]}>`)
: Parser.parse(`<#${channel.id}>`)
}
</span>
</Text> </Text>
} }
compact={compact} compact={compact}

5
src/plugins/mutualGroupDMs/index.tsx
View file

@ -20,11 +20,10 @@ import { Devs } from "@utils/constants";
import { isNonNullish } from "@utils/guards"; import { isNonNullish } from "@utils/guards";
import definePlugin from "@utils/types"; import definePlugin from "@utils/types";
import { findByPropsLazy } from "@webpack"; import { findByPropsLazy } from "@webpack";
import { Avatar, ChannelStore, Clickable, RelationshipStore, ScrollerThin, UserStore } from "@webpack/common"; import { Avatar, ChannelStore, Clickable, IconUtils, RelationshipStore, ScrollerThin, UserStore } from "@webpack/common";
import { Channel, User } from "discord-types/general"; import { Channel, User } from "discord-types/general";
const SelectedChannelActionCreators = findByPropsLazy("selectPrivateChannel"); const SelectedChannelActionCreators = findByPropsLazy("selectPrivateChannel");
const AvatarUtils = findByPropsLazy("getChannelIconURL");
const UserUtils = findByPropsLazy("getGlobalName"); const UserUtils = findByPropsLazy("getGlobalName");
const ProfileListClasses = findByPropsLazy("emptyIconFriends", "emptyIconGuilds"); const ProfileListClasses = findByPropsLazy("emptyIconFriends", "emptyIconGuilds");
@ -71,7 +70,7 @@ export default definePlugin({
}} }}
> >
<Avatar <Avatar
src={AvatarUtils.getChannelIconURL({ id: c.id, icon: c.icon, size: 32 })} src={IconUtils.getChannelIconURL({ id: c.id, icon: c.icon, size: 32 })}
size="SIZE_40" size="SIZE_40"
className={ProfileListClasses.listAvatar} className={ProfileListClasses.listAvatar}
> >

12
src/plugins/serverProfile/GuildProfileModal.tsx
View file

@ -12,10 +12,9 @@ import { classes } from "@utils/misc";
import { ModalRoot, ModalSize, openModal } from "@utils/modal"; import { ModalRoot, ModalSize, openModal } from "@utils/modal";
import { useAwaiter } from "@utils/react"; import { useAwaiter } from "@utils/react";
import { findByPropsLazy, findExportedComponentLazy } from "@webpack"; import { findByPropsLazy, findExportedComponentLazy } from "@webpack";
import { FluxDispatcher, Forms, GuildChannelStore, GuildMemberStore, Parser, PresenceStore, RelationshipStore, ScrollerThin, SnowflakeUtils, TabBar, Timestamp, useEffect, UserStore, UserUtils, useState, useStateFromStores } from "@webpack/common"; import { FluxDispatcher, Forms, GuildChannelStore, GuildMemberStore, IconUtils, Parser, PresenceStore, RelationshipStore, ScrollerThin, SnowflakeUtils, TabBar, Timestamp, useEffect, UserStore, UserUtils, useState, useStateFromStores } from "@webpack/common";
import { Guild, User } from "discord-types/general"; import { Guild, User } from "discord-types/general";
const IconUtils = findByPropsLazy("getGuildBannerURL");
const IconClasses = findByPropsLazy("icon", "acronym", "childWrapper"); const IconClasses = findByPropsLazy("icon", "acronym", "childWrapper");
const FriendRow = findExportedComponentLazy("FriendRow"); const FriendRow = findExportedComponentLazy("FriendRow");
@ -65,10 +64,7 @@ function GuildProfileModal({ guild }: GuildProps) {
const [currentTab, setCurrentTab] = useState(Tabs.ServerInfo); const [currentTab, setCurrentTab] = useState(Tabs.ServerInfo);
const bannerUrl = guild.banner && IconUtils.getGuildBannerURL({ const bannerUrl = guild.banner && IconUtils.getGuildBannerURL(guild, true)!.replace(/\?size=\d+$/, "?size=1024");
id: guild.id,
banner: guild.banner
}, true).replace(/\?size=\d+$/, "?size=1024");
const iconUrl = guild.icon && IconUtils.getGuildIconURL({ const iconUrl = guild.icon && IconUtils.getGuildIconURL({
id: guild.id, id: guild.id,
@ -89,7 +85,7 @@ function GuildProfileModal({ guild }: GuildProps) {
)} )}
<div className={cl("header")}> <div className={cl("header")}>
{guild.icon {iconUrl
? <img ? <img
src={iconUrl} src={iconUrl}
alt="" alt=""
@ -150,7 +146,7 @@ function Owner(guildId: string, owner: User) {
avatar: guildAvatar, avatar: guildAvatar,
guildId, guildId,
canAnimate: true canAnimate: true
}, true) })
: IconUtils.getUserAvatarURL(owner, true); : IconUtils.getUserAvatarURL(owner, true);
return ( return (

21
src/plugins/viewIcons/index.tsx
View file

@ -22,11 +22,9 @@ import { ImageIcon } from "@components/Icons";
import { Devs } from "@utils/constants"; import { Devs } from "@utils/constants";
import { openImageModal } from "@utils/discord"; import { openImageModal } from "@utils/discord";
import definePlugin, { OptionType } from "@utils/types"; import definePlugin, { OptionType } from "@utils/types";
import { findByPropsLazy } from "@webpack"; import { GuildMemberStore, IconUtils, Menu } from "@webpack/common";
import { GuildMemberStore, Menu } from "@webpack/common";
import type { Channel, Guild, User } from "discord-types/general"; import type { Channel, Guild, User } from "discord-types/general";
const BannerStore = findByPropsLazy("getGuildBannerURL");
interface UserContextProps { interface UserContextProps {
channel: Channel; channel: Channel;
@ -91,19 +89,19 @@ const UserContext: NavContextMenuPatchCallback = (children, { user, guildId }: U
<Menu.MenuItem <Menu.MenuItem
id="view-avatar" id="view-avatar"
label="View Avatar" label="View Avatar"
action={() => openImage(BannerStore.getUserAvatarURL(user, true))} action={() => openImage(IconUtils.getUserAvatarURL(user, true))}
icon={ImageIcon} icon={ImageIcon}
/> />
{memberAvatar && ( {memberAvatar && (
<Menu.MenuItem <Menu.MenuItem
id="view-server-avatar" id="view-server-avatar"
label="View Server Avatar" label="View Server Avatar"
action={() => openImage(BannerStore.getGuildMemberAvatarURLSimple({ action={() => openImage(IconUtils.getGuildMemberAvatarURLSimple({
userId: user.id, userId: user.id,
avatar: memberAvatar, avatar: memberAvatar,
guildId, guildId: guildId!,
canAnimate: true canAnimate: true
}, true))} }))}
icon={ImageIcon} icon={ImageIcon}
/> />
)} )}
@ -124,11 +122,11 @@ const GuildContext: NavContextMenuPatchCallback = (children, { guild }: GuildCon
id="view-icon" id="view-icon"
label="View Icon" label="View Icon"
action={() => action={() =>
openImage(BannerStore.getGuildIconURL({ openImage(IconUtils.getGuildIconURL({
id, id,
icon, icon,
canAnimate: true canAnimate: true
})) })!)
} }
icon={ImageIcon} icon={ImageIcon}
/> />
@ -138,10 +136,7 @@ const GuildContext: NavContextMenuPatchCallback = (children, { guild }: GuildCon
id="view-banner" id="view-banner"
label="View Banner" label="View Banner"
action={() => action={() =>
openImage(BannerStore.getGuildBannerURL({ openImage(IconUtils.getGuildBannerURL(guild, true)!)
id,
banner,
}, true))
} }
icon={ImageIcon} icon={ImageIcon}
/> />

23
src/plugins/webContextMenus.web/index.ts
View file

@ -47,18 +47,23 @@ const settings = definePluginSettings({
}); });
const MEDIA_PROXY_URL = "https://media.discordapp.net"; const MEDIA_PROXY_URL = "https://media.discordapp.net";
const CDN_URL = "https://cdn.discordapp.com"; const CDN_URL = "cdn.discordapp.com";
function fixImageUrl(urlString: string, explodeWebp: boolean) { function fixImageUrl(urlString: string) {
const url = new URL(urlString); const url = new URL(urlString);
if (url.origin === CDN_URL) return urlString; if (url.host === CDN_URL) return urlString;
if (url.origin === MEDIA_PROXY_URL) return CDN_URL + url.pathname;
url.searchParams.delete("width"); url.searchParams.delete("width");
url.searchParams.delete("height"); url.searchParams.delete("height");
url.searchParams.set("quality", "lossless");
if (explodeWebp && url.searchParams.get("format") === "webp") if (url.origin === MEDIA_PROXY_URL) {
url.searchParams.set("format", "png"); url.host = CDN_URL;
url.searchParams.delete("size");
url.searchParams.delete("quality");
url.searchParams.delete("format");
} else {
url.searchParams.set("quality", "lossless");
}
return url.toString(); return url.toString();
} }
@ -199,7 +204,7 @@ export default definePlugin({
], ],
async copyImage(url: string) { async copyImage(url: string) {
url = fixImageUrl(url, true); url = fixImageUrl(url);
let imageData = await fetch(url).then(r => r.blob()); let imageData = await fetch(url).then(r => r.blob());
if (imageData.type !== "image/png") { if (imageData.type !== "image/png") {
@ -231,7 +236,7 @@ export default definePlugin({
}, },
async saveImage(url: string) { async saveImage(url: string) {
url = fixImageUrl(url, false); url = fixImageUrl(url);
const data = await fetchImage(url); const data = await fetchImage(url);
if (!data) return; if (!data) return;

45
src/webpack/common/types/utils.d.ts vendored
View file

@ -16,6 +16,7 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>. * along with this program. If not, see <https://www.gnu.org/licenses/>.
*/ */
import { Guild, GuildMember } from "discord-types/general";
import type { ReactNode } from "react"; import type { ReactNode } from "react";
import type { FluxEvents } from "./fluxEvents"; import type { FluxEvents } from "./fluxEvents";
@ -182,3 +183,47 @@ export interface NavigationRouter {
getLastRouteChangeSource(): any; getLastRouteChangeSource(): any;
getLastRouteChangeSourceLocationStack(): any; getLastRouteChangeSourceLocationStack(): any;
} }
export interface IconUtils {
getUserAvatarURL(user: User, canAnimate?: boolean, size?: number, format?: string): string;
getDefaultAvatarURL(id: string, discriminator?: string): string;
getUserBannerURL(data: { id: string, banner: string, canAnimate?: boolean, size: number; }): string | undefined;
getAvatarDecorationURL(dara: { avatarDecoration: string, size: number; canCanimate?: boolean; }): string | undefined;
getGuildMemberAvatarURL(member: GuildMember, canAnimate?: string): string | null;
getGuildMemberAvatarURLSimple(data: { guildId: string, userId: string, avatar: string, canAnimate?: boolean; size?: number; }): string;
getGuildMemberBannerURL(data: { id: string, guildId: string, banner: string, canAnimate?: boolean, size: number; }): string | undefined;
getGuildIconURL(data: { id: string, icon?: string, size?: number, canAnimate?: boolean; }): string | undefined;
getGuildBannerURL(guild: Guild, canAnimate?: boolean): string | null;
getChannelIconURL(data: { id: string; icon?: string; applicationId?: string; size?: number; }): string | undefined;
getEmojiURL(data: { id: string, animated: boolean, size: number, forcePNG?: boolean; }): string;
hasAnimatedGuildIcon(guild: Guild): boolean;
isAnimatedIconHash(hash: string): boolean;
getGuildSplashURL: any;
getGuildDiscoverySplashURL: any;
getGuildHomeHeaderURL: any;
getResourceChannelIconURL: any;
getNewMemberActionIconURL: any;
getGuildTemplateIconURL: any;
getApplicationIconURL: any;
getGameAssetURL: any;
getVideoFilterAssetURL: any;
getGuildMemberAvatarSource: any;
getUserAvatarSource: any;
getGuildSplashSource: any;
getGuildDiscoverySplashSource: any;
makeSource: any;
getGameAssetSource: any;
getGuildIconSource: any;
getGuildTemplateIconSource: any;
getGuildBannerSource: any;
getGuildHomeHeaderSource: any;
getChannelIconSource: any;
getApplicationIconSource: any;
getAnimatableSourceWithFallback: any;
}

2
src/webpack/common/utils.ts
View file

@ -137,3 +137,5 @@ export const { persist: zustandPersist }: typeof import("zustand/middleware") =
export const MessageActions = findByPropsLazy("editMessage", "sendMessage"); export const MessageActions = findByPropsLazy("editMessage", "sendMessage");
export const UserProfileActions = findByPropsLazy("openUserProfileModal", "closeUserProfileModal"); export const UserProfileActions = findByPropsLazy("openUserProfileModal", "closeUserProfileModal");
export const InviteActions = findByPropsLazy("resolveInvite"); export const InviteActions = findByPropsLazy("resolveInvite");
export const IconUtils: t.IconUtils = findByPropsLazy("getGuildBannerURL", "getUserAvatarURL");