cswimr/Vencord
1
0
Fork 0
forked from CoastalCommitsArchival/github.com-Vendicated-Vencord
Code Pull requests Packages 1 Wiki Activity

fix(plugins): PronounDB, ViewIcons, WebhookTags, NoBlockedMessages, BetterGifAltText, MessageAccessories

Browse source
This commit is contained in:
Vendicated 2022-11-11 16:14:05 +01:00
parent f3aba3edb0
commit 1176896a1b
No known key found for this signature in database
GPG key ID: EC781ADFB93EFFA3
10 changed files with 86 additions and 44 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/plugins/apiMessageAccessories.ts
View file

@ -27,7 +27,7 @@ export default definePlugin({
{
find: "_messageAttachmentToEmbedMedia",
replacement: {
match: /\(\)\.container\)},(.+?)\)};return/,
match: /\(\)\.container,children:[[^\]]*]\)},(.+?)\)};return/,
replace: (_, accessories) =>
`().container)},Vencord.Api.MessageAccessories._modifyAccessories([${accessories}],this.props))};return`,
},

2
src/plugins/betterGifAltText.ts
View file

@ -29,7 +29,7 @@ export default definePlugin({
{
find: "onCloseImage=",
replacement: {
match: /(return .{1,2}\.createElement.{0,50}isWindowFocused)/,
match: /(return.{0,10}\.jsx.{0,50}isWindowFocused)/,
replace:
"Vencord.Plugins.plugins.BetterGifAltText.altify(e);$1",
},

4
src/plugins/noBlockedMessages.ts
View file

@ -28,8 +28,8 @@ export default definePlugin({
find: 'safety_prompt:"DMSpamExperiment",response:"show_redacted_messages"',
replacement: [
{
match: /collapsedReason;return (?=\w{1,2}.createElement)/,
replace: "collapsedReason; return null;"
match: /\.collapsedReason;return/,
replace: ".collapsedReason;return null;return;"
}
]
}

4
src/plugins/plainFolderIcon.ts
View file

@ -26,8 +26,8 @@ export default definePlugin({
patches: [{
find: "().expandedFolderIconWrapper",
replacement: [{
match: /\(\w\|\|\w\)(&&\(\w=\w\.createElement\(\w+\.animated)/,
replace: "true$1",
match: /\(\w\|\|\w\)&&(\(.{0,40}\(.{1,3}\.animated)/,
replace: "$1",
}]
}]
});

23
src/plugins/pronoundb/components/PronounsProfileWrapper.tsx
View file

@ -20,27 +20,28 @@ import { useAwaiter } from "../../../utils/misc";
import { Settings } from "../../../Vencord";
import { UserStore } from "../../../webpack/common";
import { fetchPronouns, formatPronouns } from "../pronoundbUtils";
import { PronounMapping, UserProfileProps } from "../types";
import { PronounMapping, UserProfilePronounsProps, UserProfileProps } from "../types";
export default function PronounsProfileWrapper(props: UserProfileProps, pronounsComponent: JSX.Element) {
export default function PronounsProfileWrapper(PronounsComponent: React.ElementType<UserProfilePronounsProps>, props: UserProfilePronounsProps, profileProps: UserProfileProps) {
const user = UserStore.getUser(profileProps.userId) ?? {};
// Don't bother fetching bot or system users
if (props.user.bot || props.user.system) return null;
if (user.bot || user.system) return null;
// Respect showSelf options
if (!Settings.plugins.PronounDB.showSelf && props.user.id === UserStore.getCurrentUser().id) return null;
if (!Settings.plugins.PronounDB.showSelf && user.id === UserStore.getCurrentUser().id)
return null;
const [result, , isPending] = useAwaiter(
() => fetchPronouns(props.user.id),
() => fetchPronouns(user.id),
null,
e => console.error("Fetching pronouns failed: ", e)
);
// If the promise completed, the result was not "unspecified", and there is a mapping for the code, then return a span with the pronouns
// If the promise completed, the result was not "unspecified", and there is a mapping for the code, then render
if (!isPending && result && result !== "unspecified" && PronounMapping[result]) {
// First child is the header, second is a div with the actual text
const [, pronounsBodyComponent] = pronounsComponent.props.children as [JSX.Element, JSX.Element];
pronounsBodyComponent.props.children = formatPronouns(result);
return pronounsComponent;
props.currentPronouns ||= formatPronouns(result);
return <PronounsComponent {...props} />;
}
// Otherwise, return null so nothing else is rendered
else return null;
return null;
}

21
src/plugins/pronoundb/index.ts
View file

@ -44,13 +44,28 @@ export default definePlugin({
},
// Hijack the discord pronouns section (hidden without experiment) and add a wrapper around the text section
{
find: ".headerTagUsernameNoNickname",
find: "currentPronouns:",
all: true,
replacement: {
match: /(?<=""!==(.{1,2})&&).+?children:\1.+?(?=,)/,
replace: "Vencord.Plugins.plugins.PronounDB.PronounsProfileWrapper(e, $1)"
match: /\(0,.{1,3}\.jsxs?\)\((.{1,10}),(\{[^[}]*currentPronouns:[^}]*(\w)\.pronouns[^}]*\})\)/,
replace: (original, PronounComponent, pronounProps, fullProps) => {
// UserSettings
if (fullProps.includes("onPronounsChange")) return original;
return `Vencord.Plugins.plugins.PronounDB.PronounsProfileWrapper(${PronounComponent}, ${pronounProps}, ${fullProps})`;
}
}
},
// Make pronouns experiment be enabled by default
{
find: "2022-01_pronouns",
replacement: {
match: "!1", // false
replace: "!0"
}
}
],
options: {
pronounsFormat: {
type: OptionType.SELECT,

14
src/plugins/pronoundb/types.ts
View file

@ -16,15 +16,13 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import { User } from "discord-types/general";
export interface UserProfileProps {
customStatus: JSX.Element,
displayProfile: {
// In the future (if discord ever uses their pronouns system) this taking priority can be a plugin setting
pronouns: string;
};
user: User;
userId: string;
}
export interface UserProfilePronounsProps {
currentPronouns: string | null;
hidePersonalInformation: boolean;
}
export interface PronounsResponse {

56
src/plugins/viewIcons.tsx
View file

@ -16,15 +16,20 @@
* along with this program. If not, see <https://www.gnu.org/licenses/>.
*/
import type { Guild } from "discord-types/general";
import { Devs } from "../utils/constants";
import { LazyComponent } from "../utils/misc";
import { LazyComponent, lazyWebpack } from "../utils/misc";
import { ModalRoot, ModalSize, openModal } from "../utils/modal";
import definePlugin from "../utils/types";
import { find } from "../webpack";
import { filters, find } from "../webpack";
import { Menu } from "../webpack/common";
const ImageModal = LazyComponent(() => find(m => m.prototype?.render?.toString().includes("OPEN_ORIGINAL_IMAGE")));
const MaskedLink = LazyComponent(() => find(m => m.type?.toString().includes("MASKED_LINK)")));
const GuildBannerStore = lazyWebpack(filters.byProps("getGuildBannerURL"));
const OPEN_URL = "Vencord.Plugins.plugins.ViewIcons.openImage(";
export default definePlugin({
name: "ViewIcons",
@ -32,6 +37,10 @@ export default definePlugin({
description: "Makes Avatars/Banners in user profiles clickable, and adds Guild Context Menu Entries to View Banner/Icon.",
openImage(url: string) {
const u = new URL(url);
u.searchParams.set("size", "512");
url = u.toString();
openModal(modalProps => (
<ModalRoot size={ModalSize.DYNAMIC} {...modalProps}>
<ImageModal
@ -50,32 +59,51 @@ export default definePlugin({
replacement: {
// global because Discord has two components that are 99% identical with one small change ._.
match: /\{src:(.{1,2}),avatarDecoration/g,
replace: (_, src) => `{src:${src},onClick:()=>${OPEN_URL}${src}.replace(/\\?.+$/, "")+"?size=512"),avatarDecoration`
replace: (_, src) => `{src:${src},onClick:()=>${OPEN_URL}${src}),avatarDecoration`
}
}, {
find: "().popoutNoBannerPremium",
replacement: {
match: /style:.{0,10}\{\},(.{1,2})\)/,
replace: (m, style) => `onClick:${style}.backgroundImage&&(${style}.cursor="pointer",()=>${OPEN_URL}${style}.backgroundImage.replace("url(", "").replace(/(\\?size=.+)?\\)/, "?size=512"))),${m}`
replace: (m, style) =>
`onClick:${style}.backgroundImage&&(${style}.cursor="pointer",` +
`()=>${OPEN_URL}${style}.backgroundImage.replace("url(", ""))),${m}`
}
}, {
find: '"GuildContextMenu:',
replacement: [
{
match: /\w=(\w)\.id/,
replace: (m, guild) => `_guild=${guild},${m}`
replace: "_guild=$1,$&"
},
{
match: /(?<=createElement\((.{1,5}),\{id:"leave-guild".{0,100},)(.{1,2}\.createElement)\((.{1,5}),null,(.{1,2})\)(?=\)\}function)/,
replace: (_, menu, createElement, menuGroup, copyIdElement) =>
`${createElement}(${menuGroup},null,[` +
`_guild.icon&&${createElement}(${menu},` +
`{id:"viewicons-copy-icon",label:"View Icon",action:()=>${OPEN_URL}_guild.getIconURL(void 0,true)+"size=512")}),` +
`_guild.banner&&${createElement}(${menu},` +
`{id:"viewicons-copy-banner",label:"View Banner",action:()=>${OPEN_URL}Vencord.Webpack.findByProps("getGuildBannerURL").getGuildBannerURL(_guild).replace(/\\?size=.+/, "?size=512"))})`
+ `,${copyIdElement}])`
match: /(id:"leave-guild".{0,200}),(\(0,.{1,3}\.jsxs?\).{0,200}function)/,
replace: "$1,Vencord.Plugins.plugins.ViewIcons.buildGuildContextMenuEntries(_guild),$2"
}
]
}
]
],
buildGuildContextMenuEntries(guild: Guild) {
return (
<Menu.MenuGroup>
{guild.banner && (
<Menu.MenuItem
id="view-banner"
key="view-banner"
label="View Banner"
action={() => this.openImage(GuildBannerStore.getGuildBannerURL(guild))}
/>
)}
{guild.icon && (
<Menu.MenuItem
id="view-icon"
key="view-icon"
label="View Icon"
action={() => this.openImage(guild.getIconURL(0, true))}
/>
)}
</Menu.MenuGroup>
);
}
});

2
src/plugins/webhookTags.ts
View file

@ -42,7 +42,7 @@ export default definePlugin({
{
find: ".Types.ORIGINAL_POSTER",
replacement: {
match: /return null==(.)\?null:.\.createElement\((.)\.Z/,
match: /return null==(.)\?null:\(0,.{1,3}\.jsxs?\)\((.{1,3})\.Z/,
replace: (orig, type, BotTag) =>
`if(arguments[0].message.webhookId&&arguments[0].user.isNonUserBot()){${type}=${BotTag}.Z.Types.WEBHOOK}${orig}`,
},

2
test/generateReport.ts
View file

@ -37,7 +37,7 @@ const browser = await pup.launch({
});
const page = await browser.newPage();
await page.setUserAgent("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/91.0.4472.114 Safari/537.36");
await page.setUserAgent("Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/106.0.0.0 Safari/537.36");
function maybeGetError(handle: JSHandle) {
return (handle as JSHandle<Error>)?.getProperty("message")